diff --git a/srcpkgs/pam/patches/portability-fixes.patch b/srcpkgs/pam/patches/portability-fixes.patch index f1839f445c..6f39500820 100644 --- a/srcpkgs/pam/patches/portability-fixes.patch +++ b/srcpkgs/pam/patches/portability-fixes.patch @@ -1,56 +1,5 @@ ---- modules/pam_group/pam_group.c.orig 2014-01-11 12:45:09.910924835 +0100 -+++ modules/pam_group/pam_group.c 2014-01-11 12:46:31.598451777 +0100 -@@ -656,7 +656,11 @@ static int check_account(pam_handle_t *p - } - /* If buffer starts with @, we are using netgroups */ - if (buffer[0] == '@') -+#ifdef HAVE_INNETGR - good &= innetgr (&buffer[1], NULL, user, NULL); -+#else -+ good = 0; -+#endif - /* otherwise, if the buffer starts with %, it's a UNIX group */ - else if (buffer[0] == '%') - good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]); ---- modules/pam_time/pam_time.c.orig 2014-01-11 12:47:00.534638461 +0100 -+++ modules/pam_time/pam_time.c 2014-01-11 12:47:35.470863839 +0100 -@@ -555,7 +555,11 @@ check_account(pam_handle_t *pamh, const - } - /* If buffer starts with @, we are using netgroups */ - if (buffer[0] == '@') -+#ifdef HAVE_INNETGR - good &= innetgr (&buffer[1], NULL, user, NULL); -+#else -+ good = 0; -+#endif - else - good &= logic_field(pamh, user, buffer, count, is_same); - D(("with user: %s", good ? "passes":"fails" )); ---- modules/pam_succeed_if/pam_succeed_if.c.orig 2014-01-11 12:47:51.391966546 +0100 -+++ modules/pam_succeed_if/pam_succeed_if.c 2014-01-11 12:48:31.519225435 +0100 -@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh, - static int - evaluate_innetgr(const char *host, const char *user, const char *group) - { -+#ifdef HAVE_INNETGR - if (innetgr(group, host, user, NULL) == 1) - return PAM_SUCCESS; -+#endif - return PAM_AUTH_ERR; - } - /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */ - static int - evaluate_notinnetgr(const char *host, const char *user, const char *group) - { -+#ifdef HAVE_INNETGR - if (innetgr(group, host, user, NULL) == 0) - return PAM_SUCCESS; -+#endif - return PAM_AUTH_ERR; - } - ---- modules/pam_lastlog/pam_lastlog.c.orig 2014-01-11 12:56:15.735248391 +0100 -+++ modules/pam_lastlog/pam_lastlog.c 2014-01-11 12:57:33.142756424 +0100 +--- modules/pam_lastlog/pam_lastlog.c.orig 2014-01-11 12:56:15.735248391 +0100 ++++ modules/pam_lastlog/pam_lastlog.c 2014-01-11 12:57:33.142756424 +0100 @@ -26,6 +26,7 @@ #include #include @@ -62,9 +11,9 @@ @@ -403,7 +404,9 @@ last_login_write(pam_handle_t *pamh, int if (announce & LASTLOG_WTMP) { - /* write wtmp entry for user */ + /* write wtmp entry for user */ +#ifdef HAVE_LOGWTMP - logwtmp(last_login.ll_line, user, remote_host); + logwtmp(last_login.ll_line, user, remote_host); +#endif } @@ -79,8 +28,8 @@ return PAM_SUCCESS; } ---- modules/pam_rhosts/pam_rhosts.c.orig 2014-01-11 12:58:40.263196779 +0100 -+++ modules/pam_rhosts/pam_rhosts.c 2014-01-11 12:59:25.182491398 +0100 +--- modules/pam_rhosts/pam_rhosts.c.orig 2014-01-11 12:58:40.263196779 +0100 ++++ modules/pam_rhosts/pam_rhosts.c 2014-01-11 12:59:25.182491398 +0100 @@ -113,8 +113,10 @@ int pam_sm_authenticate (pam_handle_t *p #ifdef HAVE_RUSEROK_AF diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template index 6277c5c8c4..df18dd7f1c 100644 --- a/srcpkgs/pam/template +++ b/srcpkgs/pam/template @@ -1,7 +1,7 @@ # Template file for 'pam' pkgname=pam -version=1.2.1 -revision=3 +version=1.3.0 +revision=1 wrksrc="Linux-PAM-$version" build_style=gnu-configure configure_args=" @@ -28,7 +28,7 @@ maintainer="Juan RP " homepage="http://www.kernel.org/pub/linux/libs/pam/" license="GPL-2" distfiles="http://linux-pam.org/library/Linux-PAM-${version}.tar.bz2" -checksum=342b1211c0d3b203a7df2540a5b03a428a087bd8a48c17e49ae268f992b334d9 +checksum=241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb pre_configure() { case "$XBPS_TARGET_MACHINE" in