summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/pam
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/pam')
-rw-r--r--meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch28
-rw-r--r--meta/recipes-extended/pam/libpam/0001-modules-pam_namespace-Makefile.am-correctly-install-.patch28
-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 @@
1From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Wed, 6 Jan 2021 12:08:20 +0800
4Subject: [PATCH] Makefile.am: support usrmage
5
6Upstream-Status: Inappropriate [oe-specific]
7
8Signed-off-by: Changqing Li <changqing.li@windriver.com>
9---
10 modules/pam_namespace/Makefile.am | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am
14index ddd5fc0..a1f1bec 100644
15--- a/modules/pam_namespace/Makefile.am
16+++ b/modules/pam_namespace/Makefile.am
17@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS)
18 securelibdir = $(SECUREDIR)
19 secureconfdir = $(SCONFIGDIR)
20 namespaceddir = $(SCONFIGDIR)/namespace.d
21-servicedir = /lib/systemd/system
22+servicedir = $(systemd_system_unitdir)
23
24 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
25 -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS)
26--
272.17.1
28
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 @@
1From e2db4082f6b988f1d5803028e9e47aee5f3519ac Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sun, 27 Dec 2020 00:30:45 +0100
4Subject: [PATCH] modules/pam_namespace/Makefile.am: correctly install systemd
5 unit file
6
7Upstream-Status: Pending
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 modules/pam_namespace/Makefile.am | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am
14index 21e1b33..ddd5fc0 100644
15--- a/modules/pam_namespace/Makefile.am
16+++ b/modules/pam_namespace/Makefile.am
17@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS)
18 securelibdir = $(SECUREDIR)
19 secureconfdir = $(SCONFIGDIR)
20 namespaceddir = $(SCONFIGDIR)/namespace.d
21-servicedir = $(prefix)/lib/systemd/system
22+servicedir = /lib/systemd/system
23
24 AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
25 -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS)
26--
272.24.0
28
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
21 file://pam.d/common-session-noninteractive \ 21 file://pam.d/common-session-noninteractive \
22 file://pam.d/other \ 22 file://pam.d/other \
23 file://libpam-xtests.patch \ 23 file://libpam-xtests.patch \
24 file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \
25 file://0001-Makefile.am-support-usrmage.patch \
26 file://run-ptest \ 24 file://run-ptest \
27 file://pam-volatiles.conf \ 25 file://pam-volatiles.conf \
28 " 26 "
29 27
30SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc" 28SRC_URI[sha256sum] = "e4ec7131a91da44512574268f493c6d8ca105c87091691b8e9b56ca685d4f94d"
31 29
32DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" 30DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt"
33 31
34EXTRA_OECONF = "--includedir=${includedir}/security \ 32EXTRA_OECONF = "--includedir=${includedir}/security \
35 --libdir=${base_libdir} \ 33 --libdir=${base_libdir} \
34 --with-systemdunitdir=${systemd_system_unitdir} \
36 --disable-nis \ 35 --disable-nis \
37 --disable-regenerate-docu \ 36 --disable-regenerate-docu \
38 --disable-doc \ 37 --disable-doc \
@@ -148,6 +147,8 @@ do_install() {
148 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 147 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
149 echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session 148 echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
150 fi 149 fi
150 install -d ${D}/${libdir}/
151 mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
151} 152}
152 153
153do_install_ptest() { 154do_install_ptest() {