From 15663df2ebfbc8d6a40bb554ffa2171c301bb29b Mon Sep 17 00:00:00 2001
From: Johannes Winkelmann <jw@smts.ch>
Date: Wed, 22 Mar 2006 23:35:41 +0000
Subject: [PATCH] shadow (2.2): update to 4.0.15

---
 shadow/.md5sum                        |  3 +-
 shadow/Pkgfile                        |  7 +--
 shadow/shadow-4.0.15-nochgpasswd.diff | 64 +++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 shadow/shadow-4.0.15-nochgpasswd.diff

diff --git a/shadow/.md5sum b/shadow/.md5sum
index 93ab8c56..67848268 100644
--- a/shadow/.md5sum
+++ b/shadow/.md5sum
@@ -1,3 +1,4 @@
 d52af1b47b7a382bff9d0be6865f05ea  login.defs
 be8f69c2701118093af3d7f3bc02af16  pwck
-903f55cf05bbe082617d3337743792fb  shadow-4.0.14.tar.bz2
+29b6b4f6083d841ea01f68b6f1a9137c  shadow-4.0.15-nochgpasswd.diff
+a0452fa989f8ba45023cc5a08136568e  shadow-4.0.15.tar.bz2
diff --git a/shadow/Pkgfile b/shadow/Pkgfile
index 50d40a34..e8c63d2e 100644
--- a/shadow/Pkgfile
+++ b/shadow/Pkgfile
@@ -3,19 +3,20 @@
 # Maintainer:  Per Lidén <per@fukt.bth.se>
 
 name=shadow
-version=4.0.14
+version=4.0.15
 release=1
 source=(ftp://ftp.pld.org.pl/software/shadow/$name-$version.tar.bz2 \
-	pwck login.defs)
+	pwck login.defs shadow-4.0.15-nochgpasswd.diff)
 
 build() {
     cd $name-$version
     ./configure --prefix=/usr \
 		--mandir=/usr/man \
 		--disable-shared \
-		--disable-shadowgrp \
+                --disable-shadowgrp \
 		--disable-nls \
                 --without-selinux
+    patch src/Makefile $SRC/shadow-4.0.15-nochgpasswd.diff
     make
     make DESTDIR=$PKG install
     mkdir -p $PKG/etc/cron/daily $PKG/var/log
diff --git a/shadow/shadow-4.0.15-nochgpasswd.diff b/shadow/shadow-4.0.15-nochgpasswd.diff
new file mode 100644
index 00000000..d7e9d727
--- /dev/null
+++ b/shadow/shadow-4.0.15-nochgpasswd.diff
@@ -0,0 +1,64 @@
+--- Makefile.orig	2006-03-23 00:28:27.083554080 +0100
++++ Makefile	2006-03-23 00:29:04.600850584 +0100
+@@ -40,7 +40,7 @@
+ ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
+ 	chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \
+ 	newgrp$(EXEEXT) passwd$(EXEEXT)
+-usbin_PROGRAMS = chgpasswd$(EXEEXT) chpasswd$(EXEEXT) \
++usbin_PROGRAMS = chpasswd$(EXEEXT) \
+ 	groupadd$(EXEEXT) groupdel$(EXEEXT) groupmod$(EXEEXT) \
+ 	grpck$(EXEEXT) grpconv$(EXEEXT) grpunconv$(EXEEXT) \
+ 	logoutd$(EXEEXT) newusers$(EXEEXT) nologin$(EXEEXT) \
+@@ -76,10 +76,6 @@
+ chfn_OBJECTS = chfn.$(OBJEXT)
+ chfn_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+ 	$(am__DEPENDENCIES_2)
+-chgpasswd_SOURCES = chgpasswd.c
+-chgpasswd_OBJECTS = chgpasswd.$(OBJEXT)
+-chgpasswd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_2)
+ chpasswd_SOURCES = chpasswd.c
+ chpasswd_OBJECTS = chpasswd.$(OBJEXT)
+ chpasswd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+@@ -206,13 +202,13 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = chage.c chfn.c chgpasswd.c chpasswd.c chsh.c expiry.c \
++SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c \
+ 	faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c \
+ 	grpck.c grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \
+ 	logoutd.c newgrp.c newusers.c nologin.c passwd.c pwck.c \
+ 	pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c \
+ 	userdel.c usermod.c vipw.c
+-DIST_SOURCES = chage.c chfn.c chgpasswd.c chpasswd.c chsh.c expiry.c \
++DIST_SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c \
+ 	faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c \
+ 	grpck.c grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \
+ 	logoutd.c newgrp.c newusers.c nologin.c passwd.c pwck.c \
+@@ -366,7 +362,6 @@
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
+ chage_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
+ chfn_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+-chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+ chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+ chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+ gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
+@@ -527,9 +522,6 @@
+ chfn$(EXEEXT): $(chfn_OBJECTS) $(chfn_DEPENDENCIES) 
+ 	@rm -f chfn$(EXEEXT)
+ 	$(LINK) $(chfn_LDFLAGS) $(chfn_OBJECTS) $(chfn_LDADD) $(LIBS)
+-chgpasswd$(EXEEXT): $(chgpasswd_OBJECTS) $(chgpasswd_DEPENDENCIES) 
+-	@rm -f chgpasswd$(EXEEXT)
+-	$(LINK) $(chgpasswd_LDFLAGS) $(chgpasswd_OBJECTS) $(chgpasswd_LDADD) $(LIBS)
+ chpasswd$(EXEEXT): $(chpasswd_OBJECTS) $(chpasswd_DEPENDENCIES) 
+ 	@rm -f chpasswd$(EXEEXT)
+ 	$(LINK) $(chpasswd_LDFLAGS) $(chpasswd_OBJECTS) $(chpasswd_LDADD) $(LIBS)
+@@ -626,7 +618,6 @@
+ 
+ include ./$(DEPDIR)/chage.Po
+ include ./$(DEPDIR)/chfn.Po
+-include ./$(DEPDIR)/chgpasswd.Po
+ include ./$(DEPDIR)/chpasswd.Po
+ include ./$(DEPDIR)/chsh.Po
+ include ./$(DEPDIR)/expiry.Po