diff options
Diffstat (limited to 'meta/recipes-extended/pam/libpam')
6 files changed, 20 insertions, 66 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 @@ | |||
1 | From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Wed, 6 Jan 2021 12:08:20 +0800 | ||
4 | Subject: [PATCH] Makefile.am: support usrmage | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-specific] | ||
7 | |||
8 | Signed-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 | |||
13 | diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am | ||
14 | index 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 | -- | ||
27 | 2.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 @@ | |||
1 | From e2db4082f6b988f1d5803028e9e47aee5f3519ac Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Sun, 27 Dec 2020 00:30:45 +0100 | ||
4 | Subject: [PATCH] modules/pam_namespace/Makefile.am: correctly install systemd | ||
5 | unit file | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-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 | |||
13 | diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am | ||
14 | index 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 | -- | ||
27 | 2.24.0 | ||
28 | |||
diff --git a/meta/recipes-extended/pam/libpam/99_pam b/meta/recipes-extended/pam/libpam/99_pam index 97e990d10b..a88247be13 100644 --- a/meta/recipes-extended/pam/libpam/99_pam +++ b/meta/recipes-extended/pam/libpam/99_pam | |||
@@ -1 +1 @@ | |||
d root root 0755 /var/run/sepermit none | d root root 0755 /run/sepermit none | ||
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch index ea145899b4..f2dafa72a5 100644 --- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch +++ b/meta/recipes-extended/pam/libpam/libpam-xtests.patch | |||
@@ -1,13 +1,21 @@ | |||
1 | This patch is used to create a new sub package libpam-xtests to do more checks. | 1 | From 060726f7e60c8ecb5bf50fd776910b290d9a0a69 Mon Sep 17 00:00:00 2001 |
2 | From: Kang Kai <kai.kang@windriver.com> | ||
3 | Date: Tue, 19 Jul 2011 17:08:31 +0800 | ||
4 | Subject: [PATCH] This patch is used to create a new sub package libpam-xtests | ||
5 | to do more checks. | ||
2 | 6 | ||
3 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
4 | 8 | ||
5 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | 9 | Signed-off-by: Kang Kai <kai.kang@windriver.com> |
6 | Index: Linux-PAM-1.3.0/xtests/Makefile.am | 10 | --- |
7 | =================================================================== | 11 | xtests/Makefile.am | 17 ++++++++++++++++- |
8 | --- Linux-PAM-1.3.0.orig/xtests/Makefile.am | 12 | 1 file changed, 16 insertions(+), 1 deletion(-) |
9 | +++ Linux-PAM-1.3.0/xtests/Makefile.am | 13 | |
10 | @@ -7,7 +7,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_src | 14 | diff --git a/xtests/Makefile.am b/xtests/Makefile.am |
15 | index acf9746..9826c9f 100644 | ||
16 | --- a/xtests/Makefile.am | ||
17 | +++ b/xtests/Makefile.am | ||
18 | @@ -8,7 +8,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \ | ||
11 | LDADD = $(top_builddir)/libpam/libpam.la \ | 19 | LDADD = $(top_builddir)/libpam/libpam.la \ |
12 | $(top_builddir)/libpam_misc/libpam_misc.la | 20 | $(top_builddir)/libpam_misc/libpam_misc.la |
13 | 21 | ||
@@ -16,7 +24,7 @@ Index: Linux-PAM-1.3.0/xtests/Makefile.am | |||
16 | 24 | ||
17 | EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ | 25 | EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ |
18 | tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ | 26 | tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ |
19 | @@ -51,3 +51,18 @@ EXTRA_PROGRAMS = $(XTESTS) | 27 | @@ -55,3 +55,18 @@ EXTRA_PROGRAMS = $(XTESTS) |
20 | 28 | ||
21 | xtests: $(XTESTS) run-xtests.sh | 29 | xtests: $(XTESTS) run-xtests.sh |
22 | "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} | 30 | "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} |
diff --git a/meta/recipes-extended/pam/libpam/pam-volatiles.conf b/meta/recipes-extended/pam/libpam/pam-volatiles.conf new file mode 100644 index 0000000000..1263feb03d --- /dev/null +++ b/meta/recipes-extended/pam/libpam/pam-volatiles.conf | |||
@@ -0,0 +1 @@ | |||
d /run/sepermit 0755 root root - - | |||
diff --git a/meta/recipes-extended/pam/libpam/run-ptest b/meta/recipes-extended/pam/libpam/run-ptest index 69e729ce2a..9c304aee47 100644 --- a/meta/recipes-extended/pam/libpam/run-ptest +++ b/meta/recipes-extended/pam/libpam/run-ptest | |||
@@ -2,9 +2,10 @@ | |||
2 | 2 | ||
3 | cd tests | 3 | cd tests |
4 | 4 | ||
5 | export srcdir=. | ||
6 | |||
5 | failed=0 | 7 | failed=0 |
6 | all=0 | 8 | all=0 |
7 | |||
8 | for f in tst-*; do | 9 | for f in tst-*; do |
9 | "./$f" > /dev/null 2>&1 | 10 | "./$f" > /dev/null 2>&1 |
10 | case "$?" in | 11 | case "$?" in |
@@ -28,4 +29,4 @@ if [ "$failed" -eq 0 ] ; then | |||
28 | else | 29 | else |
29 | echo "$failed of $all tests failed" | 30 | echo "$failed of $all tests failed" |
30 | fi | 31 | fi |
31 | 32 | unset srcdir | |