]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
shadow-utils: Update to 4.13
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 19 Dec 2022 17:37:50 +0000 (17:37 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 19 Dec 2022 17:37:50 +0000 (17:37 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
shadow-utils/shadow-utils.nm

index 5e5df03485d3f5715847763d5b633e9189d9dbc5..1b3be3674af7ccf2f53dc650935b33c813292598 100644 (file)
@@ -4,11 +4,10 @@
 ###############################################################################
 
 name       = shadow-utils
-version    = 4.5
+version    = 4.13
 release    = 1
 thisapp    = shadow-%{version}
 
-maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Base
 url        = https://github.com/shadow-maint/shadow/
 license    = GPLv2+
@@ -35,60 +34,38 @@ build
                libattr-devel
                libcap-devel
                libtool
+               libxcrypt-devel
+               pam-devel
        end
 
-       configure_options += \
-               --enable-shadowgrp \
-               --enable-man \
-               --with-sha-crypt \
-               --without-libcrack \
-               --without-libpam \
-               --disable-static \
-               --with-group-name-max-length=32
-
        prepare_cmds
                autoreconf -vfi
+       end
 
-               # Do not build these files:
-               for i in nologin chfn chgpasswd chpasswd chsh expiry gpasswd groups login \
-                               logoutd passwd su; do \
-
-                       # Do not generate any manpages for them.
-                       find man -name Makefile.in -exec sed -i -e "/$i\.[1-9]\.xml/d" {} \;; \
-                       find man -name Makefile.in -exec sed -i -e "s/man1\/$i\.1/ /" {} \;; \
-
-                       # Do not compile them.
-                       sed -i "s/$i\$(EXEEXT)//" src/Makefile.in; \
-               done
-
-               sed -i src/Makefile.in \
-                       -e "s/^suidbins.*/# &/" -e "s/^suidubins.*/# &/"
-
-               # Do not install korean and zh man pages
-               sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile.in
+       configure_options += \
+               --disable-account-tools-setuid \
+               --enable-man \
+               --with-libpam \
+               --with-group-name-max-length=32 \
+               --with-bcrypt \
+               --with-yescrypt \
+               --without-audit \
+               --without-selinux \
+               --without-su
 
-               # Do not install russion man pages - was broken in 4.1.4.3
-               sed -i -e 's/ ru//' man/Makefile.in
-       end
+       # This should be enabled, but our environment currently does not support this
+       configure_options += --without-fcaps
 
        install_cmds
-               # Remove man pages in other languages
-               rm -rfv %{BUILDROOT}/usr/share/man/{cs,de,fi,fr,hu,id,it,ja,pl,pt_BR,ru,sv,tr}
-
-               # Remove duplicate man pages.
-               rm -vf %{BUILDROOT}/usr/share/man/man*/{getspnam,nologin,passwd}.*
+               rm -vf \
+                       %{BUILDROOT}/{%{bindir},%{sbindir},%{mandir}/*}/{chfn,chsh,login,logoutd,newgrp,nologin,sg,vigr,vipw}*
        end
 end
 
 packages
        package %{name}
-               groups += Base Build
-
-               obsoletes += shadow<%{thisver}
-               provides  += shadow=%{thisver}
-
                conflicts
-                       pam<1.1.0-4
+                       pam < 1.1.0-4
                end
 
                configfiles
@@ -96,6 +73,10 @@ packages
                end
        end
 
+       package %{name}-devel
+               template DEVEL
+       end
+
        package %{name}-debuginfo
                template DEBUGINFO
        end