diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-05-25 17:07:39 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-30 09:30:31 +0100 |
commit | ac512ff9fbe41428e3d71d3e943aaa871d8b155a (patch) | |
tree | 667f9c3463837ecf42c45c16391232adaef8fb80 /meta/recipes-extended/pam/libpam/crypt_configure.patch | |
parent | df798bca330583103b2301678236cc841cc861dd (diff) | |
download | openembedded-core-ac512ff9fbe41428e3d71d3e943aaa871d8b155a.tar.gz |
libpam: update to 1.3.0
1.2.1 -> 1.3.0
Remove upstreamed patch:
a) pam-no-innetgr.patch
Refreshed the following patches for 1.3.0:
a) crypt_configure.patch
b) pam-unix-nullok-secure.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended/pam/libpam/crypt_configure.patch')
-rw-r--r-- | meta/recipes-extended/pam/libpam/crypt_configure.patch | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/meta/recipes-extended/pam/libpam/crypt_configure.patch b/meta/recipes-extended/pam/libpam/crypt_configure.patch index bec82a5f10..917a8af64d 100644 --- a/meta/recipes-extended/pam/libpam/crypt_configure.patch +++ b/meta/recipes-extended/pam/libpam/crypt_configure.patch @@ -1,31 +1,40 @@ +From b86575ab4a0df07da160283459da270e1c0372a0 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +Date: Tue, 24 May 2016 14:11:09 +0300 +Subject: [PATCH] crypt_configure + This patch fixes a case where it find crypt defined in libc (musl) but not in specified libraries then it ends up assigning - LIBCRYPT="-l" which then goes into makefile cause all sort of problems e.g. ld: cannot find -l-m32 | collect2: error: ld returned 1 exit status - -The reason is that -l appears on commandline with out any library and -compiler treats the next argument as library name whatever it is. - +The reason is that -l appears on commandline with +out any library and compiler treats the next argument as library name +whatever it is. Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: Linux-PAM-1.1.6/configure.in -=================================================================== ---- Linux-PAM-1.1.6.org/configure.ac -+++ Linux-PAM-1.1.6/configure.ac -@@ -400,7 +400,9 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = +diff --git a/configure.ac b/configure.ac +index df39d07..e68d856 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -401,7 +401,7 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], [crypt_libs="crypt"]) BACKUP_LIBS=$LIBS --AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="") -+AC_SEARCH_LIBS([crypt],[$crypt_libs], -+ [test "$ac_cv_search_crypt" = "none required" || -+ LIBCRYPT="$ac_cv_search_crypt"]) +-AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="${ac_lib:+-l$ac_lib}", LIBCRYPT="") ++AC_SEARCH_LIBS([crypt],[$crypt_libs], [test "$ac_cv_search_crypt" = "none required" || LIBCRYPT="$ac_cv_search_crypt"]) AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) LIBS=$BACKUP_LIBS AC_SUBST(LIBCRYPT) +-- +2.4.0 + |