[patch] Pamless shadow diff

shadow-4.0.3-r7-8.ebuild.diff (text/plain), 3.70 KB, created by solar (RETIRED) on 2003-10-15 14:23:46 UTC

--- shadow-4.0.3-r7.ebuild	2003-09-26 16:12:32.000000000 -0400
+++ shadow-4.0.3-r8.ebuild	2003-10-11 14:20:57.000000000 -0400
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /home/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r7.ebuild,v 1.5 2003/09/26 19:55:11 azarah Exp $
 
-IUSE=""
+IUSE="pam"
 
 inherit eutils libtool gnuconfig
 
@@ -17,13 +17,12 @@
 SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm ia64"
 
-DEPEND=">=sys-libs/pam-0.75-r4
-	>=sys-libs/cracklib-2.7-r3
+DEPEND=">=sys-libs/cracklib-2.7-r3
+	pam? (	>=sys-libs/pam-0.75-r4 )
 	nls? ( sys-devel/gettext )"
 
-RDEPEND=">=sys-libs/pam-0.75-r4
-	>=sys-libs/cracklib-2.7-r3"
-
+RDEPEND=">=sys-libs/cracklib-2.7-r3
+	pam? ( >=sys-libs/pam-0.75-r4 )"
 
 pkg_preinst() {
 	rm -f ${ROOT}/etc/pam.d/system-auth.new
@@ -38,7 +37,7 @@
 	# pam_xauth for one, is then never used.  This should close bug #8831.
 	#
 	# <[e-mail]> (19 Oct 2002)
-	epatch ${FILESDIR}/${P}-su-pam_open_session.patch-v2
+	use pam && epatch ${FILESDIR}/${P}-su-pam_open_session.patch-v2
 
 	# If su should not simulate a login shell, use '/bin/sh' as shell to enable
 	# running of commands as user with /bin/false as shell, closing bug #15015.
@@ -60,11 +59,13 @@
 
 	local myconf=""
 	use nls || myconf="${myconf} --disable-nls"
+	use pam && myconf="${myconf} --with-libpam --with-libcrack" || myconf="${myconf} --without-libpam"
+	# Note: configure.in has no targets to explicitly turn off pam but we 
+	# leave this in there anyway incase a new version does
 
 	./configure --disable-desrpc \
 		--with-libcrypt \
 		--with-libcrack \
-		--with-libpam \
 		--enable-shared=no \
 		--enable-static=yes \
 		--host=${CHOST} \
@@ -85,7 +86,7 @@
 	# Do not install this login, but rather the one from
 	# pam-login, as this one have a serious root exploit
 	# with pam_limits in use.
-	rm ${D}/bin/login
+	use pam && rm ${D}/bin/login
 
 	mv ${D}/lib ${D}/usr
 	dosed "s:/lib':/usr/lib':g" /usr/lib/libshadow.la
@@ -109,23 +110,21 @@
 	insinto /etc/default
 	insopts -m0600
 	doins ${FILESDIR}/default/useradd
-# From sys-apps/pam-login now
-#	insopts -m0644 ; doins ${FILESDIR}/login.defs
-
-	insinto /etc/pam.d ; insopts -m0644
-	for x in ${FILESDIR}/pam.d/*
-	do
-		[ -f ${x} ] && doins ${x}
-	done
-
-	cd ${FILESDIR}/pam.d
-	newins system-auth-1.1 system-auth.new || die
-	newins shadow chage
-	newins shadow chsh
-	newins shadow chfn
-	newins shadow useradd
-	newins shadow groupadd
-
+	if [ `use pam` ] ; then
+		# From sys-apps/pam-login now
+		#	insopts -m0644 ; doins ${FILESDIR}/login.defs
+		insinto /etc/pam.d ; insopts -m0644
+		for x in ${FILESDIR}/pam.d/* ; do
+			[ -f ${x} ] && doins ${x}
+		done
+		cd ${FILESDIR}/pam.d
+		newins system-auth-1.1 system-auth.new || die
+		newins shadow chage
+		newins shadow chsh
+		newins shadow chfn
+		newins shadow useradd
+		newins shadow groupadd
+	fi
 	cd ${S}
 	# The manpage install is beyond my comprehension, and
 	# also broken. Just do it over.
@@ -135,11 +134,13 @@
 		[ -f ${x} ] && doman ${x}
 	done
 
-	# Dont install the manpage, since we dont use
-	# login with shadow
-	rm -f ${D}/usr/share/man/man1/login.*
-	# We use pam, so this is not applicable.
-	rm -f ${D}/usr/share/man/man5/suauth.*
+	if [ ! `use pam` ] ; then
+		# Dont install the manpage, since we dont use
+		# login with shadow
+		rm -f ${D}/usr/share/man/man1/login.*
+		# We use pam, so this is not applicable.
+		rm -f ${D}/usr/share/man/man5/suauth.*
+	fi
 
 	cd ${S}/doc
 	dodoc ANNOUNCE INSTALL LICENSE README WISHLIST
@@ -156,6 +157,7 @@
 }
 
 pkg_postinst() {
+	use pam || return 0;
 	local CHECK1="$(md5sum ${ROOT}/etc/pam.d/system-auth | cut -d ' ' -f 1)"
 	local CHECK2="$(md5sum ${ROOT}/etc/pam.d/system-auth.new | cut -d ' ' -f 1)"