From: Saul Wold <sgw@linux.intel.com>
Date: Fri, 29 Aug 2014 15:26:31 +0000 (-0700)
Subject: at: Upgrade to 3.1.15
X-Git-Tag: 2015-4~1702
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6558c8e1a7e5cd9f1f5271718c10355f67573b4c;p=openembedded-core.git

at: Upgrade to 3.1.15

Rebase pam.conf.patch
Move to generic files -> at for patches directory

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/at/files/S99at b/meta/recipes-extended/at/at/S99at
similarity index 100%
rename from meta/recipes-extended/at/files/S99at
rename to meta/recipes-extended/at/at/S99at
diff --git a/meta/recipes-extended/at/files/atd.service b/meta/recipes-extended/at/at/atd.service
similarity index 100%
rename from meta/recipes-extended/at/files/atd.service
rename to 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
similarity index 100%
rename from meta/recipes-extended/at/files/configure-add-enable-pam.patch
rename to 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
similarity index 100%
rename from meta/recipes-extended/at/files/file_replacement_with_gplv2.patch
rename to 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
similarity index 100%
rename from meta/recipes-extended/at/files/fix_parallel_build_error.patch
rename to 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
similarity index 68%
rename from meta/recipes-extended/at/files/pam.conf.patch
rename to 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.
 Upstream-Status: Pending
 
 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---- at-3.1.12/pam.conf.orig	2009-11-23 23:11:52.000000000 +0800
-+++ at-3.1.12/pam.conf	2011-07-15 11:14:04.132818950 +0800
-@@ -2,8 +2,8 @@
+Index: at-3.1.15/pam.conf
+===================================================================
+--- at-3.1.15.orig/pam.conf
++++ at-3.1.15/pam.conf
+@@ -1,10 +1,11 @@
+ #
  # The PAM configuration file for the at daemon
  #
-
--auth	required	pam_env.so
--@include common-auth
--@include common-account
--@include common-session-noninteractive
--session    required   pam_limits.so
++ 
 +auth    required    pam_env.so
 +auth    include     common-auth
 +account include     common-account
 +session include     common-session-noninteractive
 +session required    pam_limits.so
++session required    pam_loginuid.so
+ 
+-auth	required	pam_env.so
+-@include common-auth
+-@include common-account
+-session    required   pam_loginuid.so
+-@include common-session-noninteractive
+-session    required   pam_limits.so
diff --git a/meta/recipes-extended/at/files/posixtm.c b/meta/recipes-extended/at/at/posixtm.c
similarity index 100%
rename from meta/recipes-extended/at/files/posixtm.c
rename to 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
similarity index 100%
rename from meta/recipes-extended/at/files/posixtm.h
rename to 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
similarity index 94%
rename from meta/recipes-extended/at/at_3.1.14.bb
rename to 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 \
 PAM_SRC_URI = "file://pam.conf.patch \
                file://configure-add-enable-pam.patch"
 
-SRC_URI[md5sum] = "d41cfd79033b6e49a8838add59a42ac6"
-SRC_URI[sha256sum] = "cd092bf05d29c25b286f55a960ce8b8c3c5beb571d86ed8eb1dfb3b61291b3ae"
+SRC_URI[md5sum] = "f0f96db22e3a174b53ce4beeeb848839"
+SRC_URI[sha256sum] = "03a84f5293d5a95ef4231b7faf5578f141f0c76a2b304dd655bc7e90e97bf7fc"
 
 EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
                  --with-daemon_username=root \