cleanups; bugfixes; sync

8 files changed, 209 insertions, 143 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index af9a3a472c76..9cc4db15a97c 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,17 @@
 # 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.10 2002/08/05 18:52:16 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.11 2002/10/13 09:35:10 azarah Exp $
+
+*pam-0.75-r8 (13 Oct 2002)
+
+  13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> pam-0.75-r8.ebuild :
+
+  Add pam-0.75-pam_console-fix-fullpath-in-file-classes.patch to fix a small
+  compat problem between pam-login and pam_console.so.  pam_console.so expects
+  PAM_TTY to be set by login without prefixing "/dev/" it seems, which
+  pam-login did.
+
+  Synced with Mandrake and Redhat for latest patches.
 
   05 Aug 2002; M.Schlemmer <azarah@gentoo.org> ${P}-pam_group-confile.patch :
   Fixes the config file location of pam_group.so.  This resolves bug #6010.
diff --git a/sys-libs/pam/files/0.75-r8/pam.d/rexec b/sys-libs/pam/files/0.75-r8/pam.d/rexec
new file mode 100644
index 000000000000..7fb1cc770069
--- /dev/null
+++ b/sys-libs/pam/files/0.75-r8/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-r8/pam.d/rlogin b/sys-libs/pam/files/0.75-r8/pam.d/rlogin
new file mode 100644
index 000000000000..ae4cd2f796f2
--- /dev/null
+++ b/sys-libs/pam/files/0.75-r8/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-r8/pam.d/rsh b/sys-libs/pam/files/0.75-r8/pam.d/rsh
new file mode 100644
index 000000000000..9feb9af03d96
--- /dev/null
+++ b/sys-libs/pam/files/0.75-r8/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-r6 b/sys-libs/pam/files/digest-pam-0.75-r6
deleted file mode 100644
index 94204c933eaa..000000000000
--- a/sys-libs/pam/files/digest-pam-0.75-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 513088e0374c235e3b109119862e6bd4 Linux-PAM-0.75.tar.gz 874549
diff --git a/sys-libs/pam/files/pam-0.75-r6-gentoo.tbz2 b/sys-libs/pam/files/pam-0.75-r6-gentoo.tbz2
deleted file mode 100644
index 68f2aaea3118..000000000000
--- a/sys-libs/pam/files/pam-0.75-r6-gentoo.tbz2
+++ /dev/null
diff --git a/sys-libs/pam/pam-0.75-r6.ebuild b/sys-libs/pam/pam-0.75-r6.ebuild
deleted file mode 100644
index 4af283b0129b..000000000000
--- a/sys-libs/pam/pam-0.75-r6.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.75-r6.ebuild,v 1.10 2002/10/05 05:39:27 drobbins Exp $
-
-IUSE="berkdb"
-
-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 sparc sparc64"
-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
-
-	# for gcc3 compatibility
-	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
-	# for gcc3 compatibility
-	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.
-	#do not remove this, as some module can fail to build
-	#and effectively lock the user out of his system.
-	for x in modules/pam_*
-	do
-		if [ -d ${x} ]
-		then
-			if ! ls -1 ${D}/lib/security/`basename ${x}`*.so
-			then
-				if [ -z "`use berkdb`" ] && \
-				   [ "`basename ${x}`" = "pam_userdb" ]
-				then
-					continue
-				fi
-				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-r8.ebuild b/sys-libs/pam/pam-0.75-r8.ebuild
new file mode 100644
index 000000000000..af5d9704e0b5
--- /dev/null
+++ b/sys-libs/pam/pam-0.75-r8.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.75-r8.ebuild,v 1.1 2002/10/13 09:35:10 azarah Exp $
+
+IUSE="berkdb"
+
+inherit gcc
+
+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
+	mirror://gentoo/pam-${PVR}-gentoo.tbz2"
+HOMEPAGE="http://www.redhat.com/linux-info/pam/"
+
+LICENSE="PAM"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+SLOT="0"
+
+DEPEND=">=sys-libs/cracklib-2.7-r3
+	=dev-libs/glib-1.2*
+	>=sys-libs/pwdb-0.61-r3
+	>=sys-devel/autoconf-2.5
+	>=sys-devel/automake-1.6
+	>=sys-devel/flex-2.5.4a-r5
+	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 "Failed to unpack patches"
+		
+	cd ${S}
+	tar -jxf ${S2}/pam-redhat-0.75-41.1.tar.bz2 || \
+		die "Failed to unpack pam-redhat-0.75-41.1.tar.bz2"
+		
+	cp /usr/share/automake/install-sh . || die
+	ln -sf defs/redhat.defs default.defs
+	
+	einfo "Applying various patches (bugfixes/updates)..."
+	for x in $(cat ${S2}/patch.list ${S2}/patch.list.gentoo)
+	do
+		if [ -f ${S2}/patchdir/${x} ]
+		then
+			einfo "  ${x##*/}..."
+			bzip2 -dc ${S2}/patchdir/${x} | patch -p1 > /dev/null || \
+				die "Failed Patch: ${x##*/}!"
+		fi
+	done
+
+	for readme in modules/pam_*/README
+	do
+		cp -f ${readme} doc/txts/README.$(dirname ${readme} | sed -e 's|^modules/||')
+	done
+
+	export WANT_AUTOCONF_2_5=1
+	autoconf
+
+	cd ${S}/doc
+	einfo "Unpacking docs..."
+	tar -xvzf Linux-PAM-0.75-docs.tar.gz > /dev/null || \
+		die "Failed to unpack docs"
+}
+
+src_compile() {
+	export CFLAGS="${CFLAGS} -fPIC"
+	
+	./configure --host=${CHOST} \
+		--prefix=/ \
+		--sbindir=/usr/sbin \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--enable-securedir=/lib/security \
+		--enable-fakeroot=${D} \
+		--enable-static-libpam \
+		|| 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
+	
+	# Fix warnings for gcc-2.95.3
+	if [ "$(gcc-version)" = "2.95" ]
+	then
+		cp Make.Rules Make.Rules.orig
+		sed -e "s:-Wpointer-arith::" \
+			Make.Rules.orig > Make.Rules
+		rm -f Make.Rules.orig
+	fi
+	
+	if [ -z "`use berkdb`" ]
+	then
+		cp Make.Rules Make.Rules.orig
+		sed -e "s:^HAVE_LIBNDBM=yes:HAVE_LIBNDBM=no:" \
+			Make.Rules.orig > Make.Rules
+		rm -f Make.Rules.orig
+	fi
+	
+	make || die "Failed to build"
+}
+
+src_install() {
+	make FAKEROOT=${D} \
+		LDCONFIG="" \
+		install || die
+
+	# 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 &> /dev/null
+			then
+				if [ -z "`use berkdb`" ] && \
+				   [ "$(basename ${x})" = "pam_userdb" ]
+				then
+					continue
+				fi
+				eerror "ERROR: $(basename ${x}) module did not build."
+				exit 1
+			fi
+		fi
+	done
+
+	cd ${S}
+	dodoc CHANGELOG Copyright README
+	docinto modules
+	dodoc modules/README
+	dodoc doc/txts/README.*
+	docinto txt
+	dodoc doc/txts/*.txt doc/specs/*.txt
+	docinto print
+	dodoc doc/ps/*.ps
+
+	doman doc/man/*.[38]
+
+	docinto html
+	dohtml -r doc/html/
+
+	dodir /usr/lib
+	cd ${D}/lib
+	for x in pam pamc pam_misc
+	do
+		rm lib${x}.so
+		ln -s lib${x}.so.${PV} lib${x}.so
+		ln -s lib${x}.so.${PV} lib${x}.so.0
+		mv lib${x}.a ${D}/usr/lib
+	done
+
+	# need this for pam_console
+	keepdir /var/run/console
+
+	insinto /etc/pam.d
+	for x in ${FILESDIR}/${PVR}/pam.d/*
+	do
+		if [ -f ${x} ]
+		then
+			doins ${x}
+		fi
+	done
+}
+