cleanup; updated some patches

11 files changed, 98 insertions, 164 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 04d881817544..a8fa8b32f3b8 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.7 2002/07/16 03:49:32 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.8 2002/07/30 22:11:02 azarah Exp $
+
+*pam-0.75-r7 (31 Jul 2002)
+
+  31 Jul 2002; M.Schlemmer <azarah@gentoo.org> pam-0.75-r7.ebuild :
+  Update some patches.  Ebuild cleanups, as well as some compiler
+  fixes.
 
 
   15 Jul 2002; Mark Guertin <gerk@gentoo.org>
diff --git a/sys-libs/pam/files/0.75-r7/pam.d/rexec b/sys-libs/pam/files/0.75-r7/pam.d/rexec
new file mode 100644
index 000000000000..7fb1cc770069
--- /dev/null
+++ b/sys-libs/pam/files/0.75-r7/pam.d/rexec
@@ -0,0 +1,9 @@
+#%PAM-1.0
+# For root login to succeed here with pam_securetty, "rexec" must be
+# listed in /etc/securetty.
+auth       required	/lib/security/pam_nologin.so
+auth       required	/lib/security/pam_securetty.so
+auth       required     /lib/security/pam_env.so
+auth       required	/lib/security/pam_stack.so service=system-auth
+account    required	/lib/security/pam_stack.so service=system-auth
+session    required	/lib/security/pam_stack.so service=system-auth
diff --git a/sys-libs/pam/files/0.75-r7/pam.d/rlogin b/sys-libs/pam/files/0.75-r7/pam.d/rlogin
new file mode 100644
index 000000000000..ae4cd2f796f2
--- /dev/null
+++ b/sys-libs/pam/files/0.75-r7/pam.d/rlogin
@@ -0,0 +1,11 @@
+#%PAM-1.0
+# For root login to succeed here with pam_securetty, "rlogin" must be
+# listed in /etc/securetty.
+auth       required	/lib/security/pam_nologin.so
+auth       required	/lib/security/pam_securetty.so
+auth       required     /lib/security/pam_env.so
+auth       sufficient	/lib/security/pam_rhosts_auth.so
+auth       required	/lib/security/pam_stack.so service=system-auth
+account    required	/lib/security/pam_stack.so service=system-auth
+password   required	/lib/security/pam_stack.so service=system-auth
+session    required	/lib/security/pam_stack.so service=system-auth
diff --git a/sys-libs/pam/files/0.75-r7/pam.d/rsh b/sys-libs/pam/files/0.75-r7/pam.d/rsh
new file mode 100644
index 000000000000..9feb9af03d96
--- /dev/null
+++ b/sys-libs/pam/files/0.75-r7/pam.d/rsh
@@ -0,0 +1,9 @@
+#%PAM-1.0
+# For root login to succeed here with pam_securetty, "rsh" must be
+# listed in /etc/securetty.
+auth       required	/lib/security/pam_nologin.so
+auth       required	/lib/security/pam_securetty.so
+auth       required     /lib/security/pam_env.so
+auth       required     /lib/security/pam_rhosts_auth.so
+account    required	/lib/security/pam_stack.so service=system-auth
+session    required	/lib/security/pam_stack.so service=system-auth
diff --git a/sys-libs/pam/files/digest-pam-0.75-r5 b/sys-libs/pam/files/digest-pam-0.75-r5
deleted file mode 100644
index 94204c933eaa..000000000000
--- a/sys-libs/pam/files/digest-pam-0.75-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 513088e0374c235e3b109119862e6bd4 Linux-PAM-0.75.tar.gz 874549
diff --git a/sys-libs/pam/files/digest-pam-0.75-r4 b/sys-libs/pam/files/digest-pam-0.75-r7
index 94204c933eaa..94204c933eaa 100644
--- a/sys-libs/pam/files/digest-pam-0.75-r4
+++ b/sys-libs/pam/files/digest-pam-0.75-r7
diff --git a/sys-libs/pam/files/pam-0.75-r4-gentoo.tbz2 b/sys-libs/pam/files/pam-0.75-r4-gentoo.tbz2
deleted file mode 100644
index 68f2aaea3118..000000000000
--- a/sys-libs/pam/files/pam-0.75-r4-gentoo.tbz2
+++ /dev/null
diff --git a/sys-libs/pam/files/pam-0.75-r5-gentoo.tbz2 b/sys-libs/pam/files/pam-0.75-r5-gentoo.tbz2
deleted file mode 100644
index 68f2aaea3118..000000000000
--- a/sys-libs/pam/files/pam-0.75-r5-gentoo.tbz2
+++ /dev/null
diff --git a/sys-libs/pam/files/pam-0.75-r7-gentoo.tbz2 b/sys-libs/pam/files/pam-0.75-r7-gentoo.tbz2
new file mode 100644
index 000000000000..d5c05067bbbe
--- /dev/null
+++ b/sys-libs/pam/files/pam-0.75-r7-gentoo.tbz2
diff --git a/sys-libs/pam/pam-0.75-r4.ebuild b/sys-libs/pam/pam-0.75-r4.ebuild
deleted file mode 100644
index f3f123745645..000000000000
--- a/sys-libs/pam/pam-0.75-r4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.75-r4.ebuild,v 1.12 2002/07/16 03:49:32 gerk Exp $
-
-S=${WORKDIR}/Linux-PAM-${PV}
-S2=${WORKDIR}/pam
-DESCRIPTION="Pluggable Authentication Modules"
-SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz"
-HOMEPAGE="http://www.redhat.com/linux-info/pam/"
-LICENSE="PAM"
-KEYWORDS="x86 ppc"
-SLOT="0"
-
-DEPEND=">=sys-libs/cracklib-2.7-r3
-	=dev-libs/glib-1.2*
-	>=sys-libs/pwdb-0.61-r3
-	>=sys-devel/autoconf-2.13
-	>=sys-devel/automake-1.4
-	berkdb? ( ~sys-libs/db-1.85 )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${WORKDIR}
-	tar -jxf ${FILESDIR}/pam-${PVR}-gentoo.tbz2 || die
-	cd ${S}
-	tar -jxf ${S2}/pam-redhat-0.75-21.tar.bz2 || die
-	cp /usr/share/automake/install-sh . || die
-	ln -sf defs/redhat.defs default.defs
-	
-	for x in `cat ${S2}/patch.list`
-	do
-		bzip2 -dc ${S2}/patchdir/${x} | patch -p1 || die
-	done
-
-	autoconf
-	cp configure configure_old
-	sed -e "s:-lpwdb:-lpwdb -lcrypt -L/lib -L/usr/lib:" \
-		configure_old > configure
-	chmod 755 configure
-}
-
-src_compile() {
-	./configure --prefix= \
-		--host=${CHOST} \
-		--sbindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--enable-fakeroot=${D} \
-		--enable-static-libpam \
-		--enable-read-both-confs || die
-		
-	cp Makefile Makefile.orig
-	sed -e "s:libpam_misc doc examples:libpam_misc:" \
-		Makefile.orig > Makefile
-	cp Make.Rules Make.orig
-	sed -e "s:/usr/bin/install:/bin/install:" \
-		-e "s:-Wpointer-arith::" \
-		-e "s:^CFLAGS=:CFLAGS=${CFLAGS} :" \
-		Make.orig > Make.Rules
-	cp modules/pam_pwdb/Makefile modules/pam_pwdb/Makefile_orig
-	sed -e "s:-lpwdb:-lpwdb -lcrypt -lnsl:g" \
-		modules/pam_pwdb/Makefile_orig > modules/pam_pwdb/Makefile
-		
-	if [ -z "`use berkdb`" ]
-	then
-		cp Make.Rules Make.orig
-		sed -e "s:^HAVE_LIBNDBM=yes:HAVE_LIBNDBM=no:" \
-			Make.orig > Make.Rules
-	fi
-	
-	make || die
-
-	cd doc
-	tar xvzf Linux-PAM-0.75-docs.tar.gz
-}
-
-src_install() {
-	make MANDIR="/usr/share/man" \
-		install || die
-
-    #make sure every module built.
-	for x in modules/pam_*
-	do
-		if [ -d ${x} ]
-		then
-			if ! ls -1 ${D}/lib/security/`basename ${x}`*.so
-			then
-				echo ERROR `basename ${x}` module did not build.
-				exit 1
-			fi
-		fi
-	done
-
-	dodoc CHANGELOG Copyright README
-	docinto modules
-	dodoc modules/README
-	
-	cd modules
-	for i in pam_*
-	do
-		if [ -f $i/README ]
-		then
-			docinto modules/$i
-			dodoc $i/README
-		fi
-	done
-
-	cd ..
-	docinto html
-	dohtml doc/html/*.html
-	docinto txt
-	dodoc doc/txts/*.txt doc/specs/*.txt
-	docinto print
-	dodoc doc/ps/*.ps
-
-
-	cd ${D}/lib
-	for i in pam pamc pam_misc
-	do
-		rm lib${i}.so
-		ln -s lib${i}.so.${PV} lib${i}.so
-		ln -s lib${i}.so.${PV} lib${i}.so.0
-	done
-
-	insinto /etc/pam.d
-	cd ${FILESDIR}/${PVR}/pam.d
-	doins *
-}
-
diff --git a/sys-libs/pam/pam-0.75-r5.ebuild b/sys-libs/pam/pam-0.75-r7.ebuild
index 6941793521c9..df5a713db3e6 100644
--- a/sys-libs/pam/pam-0.75-r5.ebuild
+++ b/sys-libs/pam/pam-0.75-r7.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.75-r5.ebuild,v 1.7 2002/07/16 03:49:32 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.75-r7.ebuild,v 1.1 2002/07/30 22:11:02 azarah Exp $
 
 S=${WORKDIR}/Linux-PAM-${PV}
 S2=${WORKDIR}/pam
 DESCRIPTION="Pluggable Authentication Modules"
 SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz"
 HOMEPAGE="http://www.redhat.com/linux-info/pam/"
+
 LICENSE="PAM"
 KEYWORDS="x86 ppc"
 SLOT="0"
@@ -14,52 +15,71 @@ SLOT="0"
 DEPEND=">=sys-libs/cracklib-2.7-r3
 	=dev-libs/glib-1.2*
 	>=sys-libs/pwdb-0.61-r3
-	>=sys-devel/autoconf-2.13
-	>=sys-devel/automake-1.4
-	berkdb? ( ~sys-libs/db-1.85 )"
+	>=sys-devel/autoconf-2.5
+	>=sys-devel/automake-1.6
+	berkdb? ( ~sys-libs/db-1.85
+	          ~sys-libs/db-3.2.9 )"
 
 src_unpack() {
 	unpack ${A}
 
 	cd ${WORKDIR}
-	tar -jxf ${FILESDIR}/pam-${PVR}-gentoo.tbz2 || die
+	tar -jxf ${FILESDIR}/pam-${PVR}-gentoo.tbz2 || \
+		die "Failed to unpack patches"
+		
 	cd ${S}
-	tar -jxf ${S2}/pam-redhat-0.75-21.tar.bz2 || die
+	tar -jxf ${S2}/pam-redhat-0.75-21.tar.bz2 || \
+		die "Failed to unpack pam-redhat-0.75-21.tar.bz2"
+		
 	cp /usr/share/automake/install-sh . || die
 	ln -sf defs/redhat.defs default.defs
 	
 	for x in `cat ${S2}/patch.list`
 	do
-		bzip2 -dc ${S2}/patchdir/${x} | patch -p1 || die
+		bzip2 -dc ${S2}/patchdir/${x} | patch -p1 || \
+			die "Failed to apply ${x}"
 	done
 
+	export WANT_AUTOCONF_2_5=1
 	autoconf
 
-	# for gcc3 compatibility
+	# For some reason do not link to libcrypt.
 	cp configure configure_old
 	sed -e "s:-lpwdb:-lpwdb -lcrypt -L/lib -L/usr/lib:" \
 		configure_old > configure
-	chmod 755 configure
+	chmod 0755 configure
 }
 
 src_compile() {
+	export CFLAGS="${CFLAGS} -fPIC"
+	
 	./configure --prefix= \
 		--host=${CHOST} \
 		--sbindir=/usr/sbin \
 		--mandir=/usr/share/man \
 		--enable-fakeroot=${D} \
 		--enable-static-libpam \
-		--enable-read-both-confs || die
-		
+		|| die "Failed to configure"
+	
+	# Python stuff in docs gives sandbox problems
 	cp Makefile Makefile.orig
 	sed -e "s:libpam_misc doc examples:libpam_misc:" \
 		Makefile.orig > Makefile
 	cp Make.Rules Make.orig
-	sed -e "s:/usr/bin/install:/bin/install:" \
-		-e "s:-Wpointer-arith::" \
-		-e "s:^CFLAGS=:CFLAGS=${CFLAGS} :" \
-		Make.orig > Make.Rules
-	# for gcc3 compatibility
+	
+	# Fix warnings for gcc-2.95.3
+	[ -z "${CC}" ] && CC=gcc
+	if [ "`${CC} -dumpversion`" = "2.95.3" ]
+	then
+		sed -e "s:/usr/bin/install:/bin/install:" \
+			-e "s:-Wpointer-arith::" \
+			Make.orig > Make.Rules
+	else
+		sed -e "s:/usr/bin/install:/bin/install:" \
+			Make.orig > Make.Rules
+	fi
+	
+	# For some reason do not link to libcrypt
 	cp modules/pam_pwdb/Makefile modules/pam_pwdb/Makefile_orig
 	sed -e "s:-lpwdb:-lpwdb -lcrypt -lnsl:g" \
 		modules/pam_pwdb/Makefile_orig > modules/pam_pwdb/Makefile
@@ -71,24 +91,33 @@ src_compile() {
 			Make.orig > Make.Rules
 	fi
 	
-	make || die
+	make || die "Failed to build"
 
-	cd doc
-	tar xvzf Linux-PAM-0.75-docs.tar.gz
+	cd ${S}/doc
+	tar -xvzf Linux-PAM-0.75-docs.tar.gz || die "Failed to unpack docs"
 }
 
 src_install() {
-	make MANDIR="/usr/share/man" \
+	make FAKEROOT=${D} \
+		MANDIR="/usr/share/man" \
+		LDCONFIG="" \
 		install || die
 
-    #make sure every module built.
-	for x in modules/pam_*
+	#make sure every module built.
+	#do not remove this, as some module can fail to build
+	#and effectively lock the user out of his system.
+	for x in ${S}/modules/pam_*
 	do
 		if [ -d ${x} ]
 		then
 			if ! ls -1 ${D}/lib/security/`basename ${x}`*.so
 			then
-				echo ERROR `basename ${x}` module did not build.
+				if [ -z "`use berkdb`" ] && \
+				   [ "`basename ${x}`" = "pam_userdb" ]
+				then
+					continue
+				fi
+				eerror "ERROR: `basename ${x}` module did not build."
 				exit 1
 			fi
 		fi
@@ -98,17 +127,17 @@ src_install() {
 	docinto modules
 	dodoc modules/README
 	
-	cd modules
-	for i in pam_*
+	cd ${S}/modules
+	for x in pam_*
 	do
-		if [ -f $i/README ]
+		if [ -f ${x}/README ]
 		then
-			docinto modules/$i
-			dodoc $i/README
+			docinto modules/${x}
+			dodoc ${x}/README
 		fi
 	done
 
-	cd ..
+	cd ${S}
 	docinto html
 	dohtml doc/html/*.html
 	docinto txt
@@ -118,11 +147,11 @@ src_install() {
 
 
 	cd ${D}/lib
-	for i in pam pamc pam_misc
+	for x in pam pamc pam_misc
 	do
-		rm lib${i}.so
-		ln -s lib${i}.so.${PV} lib${i}.so
-		ln -s lib${i}.so.${PV} lib${i}.so.0
+		rm lib${x}.so
+		ln -s lib${x}.so.${PV} lib${x}.so
+		ln -s lib${x}.so.${PV} lib${x}.so.0
 	done
 
 	insinto /etc/pam.d