summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2011-07-19 17:08:31 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 12:02:41 +0100
commitb1a020621cbbfcf5607cdf2ceb78f29082824620 (patch)
tree8e45c087a9afbff242dccbd36d990e1a16b68229
parent066f06c978d289fa72bad79635dd9534f68941ca (diff)
downloadpoky-b1a020621cbbfcf5607cdf2ceb78f29082824620.tar.gz
libpam: update to 1.1.4 and add subpackage xtests
Update libpam to 1.1.4, and add dependecy cracklib because run xtexts will need pam-plugin-cracklib. There are some additional checks under subdirectory xtests and make it as a subpackage libpam-xtests. (From OE-Core rev: f9158bf219479c2da56dd21a13ecee3176cd6f8a) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/pam/libpam/libpam-xtests.patch35
-rw-r--r--meta/recipes-extended/pam/libpam_1.1.4.bb (renamed from meta/recipes-extended/pam/libpam_1.1.3.bb)14
2 files changed, 44 insertions, 5 deletions
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
new file mode 100644
index 0000000000..be687457f8
--- /dev/null
+++ b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
@@ -0,0 +1,35 @@
1This patch is used to create a new sub package libpam-xtests to do more checks.
2
3Upstream-Status: Pending
4
5Signed-off-by: Kang Kai <kai.kang@windriver.com>
6--- Linux-PAM-1.1.4/xtests/Makefile.am.orig 2011-07-19 17:00:09.619980001 +0800
7+++ Linux-PAM-1.1.4/xtests/Makefile.am 2011-07-19 16:54:00.229979998 +0800
8@@ -7,7 +7,7 @@
9 AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \
10 -L$(top_builddir)/libpam_misc -lpam_misc
11
12-CLEANFILES = *~ $(XTESTS)
13+CLEANFILES = *~
14
15 EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
16 tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \
17@@ -51,3 +51,18 @@
18
19 xtests: $(XTESTS) run-xtests.sh
20 "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS}
21+
22+all: $(XTESTS)
23+
24+install: install_xtests
25+
26+install_xtests:
27+ $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests
28+ for file in $(EXTRA_DIST) ; do \
29+ $(INSTALL) $$file $(DESTDIR)$(pkgdatadir)/xtests ; \
30+ done
31+ for file in $(XTESTS); do \
32+ $(INSTALL) .libs/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \
33+ done
34+
35+.PHONY: all install_xtests
diff --git a/meta/recipes-extended/pam/libpam_1.1.3.bb b/meta/recipes-extended/pam/libpam_1.1.4.bb
index b62e2f27a0..59fbdcdffc 100644
--- a/meta/recipes-extended/pam/libpam_1.1.3.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.4.bb
@@ -11,18 +11,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083"
11 11
12PR = "r0" 12PR = "r0"
13 13
14DEPENDS = "bison flex" 14DEPENDS = "bison flex cracklib"
15RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix" 15RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix"
16RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cracklib pam-plugin-pwhistory \
17 pam-plugin-succeed-if pam-plugin-time coreutils"
16RRECOMMENDS_${PN} = "libpam-runtime" 18RRECOMMENDS_${PN} = "libpam-runtime"
17 19
18SRC_URI = "${KERNELORG_MIRROR}/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \ 20SRC_URI = "${KERNELORG_MIRROR}/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \
19 file://99_pam \ 21 file://99_pam \
20 file://pam.d/*" 22 file://pam.d/* \
23 file://libpam-xtests.patch"
21 24
22SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch" 25SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch"
23 26
24SRC_URI[md5sum] = "6db7fcb5db6253350e3a4648ceac40e7" 27SRC_URI[md5sum] = "e9af5fb27bb22edb55d077e2888b3ebc"
25SRC_URI[sha256sum] = "17b268789b935a76e736a1150210dd12f156972973e79347668f828d43632652" 28SRC_URI[sha256sum] = "ccd89331914390b1e9e99c954471d65f19b660d81e15a46eeb96cee125d44056"
26 29
27EXTRA_OECONF = "--with-db-uniquename=_pam \ 30EXTRA_OECONF = "--with-db-uniquename=_pam \
28 --includedir=${includedir}/security \ 31 --includedir=${includedir}/security \
@@ -34,12 +37,13 @@ S = "${WORKDIR}/Linux-PAM-${PV}"
34 37
35inherit autotools gettext 38inherit autotools gettext
36 39
37PACKAGES += "${PN}-runtime" 40PACKAGES += "${PN}-runtime ${PN}-xtests"
38FILES_${PN} = "${base_libdir}/lib*${SOLIBS}" 41FILES_${PN} = "${base_libdir}/lib*${SOLIBS}"
39FILES_${PN}-dbg += "${base_libdir}/security/.debug \ 42FILES_${PN}-dbg += "${base_libdir}/security/.debug \
40 ${base_libdir}/security/pam_filter/.debug" 43 ${base_libdir}/security/pam_filter/.debug"
41FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}" 44FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libdir}/lib*${SOLIBSDEV}"
42FILES_${PN}-runtime = "${sysconfdir}" 45FILES_${PN}-runtime = "${sysconfdir}"
46FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests"
43 47
44PACKAGES_DYNAMIC += " pam-plugin-*" 48PACKAGES_DYNAMIC += " pam-plugin-*"
45 49