commit 4f82ccdc5794dbbccb75ed039ed0e658d4e7ced3 Author: Tim Biermann <tbier@posteo.de> Date: Sat Dec 11 19:27:19 2021 +0100 shadow: 4.8.1 -> 4.9 diff --git a/shadow/.footprint b/shadow/.footprint index 8aa5cd48..307ca6a0 100644 --- a/shadow/.footprint +++ b/shadow/.footprint @@ -18,6 +18,9 @@ drwxr-xr-x root/root etc/pam.d/ -rw-r--r-- root/root etc/pam.d/useradd -rw-r--r-- root/root etc/pam.d/userdel -rw-r--r-- root/root etc/pam.d/usermod +drwxr-xr-x root/root lib/ +-rw-r--r-- root/root lib/libsubid.a +-rwxr-xr-x root/root lib/libsubid.la drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/nologin drwxr-xr-x root/root usr/ @@ -35,6 +38,9 @@ drwxr-xr-x root/root usr/bin/ -rwsr-xr-x root/root usr/bin/passwd lrwxrwxrwx root/root usr/bin/sg -> newgrp -rwsr-xr-x root/root usr/bin/su +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/shadow/ +-rw-r--r-- root/root usr/include/shadow/subid.h drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/chgpasswd -rwxr-xr-x root/root usr/sbin/groupadd @@ -48,45 +54,6 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/usermod lrwxrwxrwx root/root usr/sbin/vigr -> vipw -rwxr-xr-x root/root usr/sbin/vipw -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/chage.1.gz --rw-r--r-- root/root usr/share/man/man1/chfn.1.gz --rw-r--r-- root/root usr/share/man/man1/chsh.1.gz --rw-r--r-- root/root usr/share/man/man1/expiry.1.gz --rw-r--r-- root/root usr/share/man/man1/groups.1.gz --rw-r--r-- root/root usr/share/man/man1/login.1.gz --rw-r--r-- root/root usr/share/man/man1/newgidmap.1.gz --rw-r--r-- root/root usr/share/man/man1/newgrp.1.gz --rw-r--r-- root/root usr/share/man/man1/newuidmap.1.gz --rw-r--r-- root/root usr/share/man/man1/passwd.1.gz --rw-r--r-- root/root usr/share/man/man1/sg.1.gz --rw-r--r-- root/root usr/share/man/man1/su.1.gz -drwxr-xr-x root/root usr/share/man/man5/ --rw-r--r-- root/root usr/share/man/man5/faillog.5.gz --rw-r--r-- root/root usr/share/man/man5/login.defs.5.gz --rw-r--r-- root/root usr/share/man/man5/passwd.5.gz --rw-r--r-- root/root usr/share/man/man5/shadow.5.gz --rw-r--r-- root/root usr/share/man/man5/suauth.5.gz --rw-r--r-- root/root usr/share/man/man5/subgid.5.gz --rw-r--r-- root/root usr/share/man/man5/subuid.5.gz -drwxr-xr-x root/root usr/share/man/man8/ --rw-r--r-- root/root usr/share/man/man8/chgpasswd.8.gz --rw-r--r-- root/root usr/share/man/man8/faillog.8.gz --rw-r--r-- root/root usr/share/man/man8/groupadd.8.gz --rw-r--r-- root/root usr/share/man/man8/groupdel.8.gz --rw-r--r-- root/root usr/share/man/man8/groupmems.8.gz --rw-r--r-- root/root usr/share/man/man8/groupmod.8.gz --rw-r--r-- root/root usr/share/man/man8/grpck.8.gz --rw-r--r-- root/root usr/share/man/man8/lastlog.8.gz --rw-r--r-- root/root usr/share/man/man8/nologin.8.gz --rw-r--r-- root/root usr/share/man/man8/pwck.8.gz --rw-r--r-- root/root usr/share/man/man8/useradd.8.gz --rw-r--r-- root/root usr/share/man/man8/userdel.8.gz --rw-r--r-- root/root usr/share/man/man8/usermod.8.gz --rw-r--r-- root/root usr/share/man/man8/vigr.8.gz --rw-r--r-- root/root usr/share/man/man8/vipw.8.gz drwxr-xr-x root/root var/ drwxr-xr-x root/root var/log/ -rw-r--r-- root/root var/log/faillog (EMPTY) diff --git a/shadow/.signature b/shadow/.signature index 91694db1..d11134fa 100644 --- a/shadow/.signature +++ b/shadow/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqvy6kMq0qV3AFJiExmYxo2JmVPdqkL138sguxTdOSHkrj7+ebsHU57aV3XyVmmw7vSZLwqlvnQ0BStEs8wQHnAg= -SHA256 (Pkgfile) = 948141f7c54a4eea613003b5e98ee08c60e7d77902a4f9694aa9f3f7d617e44a -SHA256 (.footprint) = 63fc924400dd4fcaf8a613912291d830ae89c2fa3cc17983f06f0d54597f3640 -SHA256 (shadow-4.8.1.tar.xz) = a3ad4630bdc41372f02a647278a8c3514844295d36eefe68ece6c3a641c1ae62 +RWRJc1FUaeVeqr+dqmozf6U+Ye5hDKRssUBkks2GhjJLvLIqLLP422oC5pakao6/YL/X/W4G3HyyOzWm9PVlzQQqernd9o70wAU= +SHA256 (Pkgfile) = 7c7de4a53457036f959b3ad197ab3da6d9c956bb6ac461bf74fba5956d68617a +SHA256 (.footprint) = b79ff8d40e5ec27fb97328d3e5da447de2ca995e66305ebe2926b01292bfca2c +SHA256 (shadow-4.9.tar.xz) = feec1f2ce9c1b62798afd35a7d1b04cefdfa3a0a30ff3e75d6965ba8978c9144 SHA256 (pwck) = c62f1bf5785c2bb93bb269156bfa02b06728a01ff5d6c2e09cf6285701a1fda0 SHA256 (login.defs) = def991c4bc012834d726a4010783634a930558b91650bc4cba5fe822064c3535 SHA256 (chfn) = b31ef7a14f747e114c970027a57acb5dcefffee439ce0b4a7d55cc2f6b632fcf @@ -17,3 +17,5 @@ SHA256 (su) = fd033d23c243c3ec7c0491f109365419bfa34c305fe6554f526b4df797486454 SHA256 (useradd) = 2988d648da4c4c6924360aa3c648937e11ea8f5e98c856d293d071adf63a0ec9 SHA256 (userdel) = 478cc2d620831ca266f953c0a743c19c1f007d567fb61a1757b631a80b328d41 SHA256 (usermod) = 800ba6178170142c7202c7fdbdc30323bdbcf9b592c4f0328375b8830cf81d51 +SHA256 (libsubid-build-fix.patch) = b4abf2e588faca5d42a3dabcd8c844a14adecbda80576c2fd3d649016e8d5e6d +SHA256 (430.patch) = 8f28000ca070d354490bb601e1092abd2724727d5db571e93159a57d41140bf8 diff --git a/shadow/430.patch b/shadow/430.patch new file mode 100644 index 00000000..b8d0523e --- /dev/null +++ b/shadow/430.patch @@ -0,0 +1,25 @@ +From fc832e4648d6e80e95aaa762a158453ee43fe1cb Mon Sep 17 00:00:00 2001 +From: "(GalaxyMaster)" <galaxy4public@users.noreply.github.com> +Date: Wed, 27 Oct 2021 20:14:42 +1100 +Subject: [PATCH] Fixes the linking issues when libsubid is static and linked + to binaries that also define the Prog and shadow_logfd variables. + +--- + libsubid/api.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libsubid/api.c b/libsubid/api.c +index a7b904d0..a51b4e01 100644 +--- a/libsubid/api.c ++++ b/libsubid/api.c +@@ -39,8 +39,8 @@ + #include "idmapping.h" + #include "subid.h" + +-const char *Prog = "(libsubid)"; +-FILE *shadow_logfd; ++static const char *Prog = "(libsubid)"; ++static FILE *shadow_logfd; + + bool libsubid_init(const char *progname, FILE * logfd) + { diff --git a/shadow/Pkgfile b/shadow/Pkgfile index a16a015b..b4b8c090 100644 --- a/shadow/Pkgfile +++ b/shadow/Pkgfile @@ -1,52 +1,53 @@ # Description: Shadow password file utilities -# URL: https://github.com/shadow-maint/shadow/ -# Maintainer: CRUX System Team, core-ports at crux dot nu -# Depends on: acl linux-pam +# URL: https://github.com/shadow-maint/shadow/ +# Maintainer: CRUX System Team, core-ports at crux dot nu +# Depends on: acl linux-pam name=shadow -version=4.8.1 +version=4.9 release=1 -source=(https://github.com/shadow-maint/$name/releases/download/$version/$name-$vers... \ - pwck login.defs chfn chsh login groupadd groupdel \ - groupmems groupmod passwd su useradd userdel usermod) +source=(https://github.com/shadow-maint/$name/releases/download/v$version/$name-$ver... + pwck login.defs chfn chsh login groupadd groupdel + groupmems groupmod passwd su useradd userdel usermod + libsubid-build-fix.patch 430.patch) build() { - cd $name-$version - - ./configure --prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - --disable-shared \ - --disable-shadowgrp \ - --disable-nls \ - --without-selinux \ - --without-audit - - make - make DESTDIR=$PKG install - - install -d $PKG/{bin,sbin} - mv $PKG/usr/bin/login $PKG/bin - mv $PKG/usr/sbin/nologin $PKG/sbin - chmod -s $PKG/usr/sbin/* - - install -d $PKG/etc/cron/daily $PKG/var/log - install -m 644 $SRC/login.defs $PKG/etc - install -m 755 $SRC/pwck $PKG/etc/cron/daily - touch $PKG/var/log/{lastlog,faillog} - - rm -r $PKG/usr/bin/gpasswd \ - $PKG/usr/share/man/man1/gpasswd.1 \ - $PKG/usr/sbin/{chpasswd,grpconv,grpunconv,logoutd} \ - $PKG/usr/sbin/{newusers,pwconv,pwunconv} \ - $PKG/usr/share/man/man8/{chpasswd.8,grpconv.8,grpunconv.8,logoutd.8} \ - $PKG/usr/share/man/man8/{newusers.8,pwconv.8,pwunconv.8} \ - $PKG/usr/share/man/man5/gshadow.5 \ - $PKG/usr/share/man/man3 \ - $PKG/etc/{default,pam.d/*} - - install -o root -g root -m 0644 \ - $SRC/{ch{fn,sh},login,group{add,del,mems,mod},passwd,su,user{add,del,mod}} \ - $PKG/etc/pam.d/ + cd $name-$version + + patch -Np1 -i $SRC/libsubid-build-fix.patch + patch -Np1 -i $SRC/430.patch + autoreconf -fvi + + ./configure --prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + --disable-shadowgrp \ + --disable-shared \ + --enable-static=yes \ + --disable-nls \ + --without-selinux \ + --without-audit + + make + make DESTDIR=$PKG install + + install -d $PKG/{bin,sbin} + mv $PKG/usr/bin/login $PKG/bin + mv $PKG/usr/sbin/nologin $PKG/sbin + chmod -s $PKG/usr/sbin/* + + install -d $PKG/etc/cron/daily $PKG/var/log + install -m 644 $SRC/login.defs $PKG/etc + install -m 755 $SRC/pwck $PKG/etc/cron/daily + touch $PKG/var/log/{lastlog,faillog} + + rm -r $PKG/usr/bin/gpasswd \ + $PKG/usr/sbin/{chpasswd,grpconv,grpunconv,logoutd} \ + $PKG/usr/sbin/{newusers,pwconv,pwunconv} \ + $PKG/etc/pam.d/* + + install -o root -g root -m 0644 \ + $SRC/{ch{fn,sh},login,group{add,del,mems,mod},passwd,su,user{add,del,mod}} \ + $PKG/etc/pam.d/ } diff --git a/shadow/libsubid-build-fix.patch b/shadow/libsubid-build-fix.patch new file mode 100644 index 00000000..5b6d61b3 --- /dev/null +++ b/shadow/libsubid-build-fix.patch @@ -0,0 +1,123 @@ +Fix build fails for libsubid (libtool: error: cannot find name of link library for '../libsubid/libsubid.la'). +Consisting of following upstream commits: +* f4a84efb468b8be21be124700ce35159c444e9d6 +* 537b8cd90be7b47b45c45cfd27765ef85eb0ebf1 +* fa986b1d73605ecca54a4f19249227aeab827bf6 +Index: shadow-4.9/configure.ac +=================================================================== +--- shadow-4.9.orig/configure.ac ++++ shadow-4.9/configure.ac +@@ -321,6 +321,8 @@ if test "$with_sha_crypt" = "yes"; then + AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms]) + fi + ++AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes") ++ + AM_CONDITIONAL(USE_BCRYPT, test "x$with_bcrypt" = "xyes") + if test "$with_bcrypt" = "yes"; then + AC_DEFINE(USE_BCRYPT, 1, [Define to allow the bcrypt password encryption algorithm]) +Index: shadow-4.9/lib/Makefile.am +=================================================================== +--- shadow-4.9.orig/lib/Makefile.am ++++ shadow-4.9/lib/Makefile.am +@@ -10,6 +10,8 @@ if HAVE_VENDORDIR + libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\" + endif + ++libshadow_la_CPPFLAGS += -I$(top_srcdir) ++ + libshadow_la_SOURCES = \ + commonio.c \ + commonio.h \ +Index: shadow-4.9/libmisc/Makefile.am +=================================================================== +--- shadow-4.9.orig/libmisc/Makefile.am ++++ shadow-4.9/libmisc/Makefile.am +@@ -1,7 +1,7 @@ + + EXTRA_DIST = .indent.pro xgetXXbyYY.c + +-AM_CPPFLAGS = -I$(top_srcdir)/lib $(ECONF_CPPFLAGS) ++AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS) + + noinst_LTLIBRARIES = libmisc.la + +Index: shadow-4.9/libsubid/Makefile.am +=================================================================== +--- shadow-4.9.orig/libsubid/Makefile.am ++++ shadow-4.9/libsubid/Makefile.am +@@ -1,6 +1,8 @@ + lib_LTLIBRARIES = libsubid.la ++if ENABLE_SHARED + libsubid_la_LDFLAGS = -Wl,-soname,libsubid.so.@LIBSUBID_ABI@ \ + -shared -version-info @LIBSUBID_ABI_MAJOR@ ++endif + libsubid_la_SOURCES = api.c + + pkginclude_HEADERS = subid.h +@@ -16,11 +18,12 @@ MISCLIBS = \ + $(LIBCRYPT) \ + $(LIBACL) \ + $(LIBATTR) \ +- $(LIBTCB) ++ $(LIBTCB) \ ++ $(LIBPAM) + + libsubid_la_LIBADD = \ +- $(top_srcdir)/lib/libshadow.la \ +- $(top_srcdir)/libmisc/libmisc.la \ ++ $(top_builddir)/lib/libshadow.la \ ++ $(top_builddir)/libmisc/libmisc.la \ + $(MISCLIBS) -ldl + + AM_CPPFLAGS = \ +Index: shadow-4.9/src/Makefile.am +=================================================================== +--- shadow-4.9.orig/src/Makefile.am ++++ shadow-4.9/src/Makefile.am +@@ -10,6 +10,7 @@ sgidperms = 2755 + AM_CPPFLAGS = \ + -I${top_srcdir}/lib \ + -I$(top_srcdir)/libmisc \ ++ -I$(top_srcdir) \ + -DLOCALEDIR=\"$(datadir)/locale\" + + # XXX why are login and su in /bin anyway (other than for +@@ -183,6 +184,7 @@ list_subid_ranges_LDADD = \ + list_subid_ranges_CPPFLAGS = \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/libmisc \ ++ -I$(top_srcdir) \ + -I$(top_srcdir)/libsubid + + get_subid_owners_LDADD = \ +@@ -194,11 +196,13 @@ get_subid_owners_LDADD = \ + get_subid_owners_CPPFLAGS = \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/libmisc \ ++ -I$(top_srcdir) \ + -I$(top_srcdir)/libsubid + + new_subid_range_CPPFLAGS = \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/libmisc \ ++ -I$(top_srcdir) \ + -I$(top_srcdir)/libsubid + + new_subid_range_LDADD = \ +@@ -210,6 +214,7 @@ new_subid_range_LDADD = \ + free_subid_range_CPPFLAGS = \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/libmisc \ ++ -I$(top_srcdir) \ + -I$(top_srcdir)/libsubid + + free_subid_range_LDADD = \ +@@ -220,6 +225,7 @@ free_subid_range_LDADD = \ + + check_subid_range_CPPFLAGS = \ + -I$(top_srcdir)/lib \ ++ -I$(top_srcdir) \ + -I$(top_srcdir)/libmisc + + check_subid_range_LDADD = \