From 8bc2ba730c6df9282076f2ed551e276cdf800732 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 23 Aug 2023 10:09:32 +0000
Subject: [PATCH] libgcrypt, bump version (#9268)

---
 ...t-1.8.9.recipe => libgcrypt-1.10.2.recipe} |  4 +-
 ...8.9.patchset => libgcrypt-1.10.2.patchset} | 47 ++++++++++++++-----
 2 files changed, 37 insertions(+), 14 deletions(-)
 rename dev-libs/libgcrypt/{libgcrypt-1.8.9.recipe => libgcrypt-1.10.2.recipe} (95%)
 rename dev-libs/libgcrypt/patches/{libgcrypt-1.8.9.patchset => libgcrypt-1.10.2.patchset} (61%)

diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.9.recipe b/dev-libs/libgcrypt/libgcrypt-1.10.2.recipe
similarity index 95%
rename from dev-libs/libgcrypt/libgcrypt-1.8.9.recipe
rename to dev-libs/libgcrypt/libgcrypt-1.10.2.recipe
index 1f9d68f8f..8760c2d5b 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.9.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.2.recipe
@@ -6,13 +6,13 @@ COPYRIGHT="2000-2018 Free Software Foundation, Inc."
 LICENSE="GNU LGPL v3"
 REVISION="1"
 SOURCE_URI="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
-CHECKSUM_SHA256="2bda4790aa5f0895d3407cf7bf6bd7727fd992f25a45a63d92fef10767fa3769"
+CHECKSUM_SHA256="3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03"
 PATCHES="libgcrypt-$portVersion.patchset"
 
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-libVersion="20.2.10"
+libVersion="20.4.2"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
diff --git a/dev-libs/libgcrypt/patches/libgcrypt-1.8.9.patchset b/dev-libs/libgcrypt/patches/libgcrypt-1.10.2.patchset
similarity index 61%
rename from dev-libs/libgcrypt/patches/libgcrypt-1.8.9.patchset
rename to dev-libs/libgcrypt/patches/libgcrypt-1.10.2.patchset
index 241ee51c1..f9163b698 100644
--- a/dev-libs/libgcrypt/patches/libgcrypt-1.8.9.patchset
+++ b/dev-libs/libgcrypt/patches/libgcrypt-1.10.2.patchset
@@ -1,14 +1,14 @@
-From 8f17f183b538b6c5bd20cc69e4dcd34913cd5c3e Mon Sep 17 00:00:00 2001
+From c1662796cede9d153caa7d6c613220cd6e261c4e Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 5 Aug 2014 16:50:29 +0000
 Subject: haiku patch
 
 
 diff --git a/configure.ac b/configure.ac
-index ce11162..7fc05ad 100644
+index 24ec2eb..374057a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -761,6 +761,7 @@ fi
+@@ -839,6 +839,7 @@ fi
  AC_SEARCH_LIBS(setsockopt, [socket], ,
  	[AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
  AC_SEARCH_LIBS(setsockopt, [nsl])
@@ -17,20 +17,20 @@ index ce11162..7fc05ad 100644
  ##################################
  #### Checks for header files. ####
 -- 
-2.19.1
+2.37.3
 
 
-From 2eb88a459c5386a816e74231bc04b4f8a5b42b1e Mon Sep 17 00:00:00 2001
+From 9849f6ca4ddf10217fc4abda046183f988b01b56 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 6 Aug 2014 22:08:04 +0000
 Subject: gcc2 patch
 
 
 diff --git a/src/hwf-x86.c b/src/hwf-x86.c
-index 0d3a1f4..32bdfa9 100644
+index a1aa02e..ae73360 100644
 --- a/src/hwf-x86.c
 +++ b/src/hwf-x86.c
-@@ -103,7 +103,7 @@ get_xgetbv(void)
+@@ -108,7 +108,7 @@ get_xgetbv(void)
    unsigned int t_eax, t_edx;
  
    asm volatile
@@ -40,20 +40,20 @@ index 0d3a1f4..32bdfa9 100644
       : "c" (0)
      );
 -- 
-2.19.1
+2.37.3
 
 
-From 9f39e7bd9b26b9938e9cdebf53e3f39b21183097 Mon Sep 17 00:00:00 2001
+From 17e974883a71cd2b2fba11cc0a3cd4804e68971a Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Wed, 17 Jan 2018 22:03:45 +0000
 Subject: Do not use __GNUC_PATCHLEVEL__ if it's not defined.
 
 
 diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
-index 75c49a0..794e72d 100644
+index 58581da..d744765 100644
 --- a/src/gcrypt.h.in
 +++ b/src/gcrypt.h.in
-@@ -82,9 +82,14 @@ extern "C" {
+@@ -74,9 +74,14 @@ extern "C" {
     underscore they are subject to change without notice. */
  #ifdef __GNUC__
  
@@ -69,5 +69,28 @@ index 75c49a0..794e72d 100644
  #if _GCRY_GCC_VERSION >= 30100
  #define _GCRY_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
 -- 
-2.19.1
+2.37.3
+
+
+From a328f62b7740fe91ef3de567564816a7a8863f1b Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Wed, 23 Aug 2023 11:57:20 +0200
+Subject: Fixes: field `area' has incomplete type with gcc2
+
+
+diff --git a/cipher/pubkey.c b/cipher/pubkey.c
+index 2341c86..2885c82 100644
+--- a/cipher/pubkey.c
++++ b/cipher/pubkey.c
+@@ -1275,7 +1275,7 @@ _gcry_pk_selftest (int algo, int extended, selftest_report_func_t report)
+ 
+ struct pk_random_override {
+   size_t len;
+-  unsigned char area[];
++  unsigned char area[1];
+ };
+ 
+ gpg_err_code_t
+-- 
+2.37.3