fix chage once again

12 files changed, 38 insertions, 292 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 1525b1b2ef45..9fa9f776cdc9 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.2 2002/02/21 03:21:26 chouser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.3 2002/02/24 17:35:27 azarah Exp $
+
+*shadow-20001016-r8 (25 Feb 2002)
+
+  25 Feb 2002; M.Schlemmer <azarah@gentoo.org> shadow-20001016-r8.ebuild
+
+  Added a 'rm -rf ${D}/usr/share/man/*' to Chris's man fix to clean the
+  Polish pages.  Added the line for installing /etc/pam.d/chage again, which
+  should close bug #837.
 
 *shadow-20001016-r7 (20 Feb 2002)
 
diff --git a/sys-apps/shadow/files/digest-shadow-20001016-r5 b/sys-apps/shadow/files/digest-shadow-20001016-r5
deleted file mode 100644
index a863d2f64461..000000000000
--- a/sys-apps/shadow/files/digest-shadow-20001016-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 588d1de9d58c35cd00fa782688e1f26d shadow-20001016.tar.gz 752473
diff --git a/sys-apps/shadow/files/digest-shadow-20001016-r6 b/sys-apps/shadow/files/digest-shadow-20001016-r6
deleted file mode 100644
index a863d2f64461..000000000000
--- a/sys-apps/shadow/files/digest-shadow-20001016-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 588d1de9d58c35cd00fa782688e1f26d shadow-20001016.tar.gz 752473
diff --git a/sys-apps/shadow/files/digest-shadow-20001016-r4 b/sys-apps/shadow/files/digest-shadow-20001016-r8
index a863d2f64461..a863d2f64461 100644
--- a/sys-apps/shadow/files/digest-shadow-20001016-r4
+++ b/sys-apps/shadow/files/digest-shadow-20001016-r8
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.1 b/sys-apps/shadow/files/digest-shadow-4.0.1
deleted file mode 100644
index a54c563d6853..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d81d40d11ff7d1e0b061e4ab7976a9e shadow-4.0.1.tar.gz 960841
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.1-r1 b/sys-apps/shadow/files/digest-shadow-4.0.1-r1
deleted file mode 100644
index a54c563d6853..000000000000
--- a/sys-apps/shadow/files/digest-shadow-4.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d81d40d11ff7d1e0b061e4ab7976a9e shadow-4.0.1.tar.gz 960841
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.2 b/sys-apps/shadow/files/digest-shadow-4.0.2
new file mode 100644
index 000000000000..cd747a96a934
--- /dev/null
+++ b/sys-apps/shadow/files/digest-shadow-4.0.2
@@ -0,0 +1 @@
+MD5 5a98215dd9ee6511cbc2c898898d3c14 shadow-4.0.2.tar.gz 966765
diff --git a/sys-apps/shadow/shadow-20001016-r4.ebuild b/sys-apps/shadow/shadow-20001016-r4.ebuild
deleted file mode 100644
index 99c84e94ba1a..000000000000
--- a/sys-apps/shadow/shadow-20001016-r4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-20001016-r4.ebuild,v 1.5 2001/08/05 22:58:06 pete Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Utilities to deal with user accounts"
-SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${A}"
-
-DEPEND=">=sys-libs/pam-0.73
-        sys-devel/gettext"
-
-RDEPEND=">=sys-libs/pam-0.73"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	cp ${FILESDIR}/useradd.c ${S}/src
-}
-
-src_compile() {
-	try ./configure --disable-desrpc --with-libcrypt --with-libcrack --with-libpam --host=${CHOST}
-	# Parallel make fails sometimes
-	try make LDFLAGS=""
-}
-
-src_install() {
-	try make install prefix=${D}/usr mandir=${D}/usr/share/man exec_prefix=${D}
-
-	#add "vigr" symbolic link
-	dosym vipw /usr/sbin/vigr
-
-	mv ${D}/lib ${D}/usr
-	dosed -e "s:/lib:/usr/lib:" -e "s: libshadow.so':':" /usr/lib/libshadow.la
-	cd ${D}/usr/sbin
-	ln -s useradd ${D}/usr/sbin/adduser
-
-	dodir /etc
-	cp ${FILESDIR}/login.defs ${D}/etc
-
-	dodir /etc/default
-	cp ${FILESDIR}/useradd ${D}/etc/default
-	chmod 0600 ${D}/etc/default/useradd
-	dodir /etc/skel
-	cd ${S}/etc
-	cp shells shells.orig
-	echo "# /etc/shells: valid login shells" > shells
-	echo "/bin/sh" >> shells
-	echo "/bin/bash" >> shells
-	echo "/bin/tcsh" >> shells
-	echo "/bin/esh" >> shells
-	echo "/bin/ksh" >> shells
-	echo "/bin/zsh" >> shells
-	echo "/bin/sash" >> shells
-	insinto /etc
-	doins limits shells
-	insopts -m0600
-	doins login.access
-	#doins ${S}/debian/securetty
-	#Now using a new securetty with devfs device names added
-	#(compat names kept for non-devfs compatibility)
-	doins ${FILESDIR}/securetty
-	
-	cd pam.d
-	insinto /etc/pam.d
-	insopts -m0644
-	doins ${FILESDIR}/shadow
-	newins ${FILESDIR}/shadow groupadd
-	newins ${FILESDIR}/shadow useradd
-	
-	if [ -z "`use bootcd`" ]
-	then
-		cd ${S}/doc
-		dodoc ANNOUNCE INSTALL LICENSE README WISHLIST
-		docinto txt
-		dodoc HOWTO LSM README.* *.txt
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/lib*.{a,la}
-	fi
-}
diff --git a/sys-apps/shadow/shadow-20001016-r5.ebuild b/sys-apps/shadow/shadow-20001016-r5.ebuild
deleted file mode 100644
index 8b9762a899db..000000000000
--- a/sys-apps/shadow/shadow-20001016-r5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-20001016-r5.ebuild,v 1.1 2001/11/17 20:11:55 woodchip Exp $
-
-DESCRIPTION="Utilities to deal with user accounts"
-SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.gz"
-S=${WORKDIR}/${P}
-
-DEPEND=">=sys-libs/pam-0.73
-	sys-devel/gettext"
-
-RDEPEND=">=sys-libs/pam-0.73"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}/src
-	cp ${FILESDIR}/useradd.c ${S}/src
-}
-
-src_compile() {
-
-	./configure \
-	--disable-desrpc \
-	--with-libcrypt \
-	--with-libcrack \
-	--with-libpam \
-	--host=${CHOST} || die "bad configure"
-
-	# Parallel make fails sometimes
-	make LDFLAGS="" || die "compile problem"
-}
-
-src_install() {
-
-	dodir /etc/default /etc/skel
-
-	make \
-	prefix=${D}/usr \
-	exec_prefix=${D} \
-	mandir=${D}/usr/share/man \
-	install || die "install problem"
-
-	mv ${D}/lib ${D}/usr
-	dosed -e "s:/lib:/usr/lib:" -e "s: libshadow.so':':" /usr/lib/libshadow.la
-	dosym /usr/sbin/useradd /usr/sbin/adduser
-	dosym /usr/sbin/vipw /usr/sbin/vigr
-
-	insinto /etc
-	# Using a securetty with devfs device names added
-	# (compat names kept for non-devfs compatibility)
-	insopts -m0600 ; doins ${FILESDIR}/securetty
-	insopts -m0600 ; doins ${S}/etc/login.access
-	insopts -m0644 ; doins ${S}/etc/limits
-	insopts -m0644 ; doins ${FILESDIR}/login.defs
-	# fixme: remove when its released in rc-scripts
-	insopts -m0644 ; doins ${FILESDIR}/shells
-
-	insinto /etc/pam.d ; insopts -m0644
-	doins ${FILESDIR}/shadow
-	newins ${FILESDIR}/shadow groupadd
-	newins ${FILESDIR}/shadow useradd
-
-	if [ -z "`use bootcd`" ]
-	then
-		cd ${S}/doc
-		dodoc ANNOUNCE INSTALL LICENSE README WISHLIST
-		docinto txt
-		dodoc HOWTO LSM README.* *.txt
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/lib*.{a,la}
-	fi
-}
diff --git a/sys-apps/shadow/shadow-20001016-r6.ebuild b/sys-apps/shadow/shadow-20001016-r8.ebuild
index 425b5f8d5e62..c9c2fbd199f8 100644
--- a/sys-apps/shadow/shadow-20001016-r6.ebuild
+++ b/sys-apps/shadow/shadow-20001016-r8.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-20001016-r6.ebuild,v 1.3 2002/01/15 21:55:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-20001016-r8.ebuild,v 1.1 2002/02/24 17:35:27 azarah Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Utilities to deal with user accounts"
 SRC_URI="ftp://ftp.pld.org.pl/software/shadow/old/${P}.tar.gz"
-S=${WORKDIR}/${P}
 
 DEPEND=">=sys-libs/pam-0.73 sys-devel/gettext"
-
 RDEPEND=">=sys-libs/pam-0.73"
 
 src_unpack() {
@@ -18,32 +17,32 @@ src_unpack() {
 }
 
 src_compile() {
-
 	./configure \
-	--disable-desrpc \
-	--with-libcrypt \
-	--with-libcrack \
-	--with-libpam \
-	--host=${CHOST} || die "bad configure"
-
+		--disable-desrpc \
+		--with-libcrypt \
+		--with-libcrack \
+		--with-libpam \
+		--host=${CHOST} || die "bad configure"
+		
 	# Parallel make fails sometimes
 	make LDFLAGS="" || die "compile problem"
 }
 
 src_install() {
-
 	dodir /etc/default /etc/skel
 
-	make \
-	prefix=${D}/usr \
-	exec_prefix=${D} \
-	mandir=${D}/usr/share/man \
-	install || die "install problem"
+	make prefix=${D}/usr \
+		exec_prefix=${D} \
+		mandir=${D}/usr/share/man \
+		install || die "install problem"
 
 	mv ${D}/lib ${D}/usr
 	dosed -e "s:/lib:/usr/lib:" -e "s: libshadow.so':':" /usr/lib/libshadow.la
+	dosym /usr/bin/newgrp /usr/bin/sg
 	dosym /usr/sbin/useradd /usr/sbin/adduser
 	dosym /usr/sbin/vipw /usr/sbin/vigr
+	# remove dead links
+	rm -f ${D}/bin/{sg,vipw}
 
 	insinto /etc
 	# Using a securetty with devfs device names added
@@ -52,14 +51,24 @@ src_install() {
 	insopts -m0600 ; doins ${S}/etc/login.access
 	insopts -m0644 ; doins ${S}/etc/limits
 	insopts -m0644 ; doins ${FILESDIR}/login.defs
-
 	insinto /etc/pam.d ; insopts -m0644
 	doins ${FILESDIR}/shadow
 	newins ${FILESDIR}/shadow groupadd
 	newins ${FILESDIR}/shadow useradd
+	doins ${FILESDIR}/chage
 
 	if [ -z "`use bootcd`" ]
 	then
+		# the manpage install is beyond my comprehension, and also broken.
+		# just do it over.
+		rm -rf ${D}/usr/share/man/*
+		for q in man/*.[0-9]
+		do
+			local dir="${D}/usr/share/man/man${q##*.}"
+			mkdir -p $dir
+			cp $q $dir
+		done
+		
 		cd ${S}/doc
 		dodoc ANNOUNCE INSTALL LICENSE README WISHLIST
 		docinto txt
@@ -68,3 +77,4 @@ src_install() {
 		rm -rf ${D}/usr/share ${D}/usr/lib/lib*.{a,la}
 	fi
 }
+
diff --git a/sys-apps/shadow/shadow-4.0.1-r1.ebuild b/sys-apps/shadow/shadow-4.0.1-r1.ebuild
deleted file mode 100644
index ee965761ee10..000000000000
--- a/sys-apps/shadow/shadow-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.1-r1.ebuild,v 1.1 2002/01/15 23:53:47 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Utilities to deal with user accounts"
-SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.gz"
-DEPEND=">=sys-libs/pam-0.73 sys-devel/gettext"
-RDEPEND=">=sys-libs/pam-0.73"
-
-src_compile() {
-	./configure \
-	--disable-desrpc \
-	--with-libcrypt \
-	--with-libcrack \
-	--with-libpam \
-	--enable-shared=no \
-	--enable-static=yes \
-	--host=${CHOST} || die "bad configure"
-	# Parallel make fails sometimes
-	make LDFLAGS="" || die "compile problem"
-}
-
-src_install() {
-	dodir /etc/default /etc/skel
-
-	make \
-	prefix=${D}/usr \
-	exec_prefix=${D} \
-	mandir=${D}/usr/share/man \
-	install || die "install problem"
-
-	mv ${D}/lib ${D}/usr
-	dosed -e "s:/lib:/usr/lib:" -e "s: libshadow.so':':" /usr/lib/libshadow.la
-	dosym /usr/bin/newgrp /usr/bin/sg
-	dosym /usr/sbin/useradd /usr/sbin/adduser
-	dosym /usr/sbin/vipw /usr/sbin/vigr
-	# remove dead links
-	rm -f ${D}/bin/{sg,vipw}
-
-	insinto /etc
-	# Using a securetty with devfs device names added
-	# (compat names kept for non-devfs compatibility)
-	insopts -m0600 ; doins ${FILESDIR}/securetty
-	insopts -m0600 ; doins ${S}/etc/login.access
-	insopts -m0644 ; doins ${S}/etc/limits
-	insopts -m0644 ; doins ${FILESDIR}/login.defs
-	insinto /etc/pam.d ; insopts -m0644
-	doins ${FILESDIR}/shadow
-	newins ${FILESDIR}/shadow groupadd
-	newins ${FILESDIR}/shadow useradd
-	doins ${FILESDIR}/chage chage
-	cd ${S}/doc
-	dodoc ANNOUNCE INSTALL LICENSE README WISHLIST
-	docinto txt
-	dodoc HOWTO LSM README.* *.txt
-
-	# install missing manpages
-	doman ${S}/man/{shadow.3,shadowconfig.8}
-}
diff --git a/sys-apps/shadow/shadow-4.0.1.ebuild b/sys-apps/shadow/shadow-4.0.1.ebuild
deleted file mode 100644
index 8fae84a9866f..000000000000
--- a/sys-apps/shadow/shadow-4.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.1.ebuild,v 1.1 2002/01/15 21:55:23 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Utilities to deal with user accounts"
-SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.gz"
-DEPEND=">=sys-libs/pam-0.73 sys-devel/gettext"
-RDEPEND=">=sys-libs/pam-0.73"
-
-src_compile() {
-	./configure \
-	--disable-desrpc \
-	--with-libcrypt \
-	--with-libcrack \
-	--with-libpam \
-	--host=${CHOST} || die "bad configure"
-	# Parallel make fails sometimes
-	make LDFLAGS="" || die "compile problem"
-}
-
-src_install() {
-	dodir /etc/default /etc/skel
-
-	make \
-	prefix=${D}/usr \
-	exec_prefix=${D} \
-	mandir=${D}/usr/share/man \
-	install || die "install problem"
-
-	mv ${D}/lib ${D}/usr
-	dosed -e "s:/lib:/usr/lib:" -e "s: libshadow.so':':" /usr/lib/libshadow.la
-	dosym /usr/sbin/useradd /usr/sbin/adduser
-	dosym /usr/sbin/vipw /usr/sbin/vigr
-
-	insinto /etc
-	# Using a securetty with devfs device names added
-	# (compat names kept for non-devfs compatibility)
-	insopts -m0600 ; doins ${FILESDIR}/securetty
-	insopts -m0600 ; doins ${S}/etc/login.access
-	insopts -m0644 ; doins ${S}/etc/limits
-	insopts -m0644 ; doins ${FILESDIR}/login.defs
-	insinto /etc/pam.d ; insopts -m0644
-	doins ${FILESDIR}/shadow
-	newins ${FILESDIR}/shadow groupadd
-	newins ${FILESDIR}/shadow useradd
-	newins ${FILESDIR}/shadow chage
-	cd ${S}/doc
-	dodoc ANNOUNCE INSTALL LICENSE README WISHLIST
-	docinto txt
-	dodoc HOWTO LSM README.* *.txt
-}