* [PATCH 4/5] libassuan: Upgrade to 2.1.2
2014-08-29 15:26 [PATCH 0/5] Package Updates Saul Wold
` (2 preceding siblings ...)
2014-08-29 15:26 ` [PATCH 3/5] libxkbcommon: Upgrade to 0.4.3 Saul Wold
@ 2014-08-29 15:26 ` Saul Wold
2014-08-29 15:26 ` [PATCH 5/5] at: Upgrade to 3.1.15 Saul Wold
4 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2014-08-29 15:26 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../libassuan-add-pkgconfig-support.patch | 38 +++++++++++-----------
.../{libassuan_2.1.1.bb => libassuan_2.1.2.bb} | 4 +--
2 files changed, 21 insertions(+), 21 deletions(-)
rename meta/recipes-support/libassuan/{libassuan_2.1.1.bb => libassuan_2.1.2.bb} (86%)
diff --git a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
index 4f96881..f130d85 100644
--- a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
@@ -6,18 +6,18 @@ Upstream-Status: Rejected
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
-Index: libassuan-2.1.1/Makefile.am
+Index: libassuan-2.1.2/Makefile.am
===================================================================
---- libassuan-2.1.1.orig/Makefile.am 2014-05-13 20:57:37.794398357 +0000
-+++ libassuan-2.1.1/Makefile.am 2014-05-13 20:57:37.790398357 +0000
-@@ -24,10 +24,13 @@
+--- libassuan-2.1.2.orig/Makefile.am
++++ libassuan-2.1.2/Makefile.am
+@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gz
# (A suitable gitlog-to-changelog script can be found in GnuPG master.)
GITLOG_TO_CHANGELOG=gitlog-to-changelog
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libassuan.pc
+
- EXTRA_DIST = config.rpath autogen.sh README.GIT \
+ EXTRA_DIST = autogen.sh autogen.rc README.GIT \
ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \
tests/ChangeLog-2011 contrib/ChangeLog-2011 \
- build-aux/git-log-footer build-aux/git-log-fix
@@ -25,10 +25,10 @@ Index: libassuan-2.1.1/Makefile.am
SUBDIRS = m4 src doc tests
-Index: libassuan-2.1.1/libassuan.pc.in
+Index: libassuan-2.1.2/libassuan.pc.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libassuan-2.1.1/libassuan.pc.in 2014-05-13 20:57:37.790398357 +0000
+--- /dev/null
++++ libassuan-2.1.2/libassuan.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -44,11 +44,11 @@ Index: libassuan-2.1.1/libassuan.pc.in
+Libs: -L${libdir} -lassuan
+Libs.private: -lgpg-error
+Cflags: -I${includedir}
-Index: libassuan-2.1.1/configure.ac
+Index: libassuan-2.1.2/configure.ac
===================================================================
---- libassuan-2.1.1.orig/configure.ac 2014-05-13 20:57:37.794398357 +0000
-+++ libassuan-2.1.1/configure.ac 2014-05-13 20:57:37.790398357 +0000
-@@ -434,7 +434,7 @@
+--- libassuan-2.1.2.orig/configure.ac
++++ libassuan-2.1.2/configure.ac
+@@ -439,7 +439,7 @@ AC_CONFIG_FILES([doc/Makefile])
AC_CONFIG_FILES([tests/Makefile])
AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
AC_CONFIG_FILES([src/versioninfo.rc])
@@ -57,11 +57,11 @@ Index: libassuan-2.1.1/configure.ac
AC_OUTPUT
echo "
-Index: libassuan-2.1.1/src/libassuan.m4
+Index: libassuan-2.1.2/src/libassuan.m4
===================================================================
---- libassuan-2.1.1.orig/src/libassuan.m4 2011-04-06 15:37:26.000000000 +0000
-+++ libassuan-2.1.1/src/libassuan.m4 2014-05-13 21:06:53.402395537 +0000
-@@ -15,18 +15,6 @@
+--- libassuan-2.1.2.orig/src/libassuan.m4
++++ libassuan-2.1.2/src/libassuan.m4
+@@ -15,18 +15,6 @@ dnl Returns ok set to yes or no.
dnl
AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
[ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -80,7 +80,7 @@ Index: libassuan-2.1.1/src/libassuan.m4
tmp=ifelse([$1], ,1:0.9.2,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-@@ -37,51 +25,12 @@
+@@ -37,51 +25,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
min_libassuan_version="$tmp"
fi
@@ -134,7 +134,7 @@ Index: libassuan-2.1.1/src/libassuan.m4
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([LIBASSUAN API version])
if test "$req_libassuan_api" -eq "$tmp" ; then
-@@ -96,7 +45,7 @@
+@@ -96,7 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
if test $ok = yes; then
if test x"$host" != x ; then
@@ -143,7 +143,7 @@ Index: libassuan-2.1.1/src/libassuan.m4
if test x"$libassuan_config_host" != xnone ; then
if test x"$libassuan_config_host" != x"$host" ; then
AC_MSG_WARN([[
-@@ -137,12 +86,8 @@
+@@ -137,12 +86,8 @@ dnl
AC_DEFUN([AM_PATH_LIBASSUAN],
[ _AM_PATH_LIBASSUAN_COMMON($1)
if test $ok = yes; then
diff --git a/meta/recipes-support/libassuan/libassuan_2.1.1.bb b/meta/recipes-support/libassuan/libassuan_2.1.2.bb
similarity index 86%
rename from meta/recipes-support/libassuan/libassuan_2.1.1.bb
rename to meta/recipes-support/libassuan/libassuan_2.1.2.bb
index d660233..6d89107 100644
--- a/meta/recipes-support/libassuan/libassuan_2.1.1.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.1.2.bb
@@ -13,8 +13,8 @@ DEPENDS = "libgpg-error"
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \
file://libassuan-add-pkgconfig-support.patch"
-SRC_URI[md5sum] = "757243cc4a71b30ed8d8dbe784035d36"
-SRC_URI[sha256sum] = "23e2d67779b88e90d29fe1df6b157109f1c2a647d0f1b2a0f4295bb3c0b2039d"
+SRC_URI[md5sum] = "1dc4c3e1dbfb3939bfa2d72db8e136ba"
+SRC_URI[sha256sum] = "39f8a7c9349aaaf7ccd937b90660153ec4d2d4df2465018754e5bcae5b1db77b"
BINCONFIG = "${bindir}/libassuan-config"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/5] at: Upgrade to 3.1.15
2014-08-29 15:26 [PATCH 0/5] Package Updates Saul Wold
` (3 preceding siblings ...)
2014-08-29 15:26 ` [PATCH 4/5] libassuan: Upgrade to 2.1.2 Saul Wold
@ 2014-08-29 15:26 ` Saul Wold
4 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2014-08-29 15:26 UTC (permalink / raw)
To: openembedded-core
Rebase pam.conf.patch
Move to generic files -> at for patches directory
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/at/{files => at}/S99at | 0
meta/recipes-extended/at/{files => at}/atd.service | 0
.../{files => at}/configure-add-enable-pam.patch | 0
.../file_replacement_with_gplv2.patch | 0
.../{files => at}/fix_parallel_build_error.patch | 0
.../at/{files => at}/pam.conf.patch | 24 ++++++++++++++--------
meta/recipes-extended/at/{files => at}/posixtm.c | 0
meta/recipes-extended/at/{files => at}/posixtm.h | 0
.../at/{at_3.1.14.bb => at_3.1.15.bb} | 4 ++--
9 files changed, 17 insertions(+), 11 deletions(-)
rename meta/recipes-extended/at/{files => at}/S99at (100%)
rename meta/recipes-extended/at/{files => at}/atd.service (100%)
rename meta/recipes-extended/at/{files => at}/configure-add-enable-pam.patch (100%)
rename meta/recipes-extended/at/{files => at}/file_replacement_with_gplv2.patch (100%)
rename meta/recipes-extended/at/{files => at}/fix_parallel_build_error.patch (100%)
rename meta/recipes-extended/at/{files => at}/pam.conf.patch (68%)
rename meta/recipes-extended/at/{files => at}/posixtm.c (100%)
rename meta/recipes-extended/at/{files => at}/posixtm.h (100%)
rename meta/recipes-extended/at/{at_3.1.14.bb => at_3.1.15.bb} (94%)
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 dfe76d7..b5ceb9a 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 68a24b8..a465a76 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 \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 7+ messages in thread