diff options
Diffstat (limited to 'meta/recipes-extended/pam')
-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/99_pam | 2 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam/libpam-xtests.patch | 22 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam/pam-volatiles.conf | 1 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam/run-ptest | 5 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.6.1.bb (renamed from meta/recipes-extended/pam/libpam_1.5.1.bb) | 107 |
7 files changed, 87 insertions, 106 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 | |
diff --git a/meta/recipes-extended/pam/libpam_1.5.1.bb b/meta/recipes-extended/pam/libpam_1.6.1.bb index f225487688..9f2106ea73 100644 --- a/meta/recipes-extended/pam/libpam_1.5.1.bb +++ b/meta/recipes-extended/pam/libpam_1.6.1.bb | |||
@@ -6,13 +6,13 @@ BUGTRACKER = "https://fedorahosted.org/linux-pam/newticket" | |||
6 | SECTION = "base" | 6 | SECTION = "base" |
7 | # PAM is dual licensed under GPL and BSD. | 7 | # PAM is dual licensed under GPL and BSD. |
8 | # /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time | 8 | # /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time |
9 | # libpam-runtime-1.0.1 is GPLv2+), by openembedded | 9 | # libpam-runtime-1.0.1 is GPL-2.0-or-later), by openembedded |
10 | LICENSE = "GPLv2+ | BSD" | 10 | LICENSE = "GPL-2.0-or-later | BSD-3-Clause" |
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \ | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \ |
12 | file://libpamc/License;md5=a4da476a14c093fdc73be3c3c9ba8fb3 \ | 12 | file://libpamc/License;md5=a4da476a14c093fdc73be3c3c9ba8fb3 \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux-PAM-${PV}.tar.xz \ | 15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \ |
16 | file://99_pam \ | 16 | file://99_pam \ |
17 | file://pam.d/common-account \ | 17 | file://pam.d/common-account \ |
18 | file://pam.d/common-auth \ | 18 | file://pam.d/common-auth \ |
@@ -21,37 +21,45 @@ 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 \ |
25 | file://pam-volatiles.conf \ | ||
27 | " | 26 | " |
28 | 27 | ||
29 | SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc" | 28 | SRC_URI[sha256sum] = "f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e" |
30 | 29 | ||
31 | DEPENDS = "bison-native flex flex-native cracklib libxml2-native virtual/crypt" | 30 | DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" |
32 | 31 | ||
33 | EXTRA_OECONF = "--includedir=${includedir}/security \ | 32 | EXTRA_OECONF = "--includedir=${includedir}/security \ |
34 | --libdir=${base_libdir} \ | 33 | --libdir=${base_libdir} \ |
34 | --with-systemdunitdir=${systemd_system_unitdir} \ | ||
35 | --disable-nis \ | 35 | --disable-nis \ |
36 | --disable-regenerate-docu \ | 36 | --disable-regenerate-docu \ |
37 | --disable-doc \ | 37 | --disable-doc \ |
38 | --disable-prelude" | 38 | --disable-prelude" |
39 | 39 | ||
40 | CFLAGS_append = " -fPIC " | 40 | CFLAGS:append = " -fPIC " |
41 | 41 | ||
42 | S = "${WORKDIR}/Linux-PAM-${PV}" | 42 | S = "${WORKDIR}/Linux-PAM-${PV}" |
43 | 43 | ||
44 | inherit autotools gettext pkgconfig systemd ptest | 44 | inherit autotools gettext pkgconfig systemd ptest github-releases |
45 | 45 | ||
46 | PACKAGECONFIG ??= "" | 46 | PACKAGECONFIG ??= "" |
47 | PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," | 47 | PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," |
48 | PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," | 48 | PACKAGECONFIG[userdb] = "--enable-db=db,--enable-db=no,db," |
49 | 49 | ||
50 | PACKAGES += "${PN}-runtime ${PN}-xtests" | 50 | PACKAGES += "${PN}-runtime ${PN}-xtests" |
51 | FILES_${PN} = "${base_libdir}/lib*${SOLIBS}" | 51 | FILES:${PN} = " \ |
52 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" | 52 | ${base_libdir}/lib*${SOLIBS} \ |
53 | FILES_${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" | 53 | ${nonarch_libdir}/tmpfiles.d/*.conf \ |
54 | FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" | 54 | " |
55 | FILES:${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" | ||
56 | FILES:${PN}-runtime = "${sysconfdir} ${sbindir} ${systemd_system_unitdir}" | ||
57 | FILES:${PN}-xtests = "${datadir}/Linux-PAM/xtests" | ||
58 | |||
59 | # libpam installs /etc/environment for use with the pam_env plugin. Make sure it is | ||
60 | # packaged with the pam-plugin-env package to avoid breaking installations which | ||
61 | # install that file via other packages | ||
62 | FILES:pam-plugin-env = "${sysconfdir}/environment" | ||
55 | 63 | ||
56 | PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" | 64 | PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" |
57 | 65 | ||
@@ -61,16 +69,16 @@ def get_multilib_bit(d): | |||
61 | 69 | ||
62 | libpam_suffix = "suffix${@get_multilib_bit(d)}" | 70 | libpam_suffix = "suffix${@get_multilib_bit(d)}" |
63 | 71 | ||
64 | RPROVIDES_${PN} += "${PN}-${libpam_suffix}" | 72 | RPROVIDES:${PN} += "${PN}-${libpam_suffix}" |
65 | RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" | 73 | RPROVIDES:${PN}-runtime += "${PN}-runtime-${libpam_suffix}" |
66 | 74 | ||
67 | RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \ | 75 | RDEPENDS:${PN}-runtime = "${PN}-${libpam_suffix} \ |
68 | ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ | 76 | ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ |
69 | ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ | 77 | ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ |
70 | ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ | 78 | ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ |
71 | ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ | 79 | ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ |
72 | " | 80 | " |
73 | RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ | 81 | RDEPENDS:${PN}-xtests = "${PN}-${libpam_suffix} \ |
74 | ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ | 82 | ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ |
75 | ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ | 83 | ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ |
76 | ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ | 84 | ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ |
@@ -79,27 +87,27 @@ RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \ | |||
79 | bash coreutils" | 87 | bash coreutils" |
80 | 88 | ||
81 | # FIXME: Native suffix breaks here, disable it for now | 89 | # FIXME: Native suffix breaks here, disable it for now |
82 | RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" | 90 | RRECOMMENDS:${PN} = "${PN}-runtime-${libpam_suffix}" |
83 | RRECOMMENDS_${PN}_class-native = "" | 91 | RRECOMMENDS:${PN}:class-native = "" |
84 | 92 | ||
85 | python populate_packages_prepend () { | 93 | python populate_packages:prepend () { |
86 | def pam_plugin_hook(file, pkg, pattern, format, basename): | 94 | def pam_plugin_hook(file, pkg, pattern, format, basename): |
87 | pn = d.getVar('PN') | 95 | pn = d.getVar('PN') |
88 | libpam_suffix = d.getVar('libpam_suffix') | 96 | libpam_suffix = d.getVar('libpam_suffix') |
89 | 97 | ||
90 | rdeps = d.getVar('RDEPENDS_' + pkg) | 98 | rdeps = d.getVar('RDEPENDS:' + pkg) |
91 | if rdeps: | 99 | if rdeps: |
92 | rdeps = rdeps + " " + pn + "-" + libpam_suffix | 100 | rdeps = rdeps + " " + pn + "-" + libpam_suffix |
93 | else: | 101 | else: |
94 | rdeps = pn + "-" + libpam_suffix | 102 | rdeps = pn + "-" + libpam_suffix |
95 | d.setVar('RDEPENDS_' + pkg, rdeps) | 103 | d.setVar('RDEPENDS:' + pkg, rdeps) |
96 | 104 | ||
97 | provides = d.getVar('RPROVIDES_' + pkg) | 105 | provides = d.getVar('RPROVIDES:' + pkg) |
98 | if provides: | 106 | if provides: |
99 | provides = provides + " " + pkg + "-" + libpam_suffix | 107 | provides = provides + " " + pkg + "-" + libpam_suffix |
100 | else: | 108 | else: |
101 | provides = pkg + "-" + libpam_suffix | 109 | provides = pkg + "-" + libpam_suffix |
102 | d.setVar('RPROVIDES_' + pkg, provides) | 110 | d.setVar('RPROVIDES:' + pkg, provides) |
103 | 111 | ||
104 | mlprefix = d.getVar('MLPREFIX') or '' | 112 | mlprefix = d.getVar('MLPREFIX') or '' |
105 | dvar = d.expand('${WORKDIR}/package') | 113 | dvar = d.expand('${WORKDIR}/package') |
@@ -109,7 +117,7 @@ python populate_packages_prepend () { | |||
109 | pam_pkgname = mlprefix + 'pam-plugin%s' | 117 | pam_pkgname = mlprefix + 'pam-plugin%s' |
110 | 118 | ||
111 | do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, | 119 | do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, |
112 | 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='') | 120 | 'PAM plugin for %s', hook=pam_plugin_hook, extra_depends='', prepend=True) |
113 | do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') | 121 | do_split_packages(d, pam_filterdir, r'^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='') |
114 | } | 122 | } |
115 | 123 | ||
@@ -125,11 +133,21 @@ do_install() { | |||
125 | 133 | ||
126 | # don't install /var/run when populating rootfs. Do it through volatile | 134 | # don't install /var/run when populating rootfs. Do it through volatile |
127 | rm -rf ${D}${localstatedir} | 135 | rm -rf ${D}${localstatedir} |
128 | install -d ${D}${sysconfdir}/default/volatiles | 136 | |
129 | install -m 0644 ${WORKDIR}/99_pam ${D}${sysconfdir}/default/volatiles | 137 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then |
138 | rm -rf ${D}${sysconfdir}/init.d/ | ||
139 | rm -rf ${D}${sysconfdir}/rc* | ||
140 | install -d ${D}${nonarch_libdir}/tmpfiles.d | ||
141 | install -m 0644 ${UNPACKDIR}/pam-volatiles.conf \ | ||
142 | ${D}${nonarch_libdir}/tmpfiles.d/pam.conf | ||
143 | else | ||
144 | install -d ${D}${sysconfdir}/default/volatiles | ||
145 | install -m 0644 ${UNPACKDIR}/99_pam \ | ||
146 | ${D}${sysconfdir}/default/volatiles/ | ||
147 | fi | ||
130 | 148 | ||
131 | install -d ${D}${sysconfdir}/pam.d/ | 149 | install -d ${D}${sysconfdir}/pam.d/ |
132 | install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ | 150 | install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ |
133 | 151 | ||
134 | # The lsb requires unix_chkpwd has setuid permission | 152 | # The lsb requires unix_chkpwd has setuid permission |
135 | chmod 4755 ${D}${sbindir}/unix_chkpwd | 153 | chmod 4755 ${D}${sbindir}/unix_chkpwd |
@@ -137,27 +155,36 @@ do_install() { | |||
137 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 155 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
138 | echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session | 156 | echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session |
139 | fi | 157 | fi |
158 | if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then | ||
159 | install -d ${D}/${libdir}/ | ||
160 | mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/ | ||
161 | fi | ||
140 | } | 162 | } |
141 | 163 | ||
142 | do_install_ptest() { | 164 | do_install_ptest() { |
143 | if [ ${PTEST_ENABLED} = "1" ]; then | 165 | mkdir -p ${D}${PTEST_PATH}/tests |
144 | mkdir -p ${D}${PTEST_PATH}/tests | 166 | install -m 0755 ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests |
145 | install -m 0755 ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests | 167 | install -m 0644 ${S}/tests/confdir ${D}${PTEST_PATH}/tests |
146 | fi | 168 | } |
169 | |||
170 | pkg_postinst:${PN}() { | ||
171 | if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then | ||
172 | /etc/init.d/populate-volatile.sh update | ||
173 | fi | ||
147 | } | 174 | } |
148 | 175 | ||
149 | inherit features_check | 176 | inherit features_check |
150 | REQUIRED_DISTRO_FEATURES = "pam" | 177 | ANY_OF_DISTRO_FEATURES = "pam systemd" |
151 | 178 | ||
152 | BBCLASSEXTEND = "nativesdk native" | 179 | BBCLASSEXTEND = "nativesdk native" |
153 | 180 | ||
154 | CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session" | 181 | CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-session" |
155 | CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth" | 182 | CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-auth" |
156 | CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password" | 183 | CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-password" |
157 | CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" | 184 | CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" |
158 | CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account" | 185 | CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-account" |
159 | CONFFILES_${PN}-runtime += "${sysconfdir}/security/limits.conf" | 186 | CONFFILES:${PN}-runtime += "${sysconfdir}/security/limits.conf" |
160 | 187 | ||
161 | UPSTREAM_CHECK_URI = "https://github.com/linux-pam/linux-pam/releases" | 188 | GITHUB_BASE_URI = "https://github.com/linux-pam/linux-pam/releases" |
162 | 189 | ||
163 | CVE_PRODUCT = "linux-pam" | 190 | CVE_PRODUCT = "linux-pam" |