diff options
| -rw-r--r-- | shadow/.footprint.x86_64 | 16 | ||||
| -rw-r--r-- | shadow/.md5sum.i686 | 4 | ||||
| -rw-r--r-- | shadow/.md5sum.x86_64 | 4 | ||||
| -rwxr-xr-x | shadow/Pkgfile | 52 | ||||
| -rw-r--r-- | shadow/shadow-add-missing-include.patch | 11 |
5 files changed, 60 insertions, 27 deletions
diff --git a/shadow/.footprint.x86_64 b/shadow/.footprint.x86_64 index e36f2a35c..26279055d 100644 --- a/shadow/.footprint.x86_64 +++ b/shadow/.footprint.x86_64 @@ -46,6 +46,19 @@ drwxr-xr-x root/root usr/share/locale/fr/ drwxr-xr-x root/root usr/share/locale/fr/LC_MESSAGES/ -rw-r--r-- root/root usr/share/locale/fr/LC_MESSAGES/shadow.mo drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/da/ +drwxr-xr-x root/root usr/share/man/da/man1/ +-rw-r--r-- root/root usr/share/man/da/man1/chfn.1.gz +-rw-r--r-- root/root usr/share/man/da/man1/newgrp.1.gz +-rw-r--r-- root/root usr/share/man/da/man1/sg.1.gz +drwxr-xr-x root/root usr/share/man/da/man5/ +-rw-r--r-- root/root usr/share/man/da/man5/gshadow.5.gz +drwxr-xr-x root/root usr/share/man/da/man8/ +-rw-r--r-- root/root usr/share/man/da/man8/groupdel.8.gz +-rw-r--r-- root/root usr/share/man/da/man8/logoutd.8.gz +-rw-r--r-- root/root usr/share/man/da/man8/nologin.8.gz +-rw-r--r-- root/root usr/share/man/da/man8/vigr.8.gz +-rw-r--r-- root/root usr/share/man/da/man8/vipw.8.gz drwxr-xr-x root/root usr/share/man/fr/ drwxr-xr-x root/root usr/share/man/fr/man1/ -rw-r--r-- root/root usr/share/man/fr/man1/chage.1.gz @@ -72,10 +85,12 @@ drwxr-xr-x root/root usr/share/man/fr/man5/ -rw-r--r-- root/root usr/share/man/fr/man5/shadow.5.gz -rw-r--r-- root/root usr/share/man/fr/man5/suauth.5.gz drwxr-xr-x root/root usr/share/man/fr/man8/ +-rw-r--r-- root/root usr/share/man/fr/man8/chgpasswd.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/chpasswd.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/faillog.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/groupadd.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/groupdel.8.gz +-rw-r--r-- root/root usr/share/man/fr/man8/groupmems.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/groupmod.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/grpck.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/grpconv.8.gz @@ -83,6 +98,7 @@ drwxr-xr-x root/root usr/share/man/fr/man8/ -rw-r--r-- root/root usr/share/man/fr/man8/lastlog.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/logoutd.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/newusers.8.gz +-rw-r--r-- root/root usr/share/man/fr/man8/nologin.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/pwck.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/pwconv.8.gz -rw-r--r-- root/root usr/share/man/fr/man8/pwunconv.8.gz diff --git a/shadow/.md5sum.i686 b/shadow/.md5sum.i686 index d82ed7b20..98230477f 100644 --- a/shadow/.md5sum.i686 +++ b/shadow/.md5sum.i686 @@ -1 +1,3 @@ -b8608d8294ac88974f27b20f991c0e79 shadow-4.1.4.3.tar.bz2 +6fd6a209c1aa623bad913fcff20b7d8e shadow-4.1.5-nscd-1.patch +d5f7a588fadb79faeb4b08b1eee82e9a shadow-4.1.5.tar.bz2 +2b524cc4b749490117017ae24c2bb71e shadow-add-missing-include.patch diff --git a/shadow/.md5sum.x86_64 b/shadow/.md5sum.x86_64 index d82ed7b20..98230477f 100644 --- a/shadow/.md5sum.x86_64 +++ b/shadow/.md5sum.x86_64 @@ -1 +1,3 @@ -b8608d8294ac88974f27b20f991c0e79 shadow-4.1.4.3.tar.bz2 +6fd6a209c1aa623bad913fcff20b7d8e shadow-4.1.5-nscd-1.patch +d5f7a588fadb79faeb4b08b1eee82e9a shadow-4.1.5.tar.bz2 +2b524cc4b749490117017ae24c2bb71e shadow-add-missing-include.patch diff --git a/shadow/Pkgfile b/shadow/Pkgfile index 55a61bc0d..2a0b73fac 100755 --- a/shadow/Pkgfile +++ b/shadow/Pkgfile @@ -6,34 +6,36 @@ # Run on:linux-pam name=shadow -version=4.1.4.3 -release=3 -source=( http://pkg-shadow.alioth.debian.org/releases/$name-$version.tar.bz2\ - ) - +version=4.1.5 +release=1 +source=(http://pkg-shadow.alioth.debian.org/releases/$name-$version.tar.bz2 + http://www.linuxfromscratch.org/patches/lfs/development/$name-$version-nscd-1.patch + shadow-add-missing-include.patch) build() { -cd $name-$version -# Disable the installation of groups -sed -i 's/groups$(EXEEXT) //' src/Makefile.in -find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \; + cd $name-$version + + patch -p1 < ../$name-$version-nscd-1.patch + patch -p1 < ../shadow-add-missing-include.patch + + # Disable the installation of groups + sed -i 's/groups$(EXEEXT) //' src/Makefile.in + find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \; -# Issue with russian man pages -sed -i 's/man_MANS = $(man_nopam) /man_MANS = /' man/ru/Makefile.in + # Disable the installation of the non french manual pages + # Instead of using the default crypt method, use the more secure SHA512 method of password encryption + sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \ + -e 's@/var/spool/mail@/var/mail@' etc/login.defs -# Disable the installation of the non french manual pages -# Instead of using the default crypt method, use the more secure SHA512 method of password encryption -sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \ - -e 's@/var/spool/mail@/var/mail@' etc/login.defs + ./configure --sysconfdir=/etc --without-libpam + make + make DESTDIR=$PKG install + for i in de cs fi id hu ja it ko pl ru sv tr pt_BR zh_CN zh_TW + do rm -r $PKG/usr/share/man/$i + done -./configure --sysconfdir=/etc --without-libpam -make -make DESTDIR=$PKG install -for i in de cs fi id hu ja it ko pl ru sv tr pt_BR zh_CN zh_TW - do rm -r $PKG/usr/share/man/$i -done -# Remove the default as it is part of aaabasicfs -rm -rf $PKG/etc/default -mkdir $PKG/usr/lib -mv -v $PKG/usr/bin/passwd $PKG/bin + # Remove the default as it is part of aaabasicfs + rm -rf $PKG/etc/default + mkdir $PKG/usr/lib + mv -v $PKG/usr/bin/passwd $PKG/bin } diff --git a/shadow/shadow-add-missing-include.patch b/shadow/shadow-add-missing-include.patch new file mode 100644 index 000000000..5c9e946ef --- /dev/null +++ b/shadow/shadow-add-missing-include.patch @@ -0,0 +1,11 @@ +diff -Naur shadow-4.1.4.2+svn3283/libmisc/copydir.c shadow-4.1.4.2+svn3283.new/libmisc/copydir.c +--- shadow-4.1.4.2+svn3283/libmisc/copydir.c 2010-09-05 11:35:26.000000000 -0400 ++++ shadow-4.1.4.2+svn3283.new/libmisc/copydir.c 2011-06-26 01:26:52.000000000 -0400 +@@ -34,6 +34,7 @@ + + #ident "$Id: copydir.c 3283 2010-09-05 15:34:42Z nekral-guest $" + ++#include <stdarg.h> + #include <assert.h> + #include <sys/stat.h> + #include <sys/types.h> |