Add patch to fix correct linking to libraries.

(Portage version: 2.1.2_pre3-r3)

3 files changed, 56 insertions, 2 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 02e8b11f6617..ac084a0acde6 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.124 2006/10/04 08:48:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.125 2006/10/18 16:19:32 flameeyes Exp $
+
+  18 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/Linux-PAM-0.99.6.3-linking.patch, pam-0.99.6.3-r1.ebuild:
+  Add patch to fix correct linking to libraries.
 
   04 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> -pam-0.99.5.0.ebuild,
   -pam-0.99.5.0-r1.ebuild, -pam-0.99.6.3.ebuild:
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.6.3-linking.patch b/sys-libs/pam/files/Linux-PAM-0.99.6.3-linking.patch
new file mode 100644
index 000000000000..d9cebddc40f7
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-0.99.6.3-linking.patch
@@ -0,0 +1,47 @@
+Index: Linux-PAM-0.99.6.3/libpam/Makefile.am
+===================================================================
+--- Linux-PAM-0.99.6.3.orig/libpam/Makefile.am
++++ Linux-PAM-0.99.6.3/libpam/Makefile.am
+@@ -8,7 +8,7 @@ if HAVE_LIBSELINUX
+   AM_CFLAGS += -D"WITH_SELINUX"
+ endif
+ 
+-AM_LDFLAGS = $(LIBPRELUDE_LIBS) @LIBDL@
++libpam_la_LIBADD = $(LIBPRELUDE_LIBS) @LIBDL@
+ 
+ CLEANFILES = *~
+ 
+Index: Linux-PAM-0.99.6.3/modules/pam_unix/Makefile.am
+===================================================================
+--- Linux-PAM-0.99.6.3.orig/modules/pam_unix/Makefile.am
++++ Linux-PAM-0.99.6.3/modules/pam_unix/Makefile.am
+@@ -17,8 +17,6 @@ secureconfdir = $(SCONFIGDIR)
+ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
+ 	-DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\"
+ 
+-AM_LDFLAGS = -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
+-
+ if HAVE_LIBSELINUX
+   AM_CFLAGS += -D"WITH_SELINUX"
+ endif
+@@ -26,8 +24,8 @@ if HAVE_LIBCRACK
+   AM_CFLAGS += -D"USE_CRACKLIB"
+ endif
+ 
+-pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \
+-	@LIBCRACK@ @LIBNSL@
++pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module
++pam_unix_la_LIBADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
+ if HAVE_VERSIONING
+   pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
+ endif
+@@ -46,7 +44,9 @@ pam_unix_la_SOURCES = bigcrypt.c pam_uni
+ 
+ bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
+ bigcrypt_CFLAGS = $(AM_CFLAGS)
++bigcrypt_LDADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
+ 
+ unix_chkpwd_SOURCES = unix_chkpwd.c md5_good.c md5_broken.c bigcrypt.c
+ unix_chkpwd_CFLAGS = $(AM_CFLAGS) @PIE_CFLAGS@
+ unix_chkpwd_LDFLAGS = @PIE_LDFLAGS@
++unix_chkpwd_LDADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
diff --git a/sys-libs/pam/pam-0.99.6.3-r1.ebuild b/sys-libs/pam/pam-0.99.6.3-r1.ebuild
index 2b368d31ff9e..c2f0b6065acc 100644
--- a/sys-libs/pam/pam-0.99.6.3-r1.ebuild
+++ b/sys-libs/pam/pam-0.99.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.6.3-r1.ebuild,v 1.4 2006/10/04 08:44:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.6.3-r1.ebuild,v 1.5 2006/10/18 16:19:32 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -39,12 +39,15 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	mkdir -p doc/txts
 	for readme in modules/pam_*/README; do
 		cp -f "${readme}" doc/txts/README.$(dirname "${readme}" | \
 			sed -e 's|^modules/||')
 	done
 
 	epatch "${FILESDIR}/${MY_P}-berkdb.patch"
+	epatch "${FILESDIR}/${MY_P}-linking.patch"
+
 	AT_M4DIR="m4" eautoreconf
 
 	elibtoolize