Skip to contentSkip to conversation

libgcrypt: upgrade 1.10.3 -> 1.11.0

PATCH New simit.ghane 1 participant 1 message Jul 24, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libgcrypt: upgrade 1.10.3 -> 1.11.0

Changelog:
==========
https://lists.gnu.org/archive/html/info-gnu/2024-06/msg00004.html

License-Update:
-Add 3-clause BSD license for poly1305-amd64-avx512.S. -cipher/Makefile.am: Add 'poly1305-amd64-avx512.S'. -cipher/poly1305-amd64-avx512.S: New. -cipher/poly1305-internal.h (POLY1305_USE_AVX512): New. -Add 'cipher/keccak-amd64-avx512.S'.
-Update license docs for FSF new address and update gcrypt.texi.

Apart from upgrade also refreshed the patches like 0001-libgcrypt-fix-m4-file-for-oe-core.patch 0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch no-bench-slope.patch

In 0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch reverted back the change in cipher/Makefile.am related to o_flag_munging

---
 ...01-libgcrypt-fix-m4-file-for-oe-core.patch | 17 ++++---
 ...ilding-error-with-O2-in-sysroot-path.patch | 51 ++++++-------------
 .../libgcrypt/files/no-bench-slope.patch      | 12 +++--
 ...ibgcrypt_1.10.3.bb => libgcrypt_1.11.0.bb} | 12 ++---
 4 files changed, 39 insertions(+), 53 deletions(-)
 rename meta/recipes-support/libgcrypt/{libgcrypt_1.10.3.bb => libgcrypt_1.11.0.bb} (80%)
meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch +10 -7
index cbfa30f0ad..9615611f6e 100644
@@ -17,13 +17,13 @@ Signed-off-by: Trevor Gamblin <[email protected]>
  1 file changed, 4 insertions(+), 86 deletions(-)
 
 diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
-index cd4249e..e53a36f 100644
+index 353df81b6d..b195e22894 100644
 --- a/src/libgcrypt.m4
 +++ b/src/libgcrypt.m4
-@@ -29,41 +29,6 @@ dnl is added to the gpg_config_script_warn variable.
- dnl
+@@ -116,41 +116,6 @@ dnl
  AC_DEFUN([AM_PATH_LIBGCRYPT],
- [ AC_REQUIRE([AC_CANONICAL_HOST])
+ [ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+   AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
 -  AC_ARG_WITH(libgcrypt-prefix,
 -            AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
 -                           [prefix where LIBGCRYPT is installed (optional)]),
@@ -62,7 +62,7 @@ index cd4249e..e53a36f 100644
  
    tmp=ifelse([$1], ,1:1.2.0,$1)
    if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-@@ -74,56 +39,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
+@@ -161,56 +126,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
       min_libgcrypt_version="$tmp"
    fi
  
@@ -122,7 +122,7 @@ index cd4249e..e53a36f 100644
          if test "$tmp" -gt 0 ; then
             AC_MSG_CHECKING([LIBGCRYPT API version])
             if test "$req_libgcrypt_api" -eq "$tmp" ; then
-@@ -136,11 +58,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
+@@ -223,11 +145,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
       fi
    fi
    if test $ok = yes; then
@@ -135,7 +135,7 @@ index cd4249e..e53a36f 100644
      else
        libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none`
      fi
-@@ -158,8 +78,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
+@@ -245,8 +165,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
        fi
      fi
    else
@@ -144,3 +144,6 @@ index cd4249e..e53a36f 100644
      ifelse([$3], , :, [$3])
    fi
    AC_SUBST(LIBGCRYPT_CFLAGS)
+-- 
+2.34.1
+
meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch +15 -36

82 lines not on this page · raw message

meta/recipes-support/libgcrypt/files/no-bench-slope.patch +8 -4
index 8de3c6713b..ed65ed4e67 100644
@@ -5,9 +5,12 @@ Until this has been root-caused, disable the test.
 
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <[email protected]>
+---
+ tests/testdrv.c | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/tests/testdrv.c b/tests/testdrv.c
-index 0ccde326..d3455186 100644
+index bfca4c2314..5a755f512e 100644
 --- a/tests/testdrv.c
 +++ b/tests/testdrv.c
 @@ -77,7 +77,6 @@ static struct {
@@ -15,6 +18,7 @@ index 0ccde326..d3455186 100644
     { "t-ed448"     },
     { "benchmark"   },
 -   { "bench-slope" },
-    { "hashtest-256g",  "hashtest", "--gigs 256 SHA1 SHA256 SHA512 SM3",
-      LONG_RUNNING },
-    { NULL }
+    { "hashtest-6g", "hashtest", "--hugeblock --gigs 6 SHA1 SHA256 SHA512 "
+                                                      "SHA3-512 SM3 BLAKE2S_256 "
+                                                      "BLAKE2B_512 CRC32 "
+
meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb renamed from meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb +6 -6
similarity index 80%
rename from meta/recipes-support/libgcrypt/libgcrypt_1.10.3.bb
rename to meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb
index 5a76201ab5..c9d13fed0a 100644
@@ -7,13 +7,13 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
 SECTION = "libs"
 
 # helper program gcryptrnd and getrandom are under GPL, rest LGPL
-LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
-LICENSE:${PN} = "LGPL-2.1-or-later"
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & BSD-3-Clause"
+LICENSE:${PN} = "LGPL-2.1-or-later & BSD-3-Clause"
 LICENSE:${PN}-dev = "GPL-2.0-or-later & LGPL-2.1-or-later"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
-                    file://LICENSES;md5=ef545b6cc717747072616519a1256d69 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+                    file://LICENSES;md5=034b4e369944ad4b52a68368f1cf98b8 \
                     "
 
 DEPENDS = "libgpg-error"
@@ -27,7 +27,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
            file://no-bench-slope.patch \
            file://run-ptest \
            "
-SRC_URI[sha256sum] = "8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa"
+SRC_URI[sha256sum] = "09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c"
 
 BINCONFIG = "${bindir}/libgcrypt-config"