summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-06-14 08:24:14 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-06-14 08:24:14 +0000
commit7b5de89228c01fd4bd41a14e4024b9e45721a25e (patch)
treee9521f8f38dad1d50589afa8e410455cbce5ad28 /sys-libs
parentadded ~x86-interix prefix keyword (diff)
downloadhistorical-7b5de89228c01fd4bd41a14e4024b9e45721a25e.tar.gz
historical-7b5de89228c01fd4bd41a14e4024b9e45721a25e.tar.bz2
historical-7b5de89228c01fd4bd41a14e4024b9e45721a25e.zip
Improve patch to avoid warnings and build failures with USE=nis; thanks to Justin in bug #371555.
Package-Manager: portage-2.2.0_alpha40/cvs/Linux x86_64
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/pam/ChangeLog7
-rw-r--r--sys-libs/pam/Manifest10
-rw-r--r--sys-libs/pam/files/Linux-PAM-1.1.3-nis.patch6
3 files changed, 14 insertions, 9 deletions
diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index b9556fa34118..487e3dfc8ff6 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/pam
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.293 2011/06/13 23:44:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.294 2011/06/14 08:24:14 flameeyes Exp $
+
+ 14 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/Linux-PAM-1.1.3-nis.patch:
+ Improve patch to avoid warnings and build failures with USE=nis; thanks to
+ Justin in bug #371555.
13 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org> pam-1.1.3.ebuild:
Remove autotools inherit from old ebuild.
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 870b00e3450e..e143f01935f8 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,17 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX Linux-PAM-1.1.3-nis.patch 8069 RMD160 028c90263f75f4b7bfe034cad6f575f16bdfb19c SHA1 67a2fc334167469a72fe7b63b95d062261e432e6 SHA256 f003eaf7c7efb65dd356843ea854487a605b8a79a3f03959cf68e66c4a7b309a
+AUX Linux-PAM-1.1.3-nis.patch 8071 RMD160 ee63b3d6f0e8ac5984e9eed794ae9349ba0b8677 SHA1 db4adb205b97e092b45233a1fdb9e57a4517a8c8 SHA256 3ed5a2113d024f4fe1ed4430638af5a6ca45bb3d229d11dc79f69ce976a9cdc0
DIST Linux-PAM-1.1.3-docs.tar.bz2 495577 RMD160 d080055e8b2e2c213293e42d42d64082cd112915 SHA1 88024b6c99f1d5e9da1d12f7c04ca97779125d56 SHA256 4afc3c02f295ed1a3e09876da7eb8738ce48a3c8ea1bc0861e4999730489df12
DIST Linux-PAM-1.1.3.tar.bz2 1132898 RMD160 626d8deabe5fb8fcc333b3b52fe5653e901bf352 SHA1 97d36d2b9af3211b4818ea8e6fcc6893ca1b6722 SHA256 17b268789b935a76e736a1150210dd12f156972973e79347668f828d43632652
EBUILD pam-1.1.3-r1.ebuild 5890 RMD160 4714f5467b3df5cea5377874e602c1b0a9768eda SHA1 4ce709af3339dca1ba7041b6623b45025e38ea1b SHA256 c1bc612eec1e2cff1c429876b99050b2e659c44a155ef8599bf98af2997a6b80
EBUILD pam-1.1.3.ebuild 5622 RMD160 8304a160cd029a730960cfb66b57ea6d8b6cedcf SHA1 4c7fd78d51bd5b0b3dfc851db4ebc01c31176ed5 SHA256 cdb43130a75c0ba779e98272a23435ef283d6037a58bcb8bc62698037e0a6041
-MISC ChangeLog 47258 RMD160 aabd42b0439b86a936cdfff29166bee81bbf630d SHA1 012d02e991a162e5733631c625d41dfd89e56b0e SHA256 48629da7186772d5b0cce209a01002317123293c920241dadcd70de130d669c1
+MISC ChangeLog 47452 RMD160 5cc32bda755cfcd6c93372770d41125f94ed39c3 SHA1 4719f3fa380dc60aa8ad1648807b76a850cd7c49 SHA256 6064705af7ba90e447cfc0bfec6e3509755ad19d1e4239f92451574440e1cbee
MISC metadata.xml 1129 RMD160 a800f5ac4255ca20c26791ff0b57c3c923666623 SHA1 99e58550271cf1c3e23c4547387469a0d211ae55 SHA256 e160643aca26e0418b31429836ae1b4c673474cd6130b7e2ac0d0bf41380df0b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk32oLIACgkQAiZjviIA2Xh17QCfTzMG26Ja4uNaac6xX1v2DtUJ
-s0AAn30aHp3WjigIMYKMMEaC8H7QOelS
-=gHcd
+iEYEARECAAYFAk33GpMACgkQAiZjviIA2Xgr1gCgxIK+I6gCzzOhQlyHv63qSAe5
+G1QAn02sla4BwBc0FcUEZhlov3tbcAY+
+=HBZq
-----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.3-nis.patch b/sys-libs/pam/files/Linux-PAM-1.1.3-nis.patch
index f063204eb36f..fdb8b96d9f0d 100644
--- a/sys-libs/pam/files/Linux-PAM-1.1.3-nis.patch
+++ b/sys-libs/pam/files/Linux-PAM-1.1.3-nis.patch
@@ -101,12 +101,10 @@ Index: Linux-PAM-1.1.3/modules/pam_unix/pam_unix_passwd.c
-#if !((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
+#if (HAVE_YP_GET_DEFAULT_DOMAIN || HAVE_GETDOMAINNAME) && HAVE_YP_MASTER
-+# define HAVE_NIS
++# define HAVE_NIS 1
+#endif
+
+#ifdef HAVE_NIS
-+# include "yppasswd.h"
-+
+# include <rpc/rpc.h>
+
+# if HAVE_RPCSVC_YP_PROT_H
@@ -122,6 +120,8 @@ Index: Linux-PAM-1.1.3/modules/pam_unix/pam_unix_passwd.c
unsigned long versnum, unsigned int proto);
-#endif /* GNU libc 2.1 */
+# endif /* GNU libc 2.1 */
++
++# include "yppasswd.h"
+#endif
/*