diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-08-29 08:26:31 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-31 23:40:48 +0100 |
commit | 7d8430f0b11dcefb6e3a58e35e6969d8bf291f95 (patch) | |
tree | 508478f693619a90dca900cdfcdbcaa880086893 | |
parent | d086917631c2ebc6cedab97864aa0ba22c5f88b1 (diff) | |
download | poky-7d8430f0b11dcefb6e3a58e35e6969d8bf291f95.tar.gz |
at: Upgrade to 3.1.15
Rebase pam.conf.patch
Move to generic files -> at for patches directory
(From OE-Core rev: 6558c8e1a7e5cd9f1f5271718c10355f67573b4c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/at/at/S99at (renamed from meta/recipes-extended/at/files/S99at) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/atd.service (renamed from meta/recipes-extended/at/files/atd.service) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/configure-add-enable-pam.patch (renamed from meta/recipes-extended/at/files/configure-add-enable-pam.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/file_replacement_with_gplv2.patch (renamed from meta/recipes-extended/at/files/file_replacement_with_gplv2.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/fix_parallel_build_error.patch (renamed from meta/recipes-extended/at/files/fix_parallel_build_error.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/pam.conf.patch (renamed from meta/recipes-extended/at/files/pam.conf.patch) | 24 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/posixtm.c (renamed from meta/recipes-extended/at/files/posixtm.c) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/at/at/posixtm.h (renamed from meta/recipes-extended/at/files/posixtm.h) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/at/at_3.1.15.bb (renamed from meta/recipes-extended/at/at_3.1.14.bb) | 4 |
9 files changed, 17 insertions, 11 deletions
diff --git a/meta/recipes-extended/at/files/S99at b/meta/recipes-extended/at/at/S99at index eca379b3cd..eca379b3cd 100644 --- a/meta/recipes-extended/at/files/S99at +++ b/meta/recipes-extended/at/at/S99at | |||
diff --git a/meta/recipes-extended/at/files/atd.service b/meta/recipes-extended/at/at/atd.service index 6dc844504a..6dc844504a 100644 --- a/meta/recipes-extended/at/files/atd.service +++ b/meta/recipes-extended/at/at/atd.service | |||
diff --git a/meta/recipes-extended/at/files/configure-add-enable-pam.patch b/meta/recipes-extended/at/at/configure-add-enable-pam.patch index 1e5efef128..1e5efef128 100644 --- a/meta/recipes-extended/at/files/configure-add-enable-pam.patch +++ b/meta/recipes-extended/at/at/configure-add-enable-pam.patch | |||
diff --git a/meta/recipes-extended/at/files/file_replacement_with_gplv2.patch b/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch index d5ef0032be..d5ef0032be 100644 --- a/meta/recipes-extended/at/files/file_replacement_with_gplv2.patch +++ b/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch | |||
diff --git a/meta/recipes-extended/at/files/fix_parallel_build_error.patch b/meta/recipes-extended/at/at/fix_parallel_build_error.patch index 66ff3e1c11..66ff3e1c11 100644 --- a/meta/recipes-extended/at/files/fix_parallel_build_error.patch +++ b/meta/recipes-extended/at/at/fix_parallel_build_error.patch | |||
diff --git a/meta/recipes-extended/at/files/pam.conf.patch b/meta/recipes-extended/at/at/pam.conf.patch index dfe76d7487..b5ceb9ae82 100644 --- a/meta/recipes-extended/at/files/pam.conf.patch +++ b/meta/recipes-extended/at/at/pam.conf.patch | |||
@@ -3,19 +3,25 @@ oe doesn't support "@include", use the concrete directive instead. | |||
3 | Upstream-Status: Pending | 3 | Upstream-Status: Pending |
4 | 4 | ||
5 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 5 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
6 | --- at-3.1.12/pam.conf.orig 2009-11-23 23:11:52.000000000 +0800 | 6 | Index: at-3.1.15/pam.conf |
7 | +++ at-3.1.12/pam.conf 2011-07-15 11:14:04.132818950 +0800 | 7 | =================================================================== |
8 | @@ -2,8 +2,8 @@ | 8 | --- at-3.1.15.orig/pam.conf |
9 | +++ at-3.1.15/pam.conf | ||
10 | @@ -1,10 +1,11 @@ | ||
11 | # | ||
9 | # The PAM configuration file for the at daemon | 12 | # The PAM configuration file for the at daemon |
10 | # | 13 | # |
11 | 14 | + | |
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 | 15 | +auth required pam_env.so |
18 | +auth include common-auth | 16 | +auth include common-auth |
19 | +account include common-account | 17 | +account include common-account |
20 | +session include common-session-noninteractive | 18 | +session include common-session-noninteractive |
21 | +session required pam_limits.so | 19 | +session required pam_limits.so |
20 | +session required pam_loginuid.so | ||
21 | |||
22 | -auth required pam_env.so | ||
23 | -@include common-auth | ||
24 | -@include common-account | ||
25 | -session required pam_loginuid.so | ||
26 | -@include common-session-noninteractive | ||
27 | -session required pam_limits.so | ||
diff --git a/meta/recipes-extended/at/files/posixtm.c b/meta/recipes-extended/at/at/posixtm.c index 5514ba4fe2..5514ba4fe2 100644 --- a/meta/recipes-extended/at/files/posixtm.c +++ b/meta/recipes-extended/at/at/posixtm.c | |||
diff --git a/meta/recipes-extended/at/files/posixtm.h b/meta/recipes-extended/at/at/posixtm.h index e91749d736..e91749d736 100644 --- a/meta/recipes-extended/at/files/posixtm.h +++ b/meta/recipes-extended/at/at/posixtm.h | |||
diff --git a/meta/recipes-extended/at/at_3.1.14.bb b/meta/recipes-extended/at/at_3.1.15.bb index 68a24b8cd0..a465a76324 100644 --- a/meta/recipes-extended/at/at_3.1.14.bb +++ b/meta/recipes-extended/at/at_3.1.15.bb | |||
@@ -29,8 +29,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ | |||
29 | PAM_SRC_URI = "file://pam.conf.patch \ | 29 | PAM_SRC_URI = "file://pam.conf.patch \ |
30 | file://configure-add-enable-pam.patch" | 30 | file://configure-add-enable-pam.patch" |
31 | 31 | ||
32 | SRC_URI[md5sum] = "d41cfd79033b6e49a8838add59a42ac6" | 32 | SRC_URI[md5sum] = "f0f96db22e3a174b53ce4beeeb848839" |
33 | SRC_URI[sha256sum] = "cd092bf05d29c25b286f55a960ce8b8c3c5beb571d86ed8eb1dfb3b61291b3ae" | 33 | SRC_URI[sha256sum] = "03a84f5293d5a95ef4231b7faf5578f141f0c76a2b304dd655bc7e90e97bf7fc" |
34 | 34 | ||
35 | EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ | 35 | EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ |
36 | --with-daemon_username=root \ | 36 | --with-daemon_username=root \ |