diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-11 07:44:41 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-11 07:44:41 +0100 |
| commit | dd8c258716dd3fddd4501cd644cbd65e83e9a1bc (patch) | |
| tree | d88ea4ed00b911c177b8211b2221bf32f272e09d /package/pam | |
| parent | fed3a4e88610344f64cb8e2a0ea9bc85e080cac7 (diff) | |
| parent | f3c6465f816ea646d546a0320e91d7e024866ee9 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/pam')
| -rw-r--r-- | package/pam/Makefile | 4 | ||||
| -rw-r--r-- | package/pam/patches/patch-Makefile_in | 11 | ||||
| -rw-r--r-- | package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c | 4 | ||||
| -rw-r--r-- | package/pam/patches/patch-modules_pam_time_pam_time_c | 4 |
4 files changed, 17 insertions, 6 deletions
diff --git a/package/pam/Makefile b/package/pam/Makefile index a326655e8..40484ccea 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.1.8 PKG_RELEASE:= 2 PKG_MD5SUM:= 5107bbf54042400b6200e8367cc7feef PKG_DESCR:= Pluggable Authentication Modules -PKG_BUILDDEP:= flex +PKG_BUILDDEP:= flex-host flex PKG_SECTION:= misc PKG_URL:= http://www.linux-pam.org/ PKG_SITES:= http://www.linux-pam.org/library/ @@ -21,8 +21,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -#XAKE_FLAGS+= GCC_HONOUR_COPTS=s CONFIGURE_ARGS+= --disable-nis \ + --disable-regenerate-docu \ --enable-db=no post-install: diff --git a/package/pam/patches/patch-Makefile_in b/package/pam/patches/patch-Makefile_in new file mode 100644 index 000000000..a81d4223a --- /dev/null +++ b/package/pam/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- Linux-PAM-1.1.8.orig/Makefile.in 2013-09-19 10:01:36.000000000 +0200 ++++ Linux-PAM-1.1.8/Makefile.in 2014-02-10 15:26:20.000000000 +0100 +@@ -288,7 +288,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news +-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests ++SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests + CLEANFILES = *~ + EXTRA_DIST = pgp.keys.asc CHANGELOG ChangeLog-CVS Copyright Make.xml.rules + ACLOCAL_AMFLAGS = -I m4 diff --git a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c b/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c index 93a79ebda..d6c05edaf 100644 --- a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c +++ b/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c @@ -1,6 +1,6 @@ --- Linux-PAM-1.1.8.orig/modules/pam_succeed_if/pam_succeed_if.c 2013-06-18 16:11:21.000000000 +0200 -+++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c 2013-12-21 18:30:19.000000000 +0100 -@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh, ++++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c 2014-02-10 11:36:17.000000000 +0100 +@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh, static int evaluate_innetgr(const char *host, const char *user, const char *group) { diff --git a/package/pam/patches/patch-modules_pam_time_pam_time_c b/package/pam/patches/patch-modules_pam_time_pam_time_c index b8670e562..a914fdd49 100644 --- a/package/pam/patches/patch-modules_pam_time_pam_time_c +++ b/package/pam/patches/patch-modules_pam_time_pam_time_c @@ -1,6 +1,6 @@ --- Linux-PAM-1.1.8.orig/modules/pam_time/pam_time.c 2013-06-18 16:11:21.000000000 +0200 -+++ Linux-PAM-1.1.8/modules/pam_time/pam_time.c 2013-12-21 18:30:19.000000000 +0100 -@@ -554,9 +554,11 @@ check_account(pam_handle_t *pamh, const ++++ Linux-PAM-1.1.8/modules/pam_time/pam_time.c 2014-02-10 11:36:17.000000000 +0100 +@@ -554,9 +554,11 @@ check_account(pam_handle_t *pamh, const continue; } /* If buffer starts with @, we are using netgroups */ |