[meta-oe][PATCH v3 1/2] libgcrypt: update from version 1.8.0 to 1.8.1

[meta-oe][PATCH v3 1/2] libgcrypt: update from version 1.8.0 to 1.8.1

[Jussi Laako]

Update libgcrypt version from 1.8.0 to 1.8.1.

Signed-off-by: Jussi Laako <jussi.laako@linux.intel.com>
---
 .../libgcrypt/{libgcrypt_1.8.0.bb => libgcrypt_1.8.1.bb}            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/libgcrypt/{libgcrypt_1.8.0.bb => libgcrypt_1.8.1.bb} (89%)

diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb
similarity index 89%
rename from meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
rename to meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb
index 1797d9584d..5bd815ae55 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb
@@ -15,14 +15,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 DEPENDS = "libgpg-error"
 
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
-SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \
+SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
            file://0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch \
            file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \
            file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
            file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
 "
-SRC_URI[md5sum] = "110ce4352f9ea6f560bdc6c5644ae93c"
-SRC_URI[sha256sum] = "f6e470b7f2d3a703e8747f05a8c19d9e10e26ebf2d5f3d71ff75a40f504e12ee"
+SRC_URI[md5sum] = "b21817f9d850064d2177285f1073ec55"
+SRC_URI[sha256sum] = "7a2875f8b1ae0301732e878c0cca2c9664ff09ef71408f085c50e332656a78b3"
 
 BINCONFIG = "${bindir}/libgcrypt-config"
 
-- 
2.11.0

[meta-oe][PATCH v3 2/2] libgcrypt: provide libgcrypt-config wrapper around pkg-config

[Jussi Laako]

This patch adds a libgcrypt-config wrapper for pkg-config support in
order to avoid patching all upstream packages using libgcrypt, while
otherwise keeping pkg-config functionality.

Signed-off-by: Jussi Laako <jussi.laako@linux.intel.com>
---
 .../libgcrypt/files/libgcrypt-config-wrapper.patch | 113 +++++++++++++++++++++
 meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb  |   5 +-
 2 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-support/libgcrypt/files/libgcrypt-config-wrapper.patch

diff --git a/meta/recipes-support/libgcrypt/files/libgcrypt-config-wrapper.patch b/meta/recipes-support/libgcrypt/files/libgcrypt-config-wrapper.patch
new file mode 100644
index 0000000000..167706535b
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/libgcrypt-config-wrapper.patch
@@ -0,0 +1,113 @@
+diff -ur libgcrypt-1.8.1.orig/src/libgcrypt-config.in libgcrypt-1.8.1.new/src/libgcrypt-config.in
+--- libgcrypt-1.8.1.orig/src/libgcrypt-config.in	2013-03-15 21:25:38.000000000 +0200
++++ libgcrypt-1.8.1.new/src/libgcrypt-config.in	2017-09-15 13:56:20.368277151 +0300
+@@ -11,30 +11,6 @@
+ #
+ # File: @configure_input@
+ 
+-# General.
+-prefix="@prefix@"
+-exec_prefix="@exec_prefix@"
+-version="@VERSION@"
+-includedir="@includedir@"
+-libdir="@libdir@"
+-gpg_error_libs="@GPG_ERROR_LIBS@"
+-gpg_error_cflags="@GPG_ERROR_CFLAGS@"
+-
+-# libgcrypt values.
+-libs="@LIBGCRYPT_CONFIG_LIBS@"
+-cflags="@LIBGCRYPT_CONFIG_CFLAGS@"
+-
+-# API info
+-api_version="@LIBGCRYPT_CONFIG_API_VERSION@"
+-
+-# Configured for host
+-my_host="@LIBGCRYPT_CONFIG_HOST@"
+-
+-# Misc information.
+-symmetric_ciphers="@LIBGCRYPT_CIPHERS@"
+-asymmetric_ciphers="@LIBGCRYPT_PUBKEY_CIPHERS@"
+-digests="@LIBGCRYPT_DIGESTS@"
+-
+ # State variables.
+ echo_libs=no
+ echo_cflags=no
+@@ -122,68 +98,35 @@
+ done
+ 
+ if test "$echo_prefix" = "yes"; then
+-    echo "$prefix"
++    pkg-config --variable=prefix libgcrypt
+ fi
+ 
+ if test "$echo_exec_prefix" = "yes"; then
+-    echo "$exec_prefix"
++    pkg-config --variable=exec_prefix libgcrypt
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-    includes=""
+-    cflags_final="$cflags"
+-
+-    # Set up `includes'.
+-    if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
+-	includes="-I$includedir"
+-    fi
+-    # Set up `cflags_final'.
+-    cflags_final="$cflags_final $gpg_error_cflags"
+-
+-    tmp=""
+-    for i in $includes $cflags_final; do
+-       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
+-           tmp="$tmp $i"
+-       fi
+-    done
+-    echo $tmp
++    pkg-config --cflags libgcrypt
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-    libdirs=""
+-    libs_final="$libs"
+-
+-    # Set up `libdirs'.
+-    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+-	libdirs="-L$libdir"
+-    fi
+-
+-    # Set up `libs_final'.
+-    libs_final="$libs_final $gpg_error_libs"
+-
+-    tmp=""
+-    for i in $libdirs $libs_final; do
+-       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
+-           tmp="$tmp $i"
+-       fi
+-    done
+-    echo $tmp
++    pkg-config --libs libgcrypt
+ fi
+ 
+ if test "$echo_version" = "yes"; then
+-    echo "$version"
++    pkg-config --modversion libgcrypt
+ fi
+ 
+ if test "$echo_api_version" = "yes"; then
+-    echo "$api_version"
++    pkg-config --variable=api_version libgcrypt
+ fi
+ 
+ if test "$echo_host" = "yes"; then
+-    echo "$my_host"
++    pkg-config --variable=host libgcrypt
+ fi
+ 
+ if test "$echo_algorithms" = "yes"; then
+-    echo "Symmetric cipher algorithms: $symmetric_ciphers"
+-    echo "Public-key cipher algorithms: $asymmetric_ciphers"
+-    echo "Message digest algorithms: $digests"
++    pkg-config --variable=symmetric_ciphers libgcrypt
++    pkg-config --variable=asymmetric_ciphers libgcrypt
++    pkg-config --variable=digests libgcrypt
+ fi
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb
index 5bd815ae55..0bfa418b22 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb
@@ -20,13 +20,12 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
            file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \
            file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
            file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
+           file://libgcrypt-config-wrapper.patch \
 "
 SRC_URI[md5sum] = "b21817f9d850064d2177285f1073ec55"
 SRC_URI[sha256sum] = "7a2875f8b1ae0301732e878c0cca2c9664ff09ef71408f085c50e332656a78b3"
 
-BINCONFIG = "${bindir}/libgcrypt-config"
-
-inherit autotools texinfo binconfig-disabled pkgconfig
+inherit autotools texinfo pkgconfig binconfig
 
 EXTRA_OECONF = "--disable-asm"
 EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'"
-- 
2.11.0

✗ patchtest: failure for "[meta-oe,v3] libgcrypt: update..." and 1 more

[Patchwork]

== Series Details ==

Series: "[meta-oe,v3] libgcrypt: update..." and 1 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/8931/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Added patch file is missing Upstream-Status in the header [test_upstream_status_presence] 
  Suggested fix    Add Upstream-Status: <status> to the header of meta/recipes-support/libgcrypt/files/libgcrypt-config-wrapper.patch (possible values: Pending, Submitted, Accepted, Backport, Denied, Inappropriate)

* Issue             A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] 
  Suggested fix    Sign off the added patch file (meta/recipes-support/libgcrypt/files/libgcrypt-config-wrapper.patch)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [meta-oe][PATCH v3 2/2] libgcrypt: provide libgcrypt-config wrapper around pkg-config

[Alexander Kanavin]

On 09/15/2017 03:03 PM, Jussi Laako wrote:
> This patch adds a libgcrypt-config wrapper for pkg-config support in
> order to avoid patching all upstream packages using libgcrypt, while
> otherwise keeping pkg-config functionality.
> 
> Signed-off-by: Jussi Laako <jussi.laako@linux.intel.com>
> ---
>   .../libgcrypt/files/libgcrypt-config-wrapper.patch | 113 +++++++++++++++++++++
>   meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb  |   5 +-
>   2 files changed, 115 insertions(+), 3 deletions(-)
>   create mode 100644 meta/recipes-support/libgcrypt/files/libgcrypt-config-wrapper.patch
> 
> diff --git a/meta/recipes-support/libgcrypt/files/libgcrypt-config-wrapper.patch b/meta/recipes-support/libgcrypt/files/libgcrypt-config-wrapper.patch
> new file mode 100644
> index 0000000000..167706535b
> --- /dev/null
> +++ b/meta/recipes-support/libgcrypt/files/libgcrypt-config-wrapper.patch
> @@ -0,0 +1,113 @@
> +diff -ur libgcrypt-1.8.1.orig/src/libgcrypt-config.in libgcrypt-1.8.1.new/src/libgcrypt-config.in
> +--- libgcrypt-1.8.1.orig/src/libgcrypt-config.in	2013-03-15 21:25:38.000000000 +0200
> ++++ libgcrypt-1.8.1.new/src/libgcrypt-config.in	2017-09-15 13:56:20.368277151 +0300

Please don't add bare patches with no information. In addition to mssing 
signed-off-by and upstream-status (you should have gotten an automated 
check failure for those), you should also add a 'commit message' for the 
patch, so that anyone looking at it can quickly see what it's for 
without digging through commit history. You can simply copy-paste the 
message to the oe-core commit then.

It's most convenient to add recipe patches using 'devtool 
modify/update-recipe' - that will automate away the boring bits.

Alex