Revision bump to fix bug #216702 and workaround autoconf bug in #217154.

Package-Manager: portage-2.1.5_rc2

4 files changed, 88 insertions, 8 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 174f583155fc..fcfc4ec882ab 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.205 2008/04/05 14:34:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.206 2008/04/10 22:27:02 flameeyes Exp $
+
+*pam-1.0.0-r1 (10 Apr 2008)
+
+  10 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/Linux-PAM-1.0.0-set-item.patch, -pam-1.0.0.ebuild,
+  +pam-1.0.0-r1.ebuild:
+  Revision bump to fix bug #216702 and workaround autoconf bug in #217154.
 
 *pam-1.0.0 (05 Apr 2008)
 
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index b342b5f3df59..98dcb34bbbe1 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX Linux-PAM-0.99.7.0-disable-regenerate-man.patch 667 RMD160 ad4b61f010ec6f3e8bd9ff137375c64ec594f438 SHA1 7b578fedf5ee73f82575feadfeea7a8d5b98bda0 SHA256 e4deb0732039dd29774248bb33271d578c69b76f86c015e8ffd296fa2bb6be3b
 AUX Linux-PAM-0.99.8.1-xtests.patch 726 RMD160 4740f7039305c2520add212a576c9f16eb6c0db9 SHA1 716cd42c4c785db666b6c9911222760285a79e8f SHA256 6dbbadc4d9a5d08e55b381746dffd501bdd7dc07fdcb741b8ac95df07d5e1223
+AUX Linux-PAM-1.0.0-set-item.patch 1988 RMD160 b3884ab56e84b27a0e5fd6ab0003ea17191afff2 SHA1 fd319d2fd0e5eef6852257b84f52401a84a4eec8 SHA256 dc7ab0a2b867a979be397b7f1d41ea9df380c07a89881a985939fa6b4091a998
 AUX other.pamd 139 RMD160 d0f52fd0b830c86b0e933ebfaa8c2c1545337e43 SHA1 6d1f1a5f55c65f13b7fd35396c7f302c1946116e SHA256 3df996d0f5713c92598ac2d3be2b139ec79f3d1e2010bbc53da14c3dd55e64c2
 AUX system-auth.pamd.epam 593 RMD160 262c88da0e6ac9ae09f0f1190de2f76396877807 SHA1 926c91cfa56c1480a7fe867ba902a94cf7e36ab7 SHA256 7896556f671ee88582babce4edd851fdc105a101bd8da48d2ef1dfd940b32eca
 DIST Linux-PAM-0.99.10.0.tar.bz2 932090 RMD160 11ffd03e0078f08096208aa546cdc10894af346e SHA1 bd4269170b20f3fcde1416e97920ce43b8c11b35 SHA256 a91c595bc941dc39fa22286c55bbae4a5e1625631a9f6d25863ecebf22f4cf77
@@ -14,13 +15,13 @@ EBUILD pam-0.99.10.0.ebuild 4983 RMD160 091e82150a9a60d35ba89fab5317d5ab7bf0a6c2
 EBUILD pam-0.99.8.1-r1.ebuild 5141 RMD160 8d7b0c5dc053e30b7b2b4a7e3477a0a395244850 SHA1 eabef364ff9a0f6fd4750f064b7005557e44d911 SHA256 1fe79be9691cd44b5f8de55c3bde4c9d705616be2daaac0222eff623ba22b13f
 EBUILD pam-0.99.9.0-r1.ebuild 4932 RMD160 f318e50f8b1f0caf8e6bdb134d80e42201f4f550 SHA1 102ec567fd4c80e1ccb3f55a50407c288e25e412 SHA256 f5b9c50bff1052a869173d09662c664272b10879efcb3ef69c61d400187c6905
 EBUILD pam-0.99.9.0.ebuild 5247 RMD160 51e5b7ef8b7134dc3cdcee88c6dd393e2c405948 SHA1 574460368f85e605fe756d49720bbb8304c1c4e6 SHA256 a7f627b289ed16040aa3ce81a45ed470e0036af337b2d6258e952d54e1731b33
-EBUILD pam-1.0.0.ebuild 4978 RMD160 8405326cb2175103011176c5df638ffa38f5c770 SHA1 8129e2b5249c71236c5879c20c9067f6e8a13927 SHA256 fb23a07ab169b8019850cfac80a9734d1ba655677bd168261879c40e0e4bbcc5
-MISC ChangeLog 32713 RMD160 b8e6afb237e4b467b0066bc83cfeef28f0086814 SHA1 524eb886960313bb168229e8893c17a1b2afc0e0 SHA256 4339cae181942cb6298126fe2ba1ad961b591ddfb1cf6c09b9982dd2d8819e7e
+EBUILD pam-1.0.0-r1.ebuild 5193 RMD160 ba3ecc8d848b5a402ec1300c6b8f28343479a284 SHA1 36b0a6b59112668f7a2999296507dca95ae87588 SHA256 dd88630f9895fbaea74f47fa615087f9448e4cb67c372233f810d1582f5b258b
+MISC ChangeLog 32955 RMD160 60d80393578adc1673a04525b209e590f79a3fed SHA1 3e83c1ac7d38aa9ca14481005d964ab8aeff03ca SHA256 0a17026948a72a2198b1f1e87f7f31fe7d351932814af15ed8a09635488f8897
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf3jf4ACgkQAiZjviIA2Xha/ACffdJSxnzZgXbdeGcEju9r/9/L
-Y68AmgITNKlEaoGq8tAZdwjSkqZ7jPtD
-=cn3U
+iEYEARECAAYFAkf+lEwACgkQAiZjviIA2XjLPwCfSBBlffh3EQz2LeG7lzq4z/o3
+UzwAn2K++W1Z46t4JmLzEKqG/D6UwlTn
+=wEQV
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/Linux-PAM-1.0.0-set-item.patch b/sys-libs/pam/files/Linux-PAM-1.0.0-set-item.patch
new file mode 100644
index 000000000000..4a08ee0be9ad
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.0.0-set-item.patch
@@ -0,0 +1,67 @@
+Bug #216702, allow changing password from user.
+
+Index: pam_item.c
+===================================================================
+RCS file: /cvsroot/pam/Linux-PAM/libpam/pam_item.c,v
+retrieving revision 1.16
+diff -u -p -r1.16 pam_item.c
+--- libpam/pam_item.c	3 Mar 2008 13:23:45 -0000	1.16
++++ libpam/pam_item.c	7 Apr 2008 09:04:50 -0000
+@@ -11,13 +11,15 @@
+ #include <string.h>
+ #include <syslog.h>
+ 
+-#define TRY_SET(X, Y)                  \
+-{                                      \
+-    char *_TMP_ = _pam_strdup(Y);      \
+-    if (_TMP_ == NULL && (Y) != NULL)  \
+-	 return PAM_BUF_ERR;           \
+-    free(X);                           \
+-    (X) = _TMP_;                       \
++#define TRY_SET(X, Y)                      \
++{                                          \
++    if ((X) != (Y)) {		           \
++	char *_TMP_ = _pam_strdup(Y);      \
++	if (_TMP_ == NULL && (Y) != NULL)  \
++	    return PAM_BUF_ERR;            \
++	free(X);                           \
++	(X) = _TMP_;                       \
++    }					   \
+ }
+ 
+ /* functions */
+@@ -76,8 +78,10 @@ int pam_set_item (pam_handle_t *pamh, in
+ 	 * modules.
+ 	 */
+ 	if (__PAM_FROM_MODULE(pamh)) {
+-	    _pam_overwrite(pamh->authtok);
+-	    TRY_SET(pamh->authtok, item);
++	    if (pamh->authtok != item) {
++		_pam_overwrite(pamh->authtok);
++		TRY_SET(pamh->authtok, item);
++	    }
+ 	} else {
+ 	    retval = PAM_BAD_ITEM;
+ 	}
+@@ -90,8 +94,10 @@ int pam_set_item (pam_handle_t *pamh, in
+ 	 * modules.
+ 	 */
+ 	if (__PAM_FROM_MODULE(pamh)) {
+-	    _pam_overwrite(pamh->oldauthtok);
+-	    TRY_SET(pamh->oldauthtok, item);
++	    if (pamh->oldauthtok != item) {
++		_pam_overwrite(pamh->oldauthtok);
++		TRY_SET(pamh->oldauthtok, item);
++	    }
+ 	} else {
+ 	    retval = PAM_BAD_ITEM;
+ 	}
+@@ -130,6 +136,8 @@ int pam_set_item (pam_handle_t *pamh, in
+ 	break;
+ 
+     case PAM_XAUTHDATA:
++	if (&pamh->xauth == item)
++	    break;
+ 	if (pamh->xauth.namelen) {
+ 	    _pam_overwrite(pamh->xauth.name);
+ 	    free(pamh->xauth.name);
diff --git a/sys-libs/pam/pam-1.0.0.ebuild b/sys-libs/pam/pam-1.0.0-r1.ebuild
index 13ce8d4c6614..944d6753cfa4 100644
--- a/sys-libs/pam/pam-1.0.0.ebuild
+++ b/sys-libs/pam/pam-1.0.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.0.0.ebuild,v 1.1 2008/04/05 14:34:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.0.0-r1.ebuild,v 1.1 2008/04/10 22:27:02 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit libtool multilib eutils autotools pam toolchain-funcs
+inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
 
 MY_PN="Linux-PAM"
 MY_P="${MY_PN}-${PV}"
@@ -106,6 +106,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.patch"
 	epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
+	epatch "${FILESDIR}/${MY_PN}-1.0.0-set-item.patch"
 
 	AT_M4DIR="m4" eautoreconf
 
@@ -115,6 +116,10 @@ src_unpack() {
 src_compile() {
 	local myconf
 
+	# Workarounds autoconf 2.62 bug, libintl.h is included before
+	# _GNU_SOURCE is defined in config.h. See bug #217154
+	append-flags -D_GNU_SOURCE
+
 	if use hppa || use elibc_FreeBSD; then
 		myconf="${myconf} --disable-pie"
 	fi