Add patch to restore building on uClibc.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

4 files changed, 98 insertions, 7 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index bf4665253017..b4593021d71b 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.251 2009/12/16 18:16:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.252 2009/12/17 18:44:03 flameeyes Exp $
+
+  17 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/Linux-PAM-1.1.0-uclibc.patch, pam-1.1.1.ebuild:
+  Add patch to restore building on uClibc.
 
 *pam-1.1.1 (16 Dec 2009)
 
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 86e6790907d3..9421f236cca8 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -7,6 +7,7 @@ AUX Linux-PAM-1.0.2-noyp.patch 7368 RMD160 6b5b2096670775cb0425ecbc46c33370fbe5b
 AUX Linux-PAM-1.0.4-fix-tests.patch 377 RMD160 8e8a27b78f02e4f8ed7e69f150e3ce5d4bd0a023 SHA1 aeae82aa6a298b899273dea6e99e4e1b2b446a38 SHA256 c0ff81fdf941c179f22050f2c5081ad4c70bbabb1aa29d3a64f87d0ab2e8060c
 AUX Linux-PAM-1.1.0-debug.patch 565 RMD160 545e499fa45d7ec568387f4ee4fd8474cbfb3210 SHA1 31ee0fab111e55e6df270bb0483ef586d3177472 SHA256 8452c6397bb7dcbd1b7f9dd87c4021014d70adf0ceba6326c7428937503db3e9
 AUX Linux-PAM-1.1.0-nonls.patch 367 RMD160 80ff3ce536e3bf3cb4e4448bf1062972b2b143bf SHA1 f67af3138312092514f61212073392779084d877 SHA256 7777ca2a86e716ee4cc5b2059d45bd526d8d887a81f5ec083a59076245c4a429
+AUX Linux-PAM-1.1.0-uclibc.patch 2643 RMD160 4294e27b8d90d8d9ee93c427d7eaf8af419f72f6 SHA1 aae4eb27892e1671c34d045a2d596d834aeb95e5 SHA256 b20ff20402778ff174694fe059afeecc6e8df8266d8ecae30419c7c930ffa5ae
 DIST Linux-PAM-1.0.4.tar.bz2 1004979 RMD160 8eacf6344663c0ce2f42d374d82d717211ca10e5 SHA1 60146a363b653324d4477dce4a3e999834a2d713 SHA256 13136d438f5748d08dcb2227e44e53a3c611351b96e11891052e0c8c2557f3ca
 DIST Linux-PAM-1.1.0-docs.tar.bz2 494697 RMD160 324f4cdabbaaa85ac5afca9babea1bfe21e32285 SHA1 56cdc680d48a3dc1ffbd9becb855a4724d5f39ad SHA256 7d8e4455cf44937ccc0c7fb370d469c9bef33c68979b23f706fb37727bf8812b
 DIST Linux-PAM-1.1.0.tar.bz2 1106379 RMD160 b57473ac39ef5c5ec22459e78e00abdbead396e5 SHA1 1ef5b91bf483ecf31e8f07c3c0322b397b13af70 SHA256 139b1abb0f1c402e443ad9083b5ff0512f4a5ae7bc806528e9d7eced13384ed7
@@ -14,13 +15,13 @@ DIST Linux-PAM-1.1.1-docs.tar.bz2 495534 RMD160 182639c3fa79c96dbc263f2d16346345
 DIST Linux-PAM-1.1.1.tar.bz2 1120055 RMD160 2d3c39cb2c3542d380e1331fef08c7086cc829d9 SHA1 8baf11b04396230ba7cf8b2bfb2d2bd75aab8fa6 SHA256 608d3eb9d7a5e1a7505fff62e6a583fdb6e52dc05bf54dc9661c5f395b1fb904
 EBUILD pam-1.0.4.ebuild 5771 RMD160 2a095e5d9e844e93c840e234d51580f2daa7b347 SHA1 a6b57a9386e5a25dd211490ada17a4df152be26e SHA256 d182992833d985a568716fc65b06182d588b481ab250f99a6a3caf1c792403c8
 EBUILD pam-1.1.0.ebuild 4903 RMD160 d328ba7b3f180a94ec6a099e8839bf509503d0fa SHA1 24b72cbba8aba11ba314da93895d1244bc0f48a9 SHA256 f140f0fde03b6d98ddfca5eafd1f102a6f6af83a488465ce828e803ebbb04c81
-EBUILD pam-1.1.1.ebuild 4631 RMD160 2c8a18056a0534c88276ffb0302b2d12cf54f9c7 SHA1 13fa7715a942ec36c0794150323e0cd233b2606e SHA256 3fb3a127d895badbd07a30cbbf21610bf0f6784eaf081a407dc2cb9330c42be6
-MISC ChangeLog 40182 RMD160 b77055d3c29f9f96cf15651da2e764667f760baf SHA1 16a225698c74b89cd8a423c8aae2581131a35aaa SHA256 c138d7a38d366d62a069e5e09c787ebcc222c6f39bb38ccd2ab75fa698416211
+EBUILD pam-1.1.1.ebuild 4766 RMD160 85332fdefef8a6b511514e92d417ab5268fbc306 SHA1 8e9bd3b7faeaa66bf1cc2c7292b3029a0cd9ebdf SHA256 c4e11516d20c10934f1b2ac17e55b4d2fd58742d5ff1f8aaf178bdaed7d9ed0a
+MISC ChangeLog 40339 RMD160 6d6cfae48780a2370371607b1ae902a843ff5fe2 SHA1 33b02a9d571962f558bb53d051e601d7fb491970 SHA256 f5fc7ae0178cc63dde2653e2750c30b8c1adde6ce396493bd4edac1b5fe25732
 MISC metadata.xml 306 RMD160 d8d5dbaaf990cfc32c5294d2d63234ed4da3bff2 SHA1 5d66f934ae3ebd65dca4c3c3a6d7cb318c9b00d9 SHA256 eb34afcf75eebf8d17686d207e1196d8c00a2be82d0225c2d0e68a8dc71b13f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkspI+wACgkQAiZjviIA2XhIEwCgo27RR37x9NFPW4K6Y2BqM8q8
-DwoAoIvXbLIvnMOI1yfVh9OcDcAoMIGG
-=IPSw
+iEYEARECAAYFAksqe/wACgkQAiZjviIA2XjMUwCgva/cgGgm8oWPL22NUFfrdfxD
+Y2kAn1qt+rVPnnsLkU0rYXGnhjtyerjO
+=JhrY
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.0-uclibc.patch b/sys-libs/pam/files/Linux-PAM-1.1.0-uclibc.patch
new file mode 100644
index 000000000000..6b8fa25f8f59
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.0-uclibc.patch
@@ -0,0 +1,82 @@
+Index: Linux-PAM-1.1.0/modules/pam_pwhistory/opasswd.c
+===================================================================
+--- Linux-PAM-1.1.0.orig/modules/pam_pwhistory/opasswd.c
++++ Linux-PAM-1.1.0/modules/pam_pwhistory/opasswd.c
+@@ -94,6 +94,23 @@ parse_entry (char *line, opwd *data)
+   return 0;
+ }
+ 
++static int
++compare_password(const char *newpass, const char *oldpass)
++{
++  char *outval;
++#ifdef HAVE_CRYPT_R
++  struct crypt_data output;
++
++  output.initialized = 0;
++
++  outval = crypt_r (newpass, oldpass, &output);
++#else
++  outval = crypt (newpass, oldpass);
++#endif
++
++  return strcmp(outval, oldpass) == 0;
++}
++
+ /* Check, if the new password is already in the opasswd file.  */
+ int
+ check_old_password (pam_handle_t *pamh, const char *user,
+@@ -167,12 +184,9 @@ check_old_password (pam_handle_t *pamh, 
+   if (found)
+     {
+       const char delimiters[] = ",";
+-      struct crypt_data output;
+       char *running;
+       char *oldpass;
+ 
+-      memset (&output, 0, sizeof (output));
+-
+       running = strdupa (entry.old_passwords);
+       if (running == NULL)
+ 	return PAM_BUF_ERR;
+@@ -180,7 +194,7 @@ check_old_password (pam_handle_t *pamh, 
+       do {
+ 	oldpass = strsep (&running, delimiters);
+ 	if (oldpass && strlen (oldpass) > 0 &&
+-	    strcmp (crypt_r (newpass, oldpass, &output), oldpass) == 0)
++	    compare_password(newpass, oldpass) )
+ 	  {
+ 	    if (debug)
+ 	      pam_syslog (pamh, LOG_DEBUG, "New password already used");
+Index: Linux-PAM-1.1.0/configure.in
+===================================================================
+--- Linux-PAM-1.1.0.orig/configure.in
++++ Linux-PAM-1.1.0/configure.in
+@@ -458,7 +458,7 @@ AC_FUNC_MEMCMP
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS(fseeko gethostname gettimeofday lckpwdf mkdir select)
+ AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname)
+-AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
++AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
+ AC_CHECK_FUNCS(getgrouplist getline getdelim)
+ AC_CHECK_FUNCS(inet_ntop inet_pton ruserok_af)
+ 
+Index: Linux-PAM-1.1.0/modules/pam_timestamp/pam_timestamp.c
+===================================================================
+--- Linux-PAM-1.1.0.orig/modules/pam_timestamp/pam_timestamp.c
++++ Linux-PAM-1.1.0/modules/pam_timestamp/pam_timestamp.c
+@@ -200,7 +200,13 @@ check_login_time(const char *ruser, time
+ 	time_t oldest_login = 0;
+ 
+ 	setutent();
+-	while(!getutent_r(&utbuf, &ut)) {
++	while(
++#ifdef HAVE_GETUTENT_R
++	      !getutent_r(&utbuf, &ut)
++#else
++	      (ut = getutent()) != NULL
++#endif
++	      ) {
+ 		if (ut->ut_type != USER_PROCESS) {
+ 			continue;
+ 		}
diff --git a/sys-libs/pam/pam-1.1.1.ebuild b/sys-libs/pam/pam-1.1.1.ebuild
index 5b843b70ec30..711db8486b1e 100644
--- a/sys-libs/pam/pam-1.1.1.ebuild
+++ b/sys-libs/pam/pam-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1.ebuild,v 1.1 2009/12/16 18:16:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1.ebuild,v 1.2 2009/12/17 18:44:03 flameeyes Exp $
 
 inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
 
@@ -84,6 +84,10 @@ src_unpack() {
 	# probably use EXTRA_PROGRAMS.
 	epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
 
+	# Fix building on uClibc; it is added since 1.1.1 but applies to
+	# 1.1.0 as well.
+	epatch "${FILESDIR}/${MY_PN}-1.1.0-uclibc.patch"
+
 	# Remove libtool-2 libtool macros, see bug 261167
 	rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."