From 10e10bbf54825b444b95a1a6f45435e32c994180 Mon Sep 17 00:00:00 2001 From: Ryan Barnett Date: Wed, 4 Sep 2013 18:15:31 -0500 Subject: [PATCH] linux-pam: bump to version 1.1.6 Signed-off-by: Ryan Barnett Signed-off-by: Peter Korsgaard --- ...s-are-no-longer-defined-unless-you-e.patch | 28 ------------------- package/linux-pam/linux-pam-configure.patch | 9 +++--- .../linux-pam/linux-pam-doc-makefile-am.patch | 10 +++---- package/linux-pam/linux-pam.mk | 6 ++-- 4 files changed, 11 insertions(+), 42 deletions(-) delete mode 100644 package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch diff --git a/package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch b/package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch deleted file mode 100644 index a73ada6bf6..0000000000 --- a/package/linux-pam/linux-pam-RLIMIT_-variables-are-no-longer-defined-unless-you-e.patch +++ /dev/null @@ -1,28 +0,0 @@ -Date: Mon, 9 Jul 2012 09:43:11 +0200 -Subject: [PATCH] RLIMIT_* variables are no longer defined unless you - explicitly include sys/resource.h. - -Signed-off-by: Diego Elio Pettenò - -modules/pam_unix/pam_unix_acct.c: Include sys/resource.h. -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) -[This patch is in linux-pam 1.1.6] ---- - modules/pam_unix/pam_unix_acct.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c -index 8e90cc9..4a362f8 100644 ---- a/modules/pam_unix/pam_unix_acct.c -+++ b/modules/pam_unix/pam_unix_acct.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -1.8.2.1 - diff --git a/package/linux-pam/linux-pam-configure.patch b/package/linux-pam/linux-pam-configure.patch index 0b2326b1d6..d39261f74e 100644 --- a/package/linux-pam/linux-pam-configure.patch +++ b/package/linux-pam/linux-pam-configure.patch @@ -5,11 +5,10 @@ where needed. Signed-off-by: Dmitry Golubovsky -Index: linux-pam-1.1.4/configure.in -============================================================================ ---- linux-pam-1.1.4/configure.in 2011-06-24 06:46:33.000000000 -0400 -+++ linux-pam-1.1.4/configure.in 2012-08-09 21:14:11.000000000 -0400 -@@ -522,7 +522,7 @@ +diff -urN a/configure.in b/configure.in +--- a/configure.in 2012-08-17 03:48:24.000000000 -0500 ++++ b/configure.in 2013-07-17 09:49:23.760254684 -0500 +@@ -526,7 +526,7 @@ 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) diff --git a/package/linux-pam/linux-pam-doc-makefile-am.patch b/package/linux-pam/linux-pam-doc-makefile-am.patch index f08d34916b..8fa2dda2fc 100644 --- a/package/linux-pam/linux-pam-doc-makefile-am.patch +++ b/package/linux-pam/linux-pam-doc-makefile-am.patch @@ -4,10 +4,9 @@ Generation of documentation is not necessary in Buildroot, disable it completely Signed-off-by: Dmitry Golubovsky -Index: linux-pam-1.1.4/doc/Makefile.am -============================================================================ ---- linux-pam-1.1.4/doc/Makefile.am 2011-06-21 05:04:56.000000000 -0400 -+++ linux-pam-1.1.4/doc/Makefile.am 2012-08-09 05:59:23.000000000 -0400 +diff -urN a/doc/Makefile.am b/doc/Makefile.am +--- a/doc/Makefile.am 2012-08-15 06:08:43.000000000 -0500 ++++ b/doc/Makefile.am 2013-07-17 09:54:53.000000000 -0500 @@ -2,8 +2,6 @@ # Copyright (c) 2005, 2006 Thorsten Kukuk # @@ -17,7 +16,7 @@ Index: linux-pam-1.1.4/doc/Makefile.am CLEANFILES = *~ dist_html_DATA = index.html -@@ -11,12 +9,4 @@ +@@ -11,11 +9,4 @@ ####################################################### releasedocs: all @@ -29,5 +28,4 @@ Index: linux-pam-1.1.4/doc/Makefile.am - make -C sag releasedocs - make -C adg releasedocs - make -C mwg releasedocs -- + /bin/true diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index aa9fa36434..4472cd4311 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.1.4 +LINUX_PAM_VERSION = 1.1.6 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2 LINUX_PAM_SITE = http://linux-pam.org/library/ LINUX_PAM_INSTALL_STAGING = YES @@ -16,13 +16,13 @@ LINUX_PAM_CONF_OPT = \ --disable-regenerate-docu \ --enable-securedir=/lib/security \ --libdir=/lib -LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ - flex host-flex +LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf LINUX_PAM_AUTORECONF = YES LINUX_PAM_LICENSE = BSD-3c LINUX_PAM_LICENSE_FILES = Copyright ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) + LINUX_PAM_DEPENDENCIES += gettext LINUX_PAM_MAKE_OPT += LIBS=-lintl endif