diff options
| -rw-r--r-- | package/pam/patches/patch-Makefile_in | 11 | ||||
| -rw-r--r-- | package/pam/patches/patch-configure | 20 | ||||
| -rw-r--r-- | package/pam/patches/patch-configure_in | 11 | ||||
| -rw-r--r-- | package/pam/patches/patch-modules_Makefile_am (renamed from package/pam/patches/patch-modules_Makefile_in) | 6 |
4 files changed, 13 insertions, 35 deletions
diff --git a/package/pam/patches/patch-Makefile_in b/package/pam/patches/patch-Makefile_in deleted file mode 100644 index a81d4223a..000000000 --- a/package/pam/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-configure b/package/pam/patches/patch-configure deleted file mode 100644 index 63e03cf5d..000000000 --- a/package/pam/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- Linux-PAM-1.1.8.orig/configure 2013-09-19 10:01:32.000000000 +0200 -+++ Linux-PAM-1.1.8/configure 2013-12-21 18:40:31.000000000 +0100 -@@ -10718,8 +10718,6 @@ then - if test ${libdir} = '${exec_prefix}/lib' - then - case "`uname -m`" in -- x86_64|ppc64|s390x|sparc64) -- libdir="/lib64" ;; - *) - libdir="/lib" ;; - esac -@@ -13299,7 +13297,7 @@ $as_echo "$ac_cv_search_crypt" >&6; } - ac_res=$ac_cv_search_crypt - if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -- LIBCRYPT="-l$ac_lib" -+ LIBCRYPT="-lcrypt" - else - LIBCRYPT="" - fi diff --git a/package/pam/patches/patch-configure_in b/package/pam/patches/patch-configure_in index 499ecc705..122d66e01 100644 --- a/package/pam/patches/patch-configure_in +++ b/package/pam/patches/patch-configure_in @@ -1,5 +1,5 @@ --- Linux-PAM-1.1.8.orig/configure.in 2013-09-18 14:30:13.000000000 +0200 -+++ Linux-PAM-1.1.8/configure.in 2014-05-24 11:00:07.000000000 +0200 ++++ Linux-PAM-1.1.8/configure.in 2014-05-25 20:13:52.996143452 +0200 @@ -28,12 +28,7 @@ dnl If we use /usr as prefix, use /etc f fi if test ${libdir} = '${exec_prefix}/lib' @@ -14,3 +14,12 @@ fi if test ${sbindir} = '${exec_prefix}/sbin' then +@@ -404,7 +399,7 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = + [crypt_libs="crypt"]) + + BACKUP_LIBS=$LIBS +-AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="") ++AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-lcrypt", LIBCRYPT="") + AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) + LIBS=$BACKUP_LIBS + AC_SUBST(LIBCRYPT) diff --git a/package/pam/patches/patch-modules_Makefile_in b/package/pam/patches/patch-modules_Makefile_am index 4185b299e..b70eaef1b 100644 --- a/package/pam/patches/patch-modules_Makefile_in +++ b/package/pam/patches/patch-modules_Makefile_am @@ -1,6 +1,6 @@ ---- Linux-PAM-1.1.8.orig/modules/Makefile.in 2013-09-19 10:01:33.000000000 +0200 -+++ Linux-PAM-1.1.8/modules/Makefile.in 2013-12-21 18:45:07.000000000 +0100 -@@ -274,7 +274,7 @@ SUBDIRS = pam_access pam_cracklib pam_de +--- Linux-PAM-1.1.8.orig/modules/Makefile.am 2013-06-18 16:11:21.000000000 +0200 ++++ Linux-PAM-1.1.8/modules/Makefile.am 2014-05-25 20:13:15.415984289 +0200 +@@ -7,7 +7,7 @@ SUBDIRS = pam_access pam_cracklib pam_de pam_group pam_issue pam_keyinit pam_lastlog pam_limits \ pam_listfile pam_localuser pam_loginuid pam_mail \ pam_mkhomedir pam_motd pam_namespace pam_nologin \ |