fix bugs 37719 and 37725 by enabling building of libshadow.so

3 files changed, 39 insertions, 18 deletions

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index cea378354a8f..6b4fe1028468 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,6 +1,6 @@
-MD5 d580a7977ae8303f6f6722feac667998 shadow-4.0.3-r10.ebuild 5680
+MD5 7452616f9e23975f06b648553542e190 shadow-4.0.3-r10.ebuild 5680
 MD5 e8541b13efd1985eb9e1175545c374e7 shadow-4.0.3-r9.ebuild 5428
-MD5 0f5d0c5e35fe73cef18ea622c3a29be9 ChangeLog 9414
+MD5 c0e4cb74513dd41eccff94322beb7938 ChangeLog 9414
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882
 MD5 e70a5f61d37c3c67a4b860d8a6191dbc files/securetty 230
diff --git a/sys-apps/shadow/files/shadow-4.0.3-shared-needs-pam.patch b/sys-apps/shadow/files/shadow-4.0.3-shared-needs-pam.patch
new file mode 100644
index 000000000000..53a4b6d6de19
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.3-shared-needs-pam.patch
@@ -0,0 +1,19 @@
+--- shadow-4.0.3/libmisc/Makefile.am.old	2002-03-10 02:11:55.000000000 -0500
++++ shadow-4.0.3/libmisc/Makefile.am	2004-01-09 21:09:15.000000000 -0500
+@@ -58,4 +58,4 @@
+ 	valid.c \
+ 	xmalloc.c
+ 
+-libmisc_la_LIBADD = $(LIBCRACK)
++libmisc_la_LIBADD = $(LIBCRACK) $(LIBPAM)
+--- shadow-4.0.3/libmisc/Makefile.in.old	2002-03-13 14:04:01.000000000 -0500
++++ shadow-4.0.3/libmisc/Makefile.in	2004-01-09 21:09:27.000000000 -0500
+@@ -167,7 +167,7 @@
+ 	xmalloc.c
+ 
+ 
+-libmisc_la_LIBADD = $(LIBCRACK)
++libmisc_la_LIBADD = $(LIBCRACK) $(LIBPAM)
+ subdir = libmisc
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/sys-apps/shadow/shadow-4.0.3-r10.ebuild b/sys-apps/shadow/shadow-4.0.3-r10.ebuild
index 798b9356b4ec..b8bb50dacf99 100644
--- a/sys-apps/shadow/shadow-4.0.3-r10.ebuild
+++ b/sys-apps/shadow/shadow-4.0.3-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r10.ebuild,v 1.2 2004/01/10 01:39:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r10.ebuild,v 1.3 2004/01/10 02:37:14 agriffis Exp $
 
 IUSE="pam selinux"
 
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64 ~ppc64"
 
 DEPEND=">=sys-libs/cracklib-2.7-r3
 	pam? ( >=sys-libs/pam-0.75-r4 )
@@ -40,12 +40,20 @@ src_unpack() {
 
 	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
 
-	# Get su to call pam_open_session(), and also set DISPLAY and XAUTHORITY,
-	# else the session entries in /etc/pam.d/su never get executed, and
-	# pam_xauth for one, is then never used.  This should close bug #8831.
-	#
-	# <azarah@gentoo.org> (19 Oct 2002)
-	use pam && epatch ${FILESDIR}/${P}-su-pam_open_session.patch-v2
+	if use pam; then
+		# Get su to call pam_open_session(), and also set DISPLAY and XAUTHORITY,
+		# else the session entries in /etc/pam.d/su never get executed, and
+		# pam_xauth for one, is then never used.  This should close bug #8831.
+		#
+		# <azarah@gentoo.org> (19 Oct 2002)
+		epatch ${FILESDIR}/${P}-su-pam_open_session.patch-v2
+
+		# libmisc needs to link against pam and pam_misc, at least
+		# when built as a shared object.  See bug 37725.
+		#
+		# <agriffis@gentoo.org> (09 Jan 2004)
+		epatch ${FILESDIR}/${P}-shared-needs-pam.patch
+	fi
 
 	# 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,12 +68,6 @@ src_unpack() {
 }
 
 src_compile() {
-	# This static library should always be built with -fPIC (even on
-	# 32-bit platforms) because it is consumed in a shared object in
-	# freeradius.  See bug 37719 and
-	# http://marc.theaimsgroup.com/?l=gentoo-dev&m=107112691504786&w=2
-	append-flags -fPIC
-
 	# Allows shadow configure detect mips systems properly
 	gnuconfig_update
 
@@ -79,14 +81,14 @@ src_compile() {
 	./configure --disable-desrpc \
 		--with-libcrypt \
 		--with-libcrack \
-		--enable-shared=no \
+		--enable-shared=yes \
 		--enable-static=yes \
 		--host=${CHOST} \
 		`use_enable nls` \
 		${myconf} || die "bad configure"
 
 	# Parallel make fails sometimes
-	make || die "compile problem"
+	emake -j1 || die "compile problem"
 }
 
 src_install() {