From 61a3561b955394581da052acd3b314fb4d197edd Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 4 Mar 2025 17:08:52 +0800 Subject: libassuan: upgrade 3.0.1 -> 3.0.2 libassuan-add-pkgconfig-support.patch refreshed for 3.0.2 (From OE-Core rev: b91289cf3f6c0bc4e718462a8fd44a50f0687313) Signed-off-by: Wang Mingyu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../libassuan-add-pkgconfig-support.patch | 19 +++++------ meta/recipes-support/libassuan/libassuan_3.0.1.bb | 38 ---------------------- meta/recipes-support/libassuan/libassuan_3.0.2.bb | 38 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-support/libassuan/libassuan_3.0.1.bb create mode 100644 meta/recipes-support/libassuan/libassuan_3.0.2.bb 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 d67087f4ac..20361e8a99 100644 --- a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch +++ b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch @@ -15,11 +15,11 @@ easier use. Signed-off-by: Trevor Gamblin --- - src/libassuan.m4 | 82 ++---------------------------------------------- - 1 file changed, 3 insertions(+), 79 deletions(-) + src/libassuan.m4 | 81 ++---------------------------------------------- + 1 file changed, 3 insertions(+), 78 deletions(-) diff --git a/src/libassuan.m4 b/src/libassuan.m4 -index 2e98b39..404796f 100644 +index 4d7da17..f4692ab 100644 --- a/src/libassuan.m4 +++ b/src/libassuan.m4 @@ -103,27 +103,6 @@ dnl @@ -50,11 +50,10 @@ index 2e98b39..404796f 100644 tmp=ifelse([$1], ,1:0.9.2,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -@@ -133,60 +112,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], - req_libassuan_api=0 +@@ -134,59 +113,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], min_libassuan_version="$tmp" fi -- + - AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) - ok=no - if test "$LIBASSUAN_CONFIG" != "no"; then @@ -96,7 +95,7 @@ index 2e98b39..404796f 100644 - - if test $ok = yes; then - AC_MSG_RESULT([yes ($libassuan_config_version)]) -- AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan) +- AC_DEFINE_UNQUOTED(LIBASSUAN_API_REQUESTED, $req_libassuan_api, [Requested API version for libassuan]) - else - AC_MSG_RESULT(no) - fi @@ -113,7 +112,7 @@ index 2e98b39..404796f 100644 if test "$tmp" -gt 0 ; then AC_MSG_CHECKING([LIBASSUAN API version]) if test "$req_libassuan_api" -eq "$tmp" ; then -@@ -204,9 +134,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], +@@ -204,9 +135,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], if test $ok = yes; then if test x"$host" != x ; then if test -z "$use_gpgrt_config"; then @@ -124,7 +123,7 @@ index 2e98b39..404796f 100644 fi if test x"$libassuan_config_host" != xnone ; then if test x"$libassuan_config_host" != x"$host" ; then -@@ -248,12 +176,8 @@ dnl +@@ -248,12 +177,8 @@ dnl AC_DEFUN([AM_PATH_LIBASSUAN], [ _AM_PATH_LIBASSUAN_COMMON($1) if test $ok = yes; then @@ -138,5 +137,5 @@ index 2e98b39..404796f 100644 fi AC_SUBST(LIBASSUAN_CFLAGS) -- -2.39.2 +2.43.0 diff --git a/meta/recipes-support/libassuan/libassuan_3.0.1.bb b/meta/recipes-support/libassuan/libassuan_3.0.1.bb deleted file mode 100644 index 0518ed75aa..0000000000 --- a/meta/recipes-support/libassuan/libassuan_3.0.1.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "IPC library used by GnuPG and GPGME" -DESCRIPTION = "A small library implementing the so-called Assuan protocol. \ -This protocol is used for IPC between most newer GnuPG components. \ -Both, server and client side functions are provided. " -HOMEPAGE = "http://www.gnupg.org/related_software/libassuan/" -BUGTRACKER = "https://bugs.g10code.com/gnupg/index" - -LICENSE = "GPL-3.0-or-later & LGPL-2.1-or-later" -LICENSE:${PN} = "LGPL-2.1-or-later" -LICENSE:${PN}-doc = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/assuan.c;endline=20;md5=ab92143a5a2adabd06d7994d1467ea5c\ - file://src/assuan-defs.h;endline=20;md5=15d950c83e82978e35b35e790d7e4d39" - -DEPENDS = "libgpg-error" - -UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" -SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \ - file://libassuan-add-pkgconfig-support.patch \ - " - -SRC_URI[sha256sum] = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1" - -BINCONFIG = "${bindir}/libassuan-config" - -inherit autotools texinfo binconfig-disabled pkgconfig multilib_header - -do_configure:prepend () { - # Else these could be used in preference to those in aclocal-copy - rm -f ${S}/m4/*.m4 -} - -do_install:append () { - oe_multilib_header assuan.h -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libassuan/libassuan_3.0.2.bb b/meta/recipes-support/libassuan/libassuan_3.0.2.bb new file mode 100644 index 0000000000..f0b7746284 --- /dev/null +++ b/meta/recipes-support/libassuan/libassuan_3.0.2.bb @@ -0,0 +1,38 @@ +SUMMARY = "IPC library used by GnuPG and GPGME" +DESCRIPTION = "A small library implementing the so-called Assuan protocol. \ +This protocol is used for IPC between most newer GnuPG components. \ +Both, server and client side functions are provided. " +HOMEPAGE = "http://www.gnupg.org/related_software/libassuan/" +BUGTRACKER = "https://bugs.g10code.com/gnupg/index" + +LICENSE = "GPL-3.0-or-later & LGPL-2.1-or-later" +LICENSE:${PN} = "LGPL-2.1-or-later" +LICENSE:${PN}-doc = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://src/assuan.c;endline=20;md5=ab92143a5a2adabd06d7994d1467ea5c\ + file://src/assuan-defs.h;endline=20;md5=15d950c83e82978e35b35e790d7e4d39" + +DEPENDS = "libgpg-error" + +UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" +SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \ + file://libassuan-add-pkgconfig-support.patch \ + " + +SRC_URI[sha256sum] = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6" + +BINCONFIG = "${bindir}/libassuan-config" + +inherit autotools texinfo binconfig-disabled pkgconfig multilib_header + +do_configure:prepend () { + # Else these could be used in preference to those in aclocal-copy + rm -f ${S}/m4/*.m4 +} + +do_install:append () { + oe_multilib_header assuan.h +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf