6 files changed, 0 insertions, 286 deletions

diff --git a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch
deleted file mode 100644
index 7b840644d4..0000000000
--- a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From fcb53181b18c00083a8b08625db74829cfd6b4b2 Mon Sep 17 00:00:00 2001
-From: Trevor Gamblin <trevor.gamblin@windriver.com>
-Date: Tue, 29 Oct 2019 14:08:32 -0400
-Subject: [PATCH] libgcrypt: fix m4 file for oe-core
-
-Modify libgcrypt pkgconfig specifically for oe-core. Changes
-are based on a previous patch from RP, using wiggle to
-incorporate the parts that aren't in the upstream pkgconfig
-settings.
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
----
- src/libgcrypt.m4 | 90 +++---------------------------------------------
- 1 file changed, 4 insertions(+), 86 deletions(-)
-
-diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
-index 353df81..b195e22 100644
---- a/src/libgcrypt.m4
-+++ b/src/libgcrypt.m4
-@@ -116,41 +116,6 @@ dnl
- AC_DEFUN([AM_PATH_LIBGCRYPT],
- [ 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)]),
--     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
--  if test x"${LIBGCRYPT_CONFIG}" = x ; then
--     if test x"${libgcrypt_config_prefix}" != x ; then
--        LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
--     fi
--  fi
--
--  use_gpgrt_config=""
--  if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
--    if $GPGRT_CONFIG libgcrypt --exists; then
--      LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
--      AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config])
--      use_gpgrt_config=yes
--    fi
--  fi
--  if test -z "$use_gpgrt_config"; then
--    if test x"${LIBGCRYPT_CONFIG}" = x ; then
--      case "${SYSROOT}" in
--         /*)
--           if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
--             LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
--           fi
--           ;;
--         '')
--           ;;
--          *)
--           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
--           ;;
--      esac
--    fi
--    AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
--  fi
- 
-   tmp=ifelse([$1], ,1:1.2.0,$1)
-   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-@@ -161,56 +126,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
-      min_libgcrypt_version="$tmp"
-   fi
- 
--  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
--  ok=no
--  if test "$LIBGCRYPT_CONFIG" != "no" ; then
--    req_major=`echo $min_libgcrypt_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
--    req_minor=`echo $min_libgcrypt_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
--    req_micro=`echo $min_libgcrypt_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
--    if test -z "$use_gpgrt_config"; then
--      libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
--    else
--      libgcrypt_config_version=`$LIBGCRYPT_CONFIG --modversion`
--    fi
--    major=`echo $libgcrypt_config_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
--    minor=`echo $libgcrypt_config_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
--    micro=`echo $libgcrypt_config_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
--    if test "$major" -gt "$req_major"; then
--        ok=yes
--    else
--        if test "$major" -eq "$req_major"; then
--            if test "$minor" -gt "$req_minor"; then
--               ok=yes
--            else
--               if test "$minor" -eq "$req_minor"; then
--                   if test "$micro" -ge "$req_micro"; then
--                     ok=yes
--                   fi
--               fi
--            fi
--        fi
--    fi
--  fi
--  if test $ok = yes; then
--    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
--  else
--    AC_MSG_RESULT(no)
--  fi
-+  PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= $min_libgcrypt_version], [ok=yes], [ok=no])
-+
-   if test $ok = yes; then
-      # If we have a recent libgcrypt, we should also check that the
-      # API is compatible
-      if test "$req_libgcrypt_api" -gt 0 ; then
--        if test -z "$use_gpgrt_config"; then
--           tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
--       else
--           tmp=`$LIBGCRYPT_CONFIG --variable=api_version 2>/dev/null || echo 0`
--       fi
-+        tmp=`$PKG_CONFIG --variable=api_version libgcrypt`
-         if test "$tmp" -gt 0 ; then
-            AC_MSG_CHECKING([LIBGCRYPT API version])
-            if test "$req_libgcrypt_api" -eq "$tmp" ; then
-@@ -223,11 +145,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
-      fi
-   fi
-   if test $ok = yes; then
--    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
--    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
-     ifelse([$2], , :, [$2])
-     if test -z "$use_gpgrt_config"; then
--      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
-+      libgcrypt_config_host=`$PKG_CONFIG --variable=host libgcrypt`
-     else
-       libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none`
-     fi
-@@ -245,8 +165,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
-       fi
-     fi
-   else
--    LIBGCRYPT_CFLAGS=""
--    LIBGCRYPT_LIBS=""
-     ifelse([$3], , :, [$3])
-   fi
-   AC_SUBST(LIBGCRYPT_CFLAGS)
diff --git a/meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch b/meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch
deleted file mode 100644
index 8dc2fe328c..0000000000
--- a/meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 942e232ded48fa08d2bda417ae8ad8c03d644372 Mon Sep 17 00:00:00 2001
-From: Collin Funk <collin.funk1@gmail.com>
-Date: Wed, 27 Aug 2025 11:49:06 +0800
-Subject: [PATCH] tests: Fix link errors for t-thread-local.
-
-On platforms where pthread_create is not in libc t-thread-local fails to
-link.  Issue found on NetBSD 10.0.
-* tests/Makefile.am (t_thread_local_LDADD): Add $(standard_ldadd),
-$(GPG_ERROR_MT_LIBS), and @LDADD_FOR_TESTS_KLUDGE@.
-(t_thread_local_CFLAGS): Add $(GPG_ERROR_MT_CFLAGS).
-
---
-
-Upstream-Status: Backport [793eda7b258a562757b51c96044b103b638f1a63]
-GnuPG-bug-id: 7634
-Signed-off-by: Collin Funk <collin.funk1@gmail.com>
-Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- tests/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 4800135..f0f7adb 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -98,7 +98,7 @@ testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
- t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
- t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
- t_thread_local_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
--t_thread_local_CFLAGS = $(GPG_ERROR_MT_CFLAGS)
-+t_thread_local_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
- testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE)
- 
- # Build a version of the test driver for the build platform.
--- 
-2.34.1
-
diff --git a/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch b/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
deleted file mode 100644
index bbd48ebeee..0000000000
--- a/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a3496435dcc223a914eec5e61e853934fd4eb635 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 27 Aug 2025 11:46:17 +0800
-Subject: [PATCH] tests/Makefile.am: fix undefined reference to
- `pthread_create'
-
-Add missing '-lpthread' to CFLAGS
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- tests/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 93daf3c..4800135 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -96,7 +96,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
- t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
- testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
- t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
--t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS)
-+t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
- t_thread_local_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
- t_thread_local_CFLAGS = $(GPG_ERROR_MT_CFLAGS)
- testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE)
-@@ -117,7 +117,7 @@ else
- xtestsuite_libs = ../src/.libs/libgcrypt.so*
- xtestsuite_driver = testdrv
- t_kdf_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
--t_kdf_CFLAGS = $(GPG_ERROR_MT_CFLAGS)
-+t_kdf_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
- endif
- 
- # xcheck uses our new testdrv instead of the automake test runner.
--- 
-2.34.1
-
diff --git a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch
deleted file mode 100644
index 44aac1913e..0000000000
--- a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eb3a5bc4d5a212da64c0f9396c7f31f83aa6f36c Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Fri, 9 Sep 2022 11:13:37 +0100
-Subject: [PATCH] libgcrypt: disable bench-slope test case
-
-The bench-slope test appears to be aborting fairly frequently, which causes
-failures on the autobuilder.
-
-Until this has been root-caused, disable the test.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- tests/testdrv.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/testdrv.c b/tests/testdrv.c
-index 634b718..1e9dddb 100644
---- a/tests/testdrv.c
-+++ b/tests/testdrv.c
-@@ -76,7 +76,6 @@ static struct {
-    { "t-x448"      },
-    { "t-ed448"     },
-    { "benchmark"   },
--   { "bench-slope" },
-    { "hashtest-6g", "hashtest", "--hugeblock --gigs 6 SHA1 SHA256 SHA512 "
-                                                      "SHA3-512 SM3 BLAKE2S_256 "
-                                                      "BLAKE2B_512 CRC32 "
diff --git a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch
deleted file mode 100644
index 98874ce12a..0000000000
--- a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ede03b847038afc294e206ca345d12d75bbba844 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Fri, 26 Aug 2022 15:23:37 +0100
-Subject: [PATCH] libgcrypt: rewrite ptest
-
-Don't depend on a native libgpg-error to build the test driver, as it's
-an optional dependency for some C annotations.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- tests/testdrv.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/testdrv.c b/tests/testdrv.c
-index bfca4c2..634b718 100644
---- a/tests/testdrv.c
-+++ b/tests/testdrv.c
-@@ -32,7 +32,6 @@
- # include <fcntl.h>
- # include <sys/wait.h>
- #endif
--#include <gpg-error.h> /* For some macros.  */
- 
- #include "stopwatch.h"
- 
diff --git a/meta/recipes-support/libgcrypt/files/run-ptest b/meta/recipes-support/libgcrypt/files/run-ptest
deleted file mode 100644
index c349ae1944..0000000000
--- a/meta/recipes-support/libgcrypt/files/run-ptest
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Run the tests in regression mode so they are quicker
-export GCRYPT_IN_REGRESSION_TEST=1
-# The 'random' test invokes itself, so we need to be sure that the test
-# directory is on PATH.
-export PATH=$PATH:.
-
-./testdrv --verbose