Add patch to fix correct linking to libraries.

Package-Manager: portage-2.1.2_pre3-r3

4 files changed, 71 insertions, 13 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/Manifest b/sys-libs/pam/Manifest
index 1fb37360bc62..992bd9d56a91 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -5,6 +5,10 @@ AUX Linux-PAM-0.99.6.3-berkdb.patch 838 RMD160 1ff17ac66486b0c33c23b1829362a457a
 MD5 69b1526da99a2f80ff5f49f6cadb9591 files/Linux-PAM-0.99.6.3-berkdb.patch 838
 RMD160 1ff17ac66486b0c33c23b1829362a457a8065fe1 files/Linux-PAM-0.99.6.3-berkdb.patch 838
 SHA256 34c7f67cf69812eac99f1504cdeb7e4ab7bb89938d7d106b616890933d2a0b8b files/Linux-PAM-0.99.6.3-berkdb.patch 838
+AUX Linux-PAM-0.99.6.3-linking.patch 1829 RMD160 f186fa717ce61b1da1f5b90efda2bce3ae83325f SHA1 4267d697402b91072dc1880fb37ac2332c151695 SHA256 ffd0925b46f21ca291e3f2a7d5bca79e92713593c97b335d6d0e8b884bf35449
+MD5 fbc028dbec6354a7b3262987c561d202 files/Linux-PAM-0.99.6.3-linking.patch 1829
+RMD160 f186fa717ce61b1da1f5b90efda2bce3ae83325f files/Linux-PAM-0.99.6.3-linking.patch 1829
+SHA256 ffd0925b46f21ca291e3f2a7d5bca79e92713593c97b335d6d0e8b884bf35449 files/Linux-PAM-0.99.6.3-linking.patch 1829
 AUX README.pam_console 2619 RMD160 9b8d2ffcc20d781146aa485e6754b4b221689adf SHA1 544471e26f47447319c76d37c7d4dc2047f83b13 SHA256 edc959cefb01cf0b0a1fc42d43fcb388f7dc5c073166da611fa614ad2953870c
 MD5 4d915415e30dcbd724c8054970deec6a files/README.pam_console 2619
 RMD160 9b8d2ffcc20d781146aa485e6754b4b221689adf files/README.pam_console 2619
@@ -51,14 +55,14 @@ EBUILD pam-0.78-r5.ebuild 11465 RMD160 c1b6d3dc14e035495afd4617eb73fc4e3d703b28
 MD5 b60e455e3c4538c4bfe452a006ccc7e9 pam-0.78-r5.ebuild 11465
 RMD160 c1b6d3dc14e035495afd4617eb73fc4e3d703b28 pam-0.78-r5.ebuild 11465
 SHA256 fcbb5fef19a3c20b7b933a298f2e4e522cb07b2d1f61522813f49c84d2fb7489 pam-0.78-r5.ebuild 11465
-EBUILD pam-0.99.6.3-r1.ebuild 2825 RMD160 560c6437fdcbe6d4fde826622523ab6f1efa31da SHA1 a4dbebeaa7940a979dd2b14d4cc437d63c88ed32 SHA256 21ebff9c7767c5e73d0eadab7513d62dfda6f23fbeeb2046b95713bff84f57dd
-MD5 1a472e1ce337d21c42aec92faf0bcce5 pam-0.99.6.3-r1.ebuild 2825
-RMD160 560c6437fdcbe6d4fde826622523ab6f1efa31da pam-0.99.6.3-r1.ebuild 2825
-SHA256 21ebff9c7767c5e73d0eadab7513d62dfda6f23fbeeb2046b95713bff84f57dd pam-0.99.6.3-r1.ebuild 2825
-MISC ChangeLog 20533 RMD160 a993bede4e27791735da1a81b006d51817ea54f1 SHA1 af2543b767f5cadf2d33aa055a327dae50e19b71 SHA256 1109d0026638f3d8570ef7e2109a4f7046742fd670b50c414b469387573697cb
-MD5 8845324d389fb8ede0f37d1a2c2099a9 ChangeLog 20533
-RMD160 a993bede4e27791735da1a81b006d51817ea54f1 ChangeLog 20533
-SHA256 1109d0026638f3d8570ef7e2109a4f7046742fd670b50c414b469387573697cb ChangeLog 20533
+EBUILD pam-0.99.6.3-r1.ebuild 2889 RMD160 ae309cbf0065485c136a108f802c69d004d4f9c7 SHA1 6bd7edae565e9915d6928d89fc9eae88edfdee62 SHA256 ff06f665884ec1d5ebf03e77727eb2acbf14da837eccf0dd15d70201fbee39cc
+MD5 f92c4a2f74f87277a0999109e14a592b pam-0.99.6.3-r1.ebuild 2889
+RMD160 ae309cbf0065485c136a108f802c69d004d4f9c7 pam-0.99.6.3-r1.ebuild 2889
+SHA256 ff06f665884ec1d5ebf03e77727eb2acbf14da837eccf0dd15d70201fbee39cc pam-0.99.6.3-r1.ebuild 2889
+MISC ChangeLog 20703 RMD160 775a1935423ba84ff527e7c975cf5d6788064810 SHA1 9984fb2afd45e5fc93d168ec9a2e706af8502280 SHA256 375829cb98a255b141352dcf00a2c39de60a753bef681031455353df3c9c28b9
+MD5 44dfc08df0efb1c53d1f33dfb4cda0db ChangeLog 20703
+RMD160 775a1935423ba84ff527e7c975cf5d6788064810 ChangeLog 20703
+SHA256 375829cb98a255b141352dcf00a2c39de60a753bef681031455353df3c9c28b9 ChangeLog 20703
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
@@ -75,7 +79,7 @@ SHA256 ec33fef3deb83b8589594fee5532ab7e8ddfbd29feb56497f8779bfd419ac8f7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFI3VxAiZjviIA2XgRApr4AKCfnIARJ+TVy/GHuNpFUMRCgttmSwCeIQaZ
-czpR4bCBLV+8Le0OKGncvnA=
-=RPs0
+iD8DBQFFNlQmAiZjviIA2XgRAoUSAKDVGqn2f4qNOeWQuYCyGSgA3gymtgCfQ7zr
+GAZFVCeHXspF0jj7n7WXsqg=
+=712G
 -----END PGP SIGNATURE-----
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