diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-06-14 08:24:14 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-06-14 08:24:14 +0000 |
commit | c1219f7632000215e8fe1176673a4512e9da0790 (patch) | |
tree | 441ee7283afbf71a60daa53269983641bb3b25f1 /sys-libs/pam | |
parent | added ~x86-interix prefix keyword (diff) | |
download | gentoo-2-c1219f7632000215e8fe1176673a4512e9da0790.tar.gz gentoo-2-c1219f7632000215e8fe1176673a4512e9da0790.tar.bz2 gentoo-2-c1219f7632000215e8fe1176673a4512e9da0790.zip |
Improve patch to avoid warnings and build failures with USE=nis; thanks to Justin in bug #371555.
(Portage version: 2.2.0_alpha40/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/pam')
-rw-r--r-- | sys-libs/pam/ChangeLog | 7 | ||||
-rw-r--r-- | sys-libs/pam/files/Linux-PAM-1.1.3-nis.patch | 6 |
2 files changed, 9 insertions, 4 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/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 /* |