diff mbox series

[07/31] libassuan: upgrade 3.0.1 -> 3.0.2

Message ID 1741079356-13445-7-git-send-email-wangmy@fujitsu.com
State Accepted, archived
Commit b91289cf3f6c0bc4e718462a8fd44a50f0687313
Headers show
Series [01/31] bind: upgrade 9.20.5 -> 9.20.6 | expand

Commit Message

Mingyu Wang (Fujitsu) March 4, 2025, 9:08 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

libassuan-add-pkgconfig-support.patch
refreshed for 3.0.2

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../libassuan-add-pkgconfig-support.patch     | 19 +++++++++----------
 ...{libassuan_3.0.1.bb => libassuan_3.0.2.bb} |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)
 rename meta/recipes-support/libassuan/{libassuan_3.0.1.bb => libassuan_3.0.2.bb} (93%)
diff mbox series

Patch

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 <tgamblin@baylibre.com>
 ---
- 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.2.bb
similarity index 93%
rename from meta/recipes-support/libassuan/libassuan_3.0.1.bb
rename to meta/recipes-support/libassuan/libassuan_3.0.2.bb
index 0518ed75aa..f0b7746284 100644
--- a/meta/recipes-support/libassuan/libassuan_3.0.1.bb
+++ b/meta/recipes-support/libassuan/libassuan_3.0.2.bb
@@ -20,7 +20,7 @@  SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \
            file://libassuan-add-pkgconfig-support.patch \
           "
 
-SRC_URI[sha256sum] = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1"
+SRC_URI[sha256sum] = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6"
 
 BINCONFIG = "${bindir}/libassuan-config"