Version bump; remove 1.1.3-r1 since the patch is integrated with .4 and that is going to be the stable candidate. Closes bug #381485.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 10 insertions, 262 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index c6335fbae6b8..88f6986f7e9a 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,13 @@
 # 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.295 2011/06/14 18:32:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.296 2011/09/02 17:20:34 flameeyes Exp $
+
+*pam-1.1.4 (02 Sep 2011)
+
+  02 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> -pam-1.1.3-r1.ebuild,
+  -files/Linux-PAM-1.1.3-nis.patch, +pam-1.1.4.ebuild:
+  Version bump; remove 1.1.3-r1 since the patch is integrated with .4 and that
+  is going to be the stable candidate. Closes bug #381485.
 
   14 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org> pam-1.1.3-r1.ebuild:
   Drop REQUIRED_USE as selinux support is still built fine without nis.
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
deleted file mode 100644
index fdb8b96d9f0d..000000000000
--- a/sys-libs/pam/files/Linux-PAM-1.1.3-nis.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-Index: Linux-PAM-1.1.3/configure.in
-===================================================================
---- Linux-PAM-1.1.3.orig/configure.in
-+++ Linux-PAM-1.1.3/configure.in
-@@ -441,12 +441,39 @@ fi
- AC_SUBST(LIBDB)
- AM_CONDITIONAL([HAVE_LIBDB], [test ! -z "$LIBDB"])
- 
--AC_CHECK_LIB([nsl],[yp_get_default_domain], LIBNSL="-lnsl", LIBNSL="")
--BACKUP_LIBS=$LIBS
--LIBS="$LIBS $LIBNSL"
--AC_CHECK_FUNCS(yp_get_default_domain getdomainname innetgr yperr_string yp_master yp_bind yp_match yp_unbind)
--LIBS=$BACKUP_LIBS
--AC_SUBST(LIBNSL)
-+AC_ARG_ENABLE([nis],
-+        AS_HELP_STRING([-disable-nis], [Disable building NIS/YP support in pam_unix and pam_access]))
-+
-+AS_IF([test "x$enable_nis" != "xno"], [
-+  CFLAGS=$old_CFLAGS
-+  LIBS=$old_LIBS
-+
-+  dnl if there's libtirpc available, prefer that over the system
-+  dnl implementation.
-+  PKG_CHECK_MODULES([libtirpc], [libtirpc], [
-+    CFLAGS="$CFLAGS $libtirpc_CFLAGS"
-+    LIBS="$LIBS $libtirpc_LIBS"
-+  ], [:;])
-+
-+  AC_SEARCH_LIBS([yp_get_default_domain], [nsl])
-+
-+  AC_CHECK_FUNCS([yp_get_default_domain yperr_string yp_master yp_bind yp_match yp_unbind])
-+  AC_CHECK_HEADERS([rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h])
-+  AC_CHECK_DECLS([getrpcport], , , [
-+    #if HAVE_RPC_RPC_H
-+    # include <rpc/rpc.h>
-+    #endif
-+  ])
-+
-+  NIS_CFLAGS="${CFLAGS%${old_CFLAGS}}"
-+  NIS_LIBS="${LIBS%${old_LIBS}}"
-+
-+  CFLAGS="$old_CFLAGS"
-+  LIBS="$old_LIBS"
-+])
-+
-+AC_SUBST([NIS_CFLAGS])
-+AC_SUBST([NIS_LIBS])
- 
- AC_ARG_ENABLE([selinux],
-         AS_HELP_STRING([--disable-selinux],[do not use SELinux]),
-@@ -471,7 +498,7 @@ dnl Checks for header files.
- AC_HEADER_DIRENT
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h)
-+AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h)
- 
- dnl For module/pam_lastlog
- AC_CHECK_HEADERS(lastlog.h utmp.h utmpx.h)
-@@ -491,11 +518,11 @@ AC_TYPE_GETGROUPS
- AC_PROG_GCC_TRADITIONAL
- AC_FUNC_MEMCMP
- AC_FUNC_VPRINTF
--AC_CHECK_FUNCS(fseeko gethostname gettimeofday lckpwdf mkdir select)
-+AC_CHECK_FUNCS(fseeko getdomainname gethostname gettimeofday lckpwdf mkdir select)
- AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname)
- 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)
-+AC_CHECK_FUNCS(inet_ntop inet_pton innetgr ruserok_af)
- 
- AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no])
- AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes])
-Index: Linux-PAM-1.1.3/modules/pam_unix/pam_unix_passwd.c
-===================================================================
---- Linux-PAM-1.1.3.orig/modules/pam_unix/pam_unix_passwd.c
-+++ Linux-PAM-1.1.3/modules/pam_unix/pam_unix_passwd.c
-@@ -54,13 +54,6 @@
- #include <ctype.h>
- #include <sys/time.h>
- #include <sys/stat.h>
--#include <rpc/rpc.h>
--#ifdef HAVE_RPCSVC_YP_PROT_H
--#include <rpcsvc/yp_prot.h>
--#endif
--#ifdef HAVE_RPCSVC_YPCLNT_H
--#include <rpcsvc/ypclnt.h>
--#endif
- 
- #include <signal.h>
- #include <errno.h>
-@@ -76,16 +69,33 @@
- #include <security/pam_ext.h>
- #include <security/pam_modutil.h>
- 
--#include "yppasswd.h"
- #include "md5.h"
- #include "support.h"
- #include "passverify.h"
- #include "bigcrypt.h"
- 
--#if !((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
-+#if (HAVE_YP_GET_DEFAULT_DOMAIN || HAVE_GETDOMAINNAME) && HAVE_YP_MASTER
-+# define HAVE_NIS 1
-+#endif
-+
-+#ifdef HAVE_NIS
-+# include <rpc/rpc.h>
-+
-+# if HAVE_RPCSVC_YP_PROT_H
-+#  include <rpcsvc/yp_prot.h>
-+# endif
-+
-+# if HAVE_RPCSVC_YPCLNT_H
-+#  include <rpcsvc/ypclnt.h>
-+# endif
-+
-+# if !HAVE_DECL_GETRPCPORT
- extern int getrpcport(const char *host, unsigned long prognum,
- 		      unsigned long versnum, unsigned int proto);
--#endif				/* GNU libc 2.1 */
-+# endif				/* GNU libc 2.1 */
-+
-+# include "yppasswd.h"
-+#endif
- 
- /*
-    How it works:
-@@ -102,9 +112,9 @@ extern int getrpcport(const char *host,
- 
- #define MAX_PASSWD_TRIES	3
- 
-+#if HAVE_NIS
- static char *getNISserver(pam_handle_t *pamh, unsigned int ctrl)
- {
--#if (defined(HAVE_YP_GET_DEFAULT_DOMAIN) || defined(HAVE_GETDOMAINNAME)) && defined(HAVE_YP_MASTER)
- 	char *master;
- 	char *domainname;
- 	int port, err;
-@@ -151,14 +161,8 @@ static char *getNISserver(pam_handle_t *
- 		     master, port);
- 	}
- 	return master;
--#else
--	if (on(UNIX_DEBUG, ctrl)) {
--	  pam_syslog(pamh, LOG_DEBUG, "getNISserver: No NIS support available");
--	}
--
--	return NULL;
--#endif
- }
-+#endif
- 
- #ifdef WITH_SELINUX
- 
-@@ -326,6 +330,7 @@ static int _do_setpass(pam_handle_t* pam
- 	}
- 
- 	if (on(UNIX_NIS, ctrl) && _unix_comesfromsource(pamh, forwho, 0, 1)) {
-+#if HAVE_NIS
- 	  if ((master=getNISserver(pamh, ctrl)) != NULL) {
- 		struct timeval timeout;
- 		struct yppasswd yppwd;
-@@ -391,6 +396,13 @@ static int _do_setpass(pam_handle_t* pam
- 	    } else {
- 		    retval = PAM_TRY_AGAIN;
- 	    }
-+#else
-+          if (on(UNIX_DEBUG, ctrl)) {
-+            pam_syslog(pamh, LOG_DEBUG, "No NIS support available");
-+          }
-+
-+          retval = PAM_TRY_AGAIN;
-+#endif
- 	}
- 
- 	if (_unix_comesfromsource(pamh, forwho, 1, 0)) {
-Index: Linux-PAM-1.1.3/modules/pam_unix/yppasswd_xdr.c
-===================================================================
---- Linux-PAM-1.1.3.orig/modules/pam_unix/yppasswd_xdr.c
-+++ Linux-PAM-1.1.3/modules/pam_unix/yppasswd_xdr.c
-@@ -12,6 +12,8 @@
- 
- #include "config.h"
- 
-+#ifdef HAVE_RPC_RPC_H
-+
- #include <rpc/rpc.h>
- #include "yppasswd.h"
- 
-@@ -34,3 +36,5 @@ xdr_yppasswd(XDR * xdrs, yppasswd * objp
- 	return xdr_string(xdrs, &objp->oldpass, ~0)
- 	    && xdr_xpasswd(xdrs, &objp->newpw);
- }
-+
-+#endif
-Index: Linux-PAM-1.1.3/libpam/Makefile.am
-===================================================================
---- Linux-PAM-1.1.3.orig/libpam/Makefile.am
-+++ Linux-PAM-1.1.3/libpam/Makefile.am
-@@ -25,7 +25,8 @@ libpam_la_LIBADD = @LIBAUDIT@ $(LIBPRELU
- 
- if STATIC_MODULES
-   libpam_la_LIBADD += $(shell ls ../modules/pam_*/*.lo) \
--	@LIBDB@ @LIBCRYPT@ @LIBNSL@ @LIBCRACK@ -lutil
-+	@LIBDB@ @LIBCRYPT@ $(NIS_LIBS) @LIBCRACK@ -lutil
-+  AM_CFLAGS += $(NIS_CFLAGS)
- endif
- if HAVE_VERSIONING
-   libpam_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpam.map
-Index: Linux-PAM-1.1.3/modules/pam_access/Makefile.am
-===================================================================
---- Linux-PAM-1.1.3.orig/modules/pam_access/Makefile.am
-+++ Linux-PAM-1.1.3/modules/pam_access/Makefile.am
-@@ -15,14 +15,14 @@ securelibdir = $(SECUREDIR)
- secureconfdir = $(SCONFIGDIR)
- 
- AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
--	-DPAM_ACCESS_CONFIG=\"$(SCONFIGDIR)/access.conf\"
-+	-DPAM_ACCESS_CONFIG=\"$(SCONFIGDIR)/access.conf\" $(NIS_CFLAGS)
- AM_LDFLAGS =  -no-undefined -avoid-version -module
- if HAVE_VERSIONING
-   AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
- endif
- 
- securelib_LTLIBRARIES = pam_access.la
--pam_access_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBNSL@
-+pam_access_la_LIBADD = -L$(top_builddir)/libpam -lpam $(NIS_LIBS)
- 
- secureconf_DATA = access.conf
- 
-Index: Linux-PAM-1.1.3/modules/pam_unix/Makefile.am
-===================================================================
---- Linux-PAM-1.1.3.orig/modules/pam_unix/Makefile.am
-+++ Linux-PAM-1.1.3/modules/pam_unix/Makefile.am
-@@ -18,7 +18,8 @@ secureconfdir = $(SCONFIGDIR)
- 
- AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
- 	-DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \
--	-DUPDATE_HELPER=\"$(sbindir)/unix_update\"
-+	-DUPDATE_HELPER=\"$(sbindir)/unix_update\" \
-+	$(NIS_CFLAGS)
- 
- if HAVE_LIBSELINUX
-   AM_CFLAGS += -D"WITH_SELINUX"
-@@ -28,7 +29,7 @@ pam_unix_la_LDFLAGS = -no-undefined -avo
- if HAVE_VERSIONING
-   pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
- endif
--pam_unix_la_LIBADD = @LIBNSL@ -L$(top_builddir)/libpam -lpam \
-+pam_unix_la_LIBADD = $(NIS_LIBS) -L$(top_builddir)/libpam -lpam \
- 	@LIBCRYPT@ @LIBSELINUX@
- 
- securelib_LTLIBRARIES = pam_unix.la
diff --git a/sys-libs/pam/pam-1.1.3-r1.ebuild b/sys-libs/pam/pam-1.1.4.ebuild
index 98cf927a106d..18fe8bfafe38 100644
--- a/sys-libs/pam/pam-1.1.3-r1.ebuild
+++ b/sys-libs/pam/pam-1.1.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.3-r1.ebuild,v 1.2 2011/06/14 18:32:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.4.ebuild,v 1.1 2011/09/02 17:20:34 flameeyes Exp $
 
 EAPI="4"
 
-inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use autotools
+inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use
 
 MY_PN="Linux-PAM"
 MY_P="${MY_PN}-${PV}"
@@ -83,11 +83,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/Linux-PAM-1.1.3-nis.patch
-
-	rm -rf m4/libtool.m4 # old libtool-1
-
-	eautoreconf
 	elibtoolize
 }