diff options
author | Alexander Kanavin <alex@linutronix.de> | 2021-09-08 20:01:21 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-11 18:31:05 +0100 |
commit | b2aeaab36d7d46d47301d0729b634d182277cfbd (patch) | |
tree | ea20e6b95028dcaad9bd476a1bdda6a4df76f3b4 | |
parent | 13965426b79e8c32f800a4317454321cfd2d06d1 (diff) | |
download | openembedded-core-contrib-b2aeaab36d7d46d47301d0729b634d182277cfbd.tar.gz |
libpam: update 1.5.1 -> 1.5.2
Drop patches: issues fixed upstream.
Move .pc files to correct place as libpam is instructed to install them in /lib via
--libdir.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.5.2.bb (renamed from meta/recipes-extended/pam/libpam_1.5.1.bb) | 7 |
3 files changed, 4 insertions, 59 deletions
diff --git a/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch b/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch deleted file mode 100644 index 5c6bc92705..0000000000 --- a/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 6 Jan 2021 12:08:20 +0800 -Subject: [PATCH] Makefile.am: support usrmage - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - modules/pam_namespace/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am -index ddd5fc0..a1f1bec 100644 ---- a/modules/pam_namespace/Makefile.am -+++ b/modules/pam_namespace/Makefile.am -@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) - securelibdir = $(SECUREDIR) - secureconfdir = $(SCONFIGDIR) - namespaceddir = $(SCONFIGDIR)/namespace.d --servicedir = /lib/systemd/system -+servicedir = $(systemd_system_unitdir) - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) --- -2.17.1 - diff --git a/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch b/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch deleted file mode 100644 index b41d1e5962..0000000000 --- a/meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e2db4082f6b988f1d5803028e9e47aee5f3519ac Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Sun, 27 Dec 2020 00:30:45 +0100 -Subject: [PATCH] modules/pam_namespace/Makefile.am: correctly install systemd - unit file - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - modules/pam_namespace/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am -index 21e1b33..ddd5fc0 100644 ---- a/modules/pam_namespace/Makefile.am -+++ b/modules/pam_namespace/Makefile.am -@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) - securelibdir = $(SECUREDIR) - secureconfdir = $(SCONFIGDIR) - namespaceddir = $(SCONFIGDIR)/namespace.d --servicedir = $(prefix)/lib/systemd/system -+servicedir = /lib/systemd/system - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) --- -2.24.0 - diff --git a/meta/recipes-extended/pam/libpam_1.5.1.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb index efcd27137f..a3c4a50cb3 100644 --- a/meta/recipes-extended/pam/libpam_1.5.1.bb +++ b/meta/recipes-extended/pam/libpam_1.5.2.bb @@ -21,18 +21,17 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://pam.d/common-session-noninteractive \ file://pam.d/other \ file://libpam-xtests.patch \ - file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ - file://0001-Makefile.am-support-usrmage.patch \ file://run-ptest \ file://pam-volatiles.conf \ " -SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc" +SRC_URI[sha256sum] = "e4ec7131a91da44512574268f493c6d8ca105c87091691b8e9b56ca685d4f94d" DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" EXTRA_OECONF = "--includedir=${includedir}/security \ --libdir=${base_libdir} \ + --with-systemdunitdir=${systemd_system_unitdir} \ --disable-nis \ --disable-regenerate-docu \ --disable-doc \ @@ -148,6 +147,8 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session fi + install -d ${D}/${libdir}/ + mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/ } do_install_ptest() { |