summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/at
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2011-07-20 02:29:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 11:02:42 (GMT)
commita601df4fec99302c4d4fec686674ea202a15cd8b (patch)
tree552532c446d662ca3230c1dc3685476ce63dbefa /meta/recipes-extended/at
parent7772a8893db25ab87025844a473f97ae56ddf170 (diff)
downloadpoky-a601df4fec99302c4d4fec686674ea202a15cd8b.tar.gz
at: enable pam support
add patches to make at enable pam support (From OE-Core rev: eabf5a639c94a016316bfd6707ee6e5bd676d85d) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/at')
-rw-r--r--meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch23
-rw-r--r--meta/recipes-extended/at/at-3.1.12/pam.conf.patch21
-rw-r--r--meta/recipes-extended/at/at_3.1.12.bb21
3 files changed, 61 insertions, 4 deletions
diff --git a/meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch b/meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch
new file mode 100644
index 0000000..1f73cdd
--- /dev/null
+++ b/meta/recipes-extended/at/at-3.1.12/configure-add-enable-pam.patch
@@ -0,0 +1,23 @@
1--- at-3.1.12/configure.ac 2011-06-23 14:51:03.653572945 +0800
2+++ at-3.1.12/configure.ac.new 2011-06-27 16:12:14.903572945 +0800
3@@ -81,10 +81,18 @@
4 AC_FUNC_VPRINTF
5 AC_FUNC_GETLOADAVG
6 AC_CHECK_FUNCS(getcwd mktime strftime setreuid setresuid sigaction waitpid)
7+
8+AC_ARG_WITH([pam],
9+ [AS_HELP_STRING([--without-pam], [without PAM support])])
10+
11+if test "x$with_pam" != xno; then
12 AC_CHECK_HEADERS(security/pam_appl.h, [
13 PAMLIB="-lpam"
14- AC_DEFINE(HAVE_PAM, 1, [Define to 1 for PAM support])
15-])
16+ AC_DEFINE(HAVE_PAM, 1, [Define to 1 for PAM support])],
17+ [if test "x$with_pam" = xyes; then
18+ AC_MSG_ERROR([PAM selected but security/pam_misc.h not found])
19+ fi])
20+fi
21
22 dnl Checking for programs
23
diff --git a/meta/recipes-extended/at/at-3.1.12/pam.conf.patch b/meta/recipes-extended/at/at-3.1.12/pam.conf.patch
new file mode 100644
index 0000000..dfe76d7
--- /dev/null
+++ b/meta/recipes-extended/at/at-3.1.12/pam.conf.patch
@@ -0,0 +1,21 @@
1oe doesn't support "@include", use the concrete directive instead.
2
3Upstream-Status: Pending
4
5Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
6--- at-3.1.12/pam.conf.orig 2009-11-23 23:11:52.000000000 +0800
7+++ at-3.1.12/pam.conf 2011-07-15 11:14:04.132818950 +0800
8@@ -2,8 +2,8 @@
9 # The PAM configuration file for the at daemon
10 #
11
12-auth required pam_env.so
13-@include common-auth
14-@include common-account
15-@include common-session-noninteractive
16-session required pam_limits.so
17+auth required pam_env.so
18+auth include common-auth
19+account include common-account
20+session include common-session-noninteractive
21+session required pam_limits.so
diff --git a/meta/recipes-extended/at/at_3.1.12.bb b/meta/recipes-extended/at/at_3.1.12.bb
index 3a94497..c76b50e 100644
--- a/meta/recipes-extended/at/at_3.1.12.bb
+++ b/meta/recipes-extended/at/at_3.1.12.bb
@@ -4,10 +4,11 @@ the system load levels drop to a particular level."
4SECTION = "base" 4SECTION = "base"
5LICENSE="GPLv2+" 5LICENSE="GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" 6LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
7DEPENDS = "flex libpam initscripts" 7DEPENDS = "flex libpam initscripts \
8 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
8RCONFLICTS_${PN} = "atd" 9RCONFLICTS_${PN} = "atd"
9RREPLACES_${PN} = "atd" 10RREPLACES_${PN} = "atd"
10PR = "r4" 11PR = "r5"
11 12
12SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ 13SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
13 file://configure.patch \ 14 file://configure.patch \
@@ -17,7 +18,11 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
17 file://posixtm.c \ 18 file://posixtm.c \
18 file://posixtm.h \ 19 file://posixtm.h \
19 file://file_replacement_with_gplv2.patch \ 20 file://file_replacement_with_gplv2.patch \
20 file://S99at" 21 file://S99at \
22 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
23
24PAM_SRC_URI = "file://pam.conf.patch \
25 file://configure-add-enable-pam.patch"
21 26
22SRC_URI[md5sum] = "1e67991776148fb319fd77a2e599a765" 27SRC_URI[md5sum] = "1e67991776148fb319fd77a2e599a765"
23SRC_URI[sha256sum] = "7c55c6ab4fbe8add9e68f31b2b0ebf3fe805c9a4e7cfb2623a3d8a4789cc18f3" 28SRC_URI[sha256sum] = "7c55c6ab4fbe8add9e68f31b2b0ebf3fe805c9a4e7cfb2623a3d8a4789cc18f3"
@@ -26,7 +31,8 @@ EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
26 --with-daemon_username=root \ 31 --with-daemon_username=root \
27 --with-daemon_groupname=root \ 32 --with-daemon_groupname=root \
28 --with-jobdir=/var/spool/at/jobs \ 33 --with-jobdir=/var/spool/at/jobs \
29 --with-atspool=/var/spool/at/spool" 34 --with-atspool=/var/spool/at/spool \
35 ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} "
30 36
31inherit autotools 37inherit autotools
32 38
@@ -41,6 +47,13 @@ do_install () {
41 install -d ${D}${sysconfdir}/rcS.d 47 install -d ${D}${sysconfdir}/rcS.d
42 install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd 48 install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd
43 ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at 49 ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at
50
51 for feature in ${DISTRO_FEATURES}; do
52 if [ "$feature" = "pam" ]; then
53 install -D -m 0644 ${WORKDIR}/${P}/pam.conf ${D}${sysconfdir}/pam.d/atd
54 break
55 fi
56 done
44} 57}
45 58
46pkg_postinst_${PN} () { 59pkg_postinst_${PN} () {