← recipes

Commit ff4ab8d

0
plików
+0
dodanych
-0
usuniętych
@@ -1,6 +1,5 @@
1 -diff -Naur a/src/Makefile.am b/src/Makefile.am
2 -+++ b/src/Makefile.am 2026-03-08 19:09:28.288565953 +0100
1 +--- a/src/Makefile.am
3 2 @@ -3,7 +3,7 @@
4 3 .indent.pro
5 4
@@ -15,20 +14,13 @@ diff -Naur a/src/Makefile.am b/src/Makefile.am
15 14
16 15 bin_PROGRAMS = login
17 16 -sbin_PROGRAMS = nologin
18 --ubin_PROGRAMS = faillog chage chfn chsh expiry gpasswd newgrp passwd
17 +-ubin_PROGRAMS = faillog chage chfn chsh gpasswd newgrp passwd
19 18 +sbin_PROGRAMS =
20 -+ubin_PROGRAMS = nologin faillog lastlog chage expiry gpasswd newgrp passwd
19 ++ubin_PROGRAMS = nologin faillog chage chfn chsh gpasswd newgrp passwd
21 20 if ENABLE_SUBIDS
22 21 ubin_PROGRAMS += newgidmap newuidmap
23 22 endif
24 -@@ -48,22 +48,20 @@
25 - grpck \
26 - grpconv \
27 - grpunconv \
28 -- logoutd \
29 - newusers \
30 - pwck \
31 - pwconv \
23 +@@ -53,8 +53,7 @@
32 24 pwunconv \
33 25 useradd \
34 26 userdel \
@@ -38,31 +30,16 @@ diff -Naur a/src/Makefile.am b/src/Makefile.am
38 30
39 31 # sulogin from sysvinit
40 32 noinst_PROGRAMS = sulogin
41 -
42 - suidusbins =
43 - suidbins =
44 --suidubins = chage chfn chsh expiry gpasswd newgrp
45 -+suidubins = chage expiry gpasswd newgrp
46 - if WITH_SU
47 - suidbins += su
48 - endif
49 -@@ -135,18 +133,16 @@
50 - useradd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) -ldl
51 - userdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBECONF) -ldl
52 - usermod_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) -ldl
33 +@@ -122,12 +121,10 @@
34 + useradd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBECONF) -ldl
35 + userdel_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBECONF) -ldl
36 + usermod_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBECONF) -ldl
53 37 -vipw_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF)
54 38
55 39 install-am: all-am
56 40 $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
57 -- ln -sf newgrp $(DESTDIR)$(ubindir)/sg
41 + ln -sf newgrp $(DESTDIR)$(ubindir)/sg
58 42 - ln -sf vipw $(DESTDIR)$(usbindir)/vigr
59 43 set -e; for i in $(suidbins); do \
60 44 chmod $(suidperms) $(DESTDIR)$(bindir)/$$i; \
61 45 done
62 - set -e; for i in $(suidubins); do \
63 - chmod $(suidperms) $(DESTDIR)$(ubindir)/$$i; \
64 - done
65 -+ mv -v $(DESTDIR)$(ubindir)/newgrp $(DESTDIR)$(ubindir)/sg
66 - set -e; for i in $(suidusbins); do \
67 - chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \
68 - done