diff options
Diffstat (limited to 'meta-oe/recipes-extended/pam')
| -rw-r--r-- | meta-oe/recipes-extended/pam/pam-plugin-ccreds/0001-configure-Check-for-function-from-libdb-during-confi.patch | 34 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb | 6 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch | 25 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb (renamed from meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb) | 6 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/pam/pam-ssh-agent-auth/0001-configure-Include-stdio.h-for-printf.patch | 37 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb | 3 |
6 files changed, 79 insertions, 32 deletions
diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ccreds/0001-configure-Check-for-function-from-libdb-during-confi.patch b/meta-oe/recipes-extended/pam/pam-plugin-ccreds/0001-configure-Check-for-function-from-libdb-during-confi.patch new file mode 100644 index 0000000000..c5a42359b9 --- /dev/null +++ b/meta-oe/recipes-extended/pam/pam-plugin-ccreds/0001-configure-Check-for-function-from-libdb-during-confi.patch @@ -0,0 +1,34 @@ +From 1915754179401b6ee00f0e2ffd844596778e43a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 12:05:02 -0700 +Subject: [PATCH] configure: Check for function from libdb during configure + +checking for main in AC_CHECK_LIB is not the right check to find out if +a library exists or not, using a function provided by library is more +appropriate and will help using newer compilers and autoconf in future + +Upstream-Status: Submitted [https://github.com/PADL/pam_ccreds/pull/2] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 3829d9f..3d52933 100644 +--- a/configure.in ++++ b/configure.in +@@ -72,9 +72,9 @@ AC_CHECK_HEADERS(pam/pam_appl.h pam/pam_misc.h pam/pam_modules.h) + + AC_CHECK_HEADERS(db.h) + +-AC_CHECK_LIB(db, main,[LIBS="-ldb $LIBS" found_db_lib=yes],,$LIBS) ++AC_CHECK_LIB(db, db_create,[LIBS="-ldb $LIBS" found_db_lib=yes],,$LIBS) + if test -z "$found_db_lib"; then +- AC_CHECK_LIB(db1, main,[LIBS="-ldb1 $LIBS" found_db_lib=yes],,$LIBS) ++ AC_CHECK_LIB(db1, db_create,[LIBS="-ldb1 $LIBS" found_db_lib=yes],,$LIBS) + fi + + AC_CHECK_LIB(pam, pam_start) +-- +2.37.3 + diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb index dc7b84986f..81d0746f89 100644 --- a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb +++ b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb @@ -1,7 +1,7 @@ SUMMARY = "PAM cached credentials module" HOMEPAGE = "https://www.padl.com/OSS/pam_ccreds.html" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libpam openssl db" @@ -11,7 +11,9 @@ REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "e2145df09469bf84878e4729b4ecd814efb797d1" -SRC_URI = "git://github.com/PADL/pam_ccreds;branch=master;protocol=https" +SRC_URI = "git://github.com/PADL/pam_ccreds;branch=master;protocol=https \ + file://0001-configure-Check-for-function-from-libdb-during-confi.patch \ + " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch deleted file mode 100644 index 0a93411533..0000000000 --- a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb/0001-include-stdexcept-for-std-invalid_argument.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3e97c9004f4ec58ca3696ee6298f91e6eeb76e04 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 23 Dec 2019 14:46:25 -0800 -Subject: [PATCH] include <stdexcept> for std::invalid_argument - -Upstream-Status: Submitted [https://github.com/rmbreak/pam_ldapdb/pull/11] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - pam_ldapdb.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pam_ldapdb.cpp b/pam_ldapdb.cpp -index 9baf1e6..be5d85c 100644 ---- a/pam_ldapdb.cpp -+++ b/pam_ldapdb.cpp -@@ -1,5 +1,6 @@ - #include <map> - #include <string> -+#include <stdexcept> - #include <utility> - #include <syslog.h> - #include <pwd.h> --- -2.24.1 - diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb index 6985590068..d5137f80af 100644 --- a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb @@ -10,10 +10,8 @@ DEPENDS = "libpam openldap" inherit features_check REQUIRED_DISTRO_FEATURES = "pam" -SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" -SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https \ - file://0001-include-stdexcept-for-std-invalid_argument.patch \ -" +SRCREV = "3e026863cad1fd45c760ee1bc93ef4f0606cc852" +SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth/0001-configure-Include-stdio.h-for-printf.patch b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth/0001-configure-Include-stdio.h-for-printf.patch new file mode 100644 index 0000000000..c9e2760a27 --- /dev/null +++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth/0001-configure-Include-stdio.h-for-printf.patch @@ -0,0 +1,37 @@ +From a0ae303fe0bcd81dfb1a649cc5e7a372d3bd878d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 20:44:42 -0700 +Subject: [PATCH] configure: Include stdio.h for printf + +Fixes test for __progname + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -2791,7 +2791,9 @@ if test "x$ac_cv_have_control_in_msghdr" + fi + + AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [ +- AC_TRY_LINK([], ++ AC_TRY_LINK([ ++#include <stdio.h> ++], + [ extern char *__progname; printf("%s", __progname); ], + [ ac_cv_libc_defines___progname="yes" ], + [ ac_cv_libc_defines___progname="no" ] +--- a/configure ++++ b/configure +@@ -14838,7 +14838,7 @@ else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- ++#include <stdio.h> + int + main () + { diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index 2db8b18160..b5bcc63339 100644 --- a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -2,7 +2,7 @@ SUMMARY = "pam-ssh-agent-auth" DESCRIPTION = "A PAM module which permits authentication via ssh-agent." HOMEPAGE = "http://sourceforge.net/projects/pamsshagentauth/" SECTION = "libs" -LICENSE = "openssl & BSD" +LICENSE = "OpenSSL & BSD-2-Clause & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.OpenSSL;md5=8ab01146141ded59b75f8ba7811ed05a \ file://OPENSSH_LICENSE;md5=7ae09218173be1643c998a4b71027f9b \ " @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.OpenSSL;md5=8ab01146141ded59b75f8ba7811ed05a SRC_URI = "http://sourceforge.net/projects/pamsshagentauth/files/pam_ssh_agent_auth/v${PV}/pam_ssh_agent_auth-${PV}.tar.bz2 \ file://0001-Adapt-to-OpenSSL-1.1.1.patch \ file://0002-Check-against-the-correct-OPENSSL_VERSION_NUMBER.patch \ + file://0001-configure-Include-stdio.h-for-printf.patch \ " SRC_URI[md5sum] = "8dbe90ab3625e545036333e6f51ccf1d" SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f47a763" |