From f66982fe6a39f1e702ef2245b03bfc941b60d437 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 6 May 2025 14:41:12 +0200
Subject: [PATCH] libgcrypt, add recipe for 1.11.0 (#12332)

---
 dev-libs/libgcrypt/libgcrypt-1.11.0.recipe    | 96 +++++++++++++++++++
 .../patches/libgcrypt-1.11.0.patchset         | 73 ++++++++++++++
 2 files changed, 169 insertions(+)
 create mode 100644 dev-libs/libgcrypt/libgcrypt-1.11.0.recipe
 create mode 100644 dev-libs/libgcrypt/patches/libgcrypt-1.11.0.patchset

diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.0.recipe b/dev-libs/libgcrypt/libgcrypt-1.11.0.recipe
new file mode 100644
index 000000000..5552966ee
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.11.0.recipe
@@ -0,0 +1,96 @@
+SUMMARY="GNU's basic cryptographic library"
+DESCRIPTION="Libgcrypt is a general purpose crypto library based on the code \
+used in GnuPG."
+HOMEPAGE="https://gnupg.org/related_software/libgcrypt/"
+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="09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c"
+PATCHES="libgcrypt-$portVersion.patchset"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="20.5.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	libgcrypt$secondaryArchSuffix = $portVersion
+	lib:libgcrypt$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libgpg_error$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libgcrypt${secondaryArchSuffix}_devel = $portVersion
+	cmd:dumpsexp$secondaryArchSuffix = $portVersion
+	cmd:hmac256$secondaryArchSuffix = $portVersion
+	cmd:libgcrypt_config$secondaryArchSuffix = $portVersion
+	cmd:mpicalc$secondaryArchSuffix = $portVersion
+	devel:libgcrypt$secondaryArchSuffix = $libVersion
+	"
+REQUIRES_devel="
+	haiku$secondaryArchSuffix
+	libgcrypt$secondaryArchSuffix == $portVersion base
+	devel:libgpg_error$secondaryArchSuffix
+	lib:libgpg_error$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libgpg_error$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	"
+
+defineDebugInfoPackage libgcrypt$secondaryArchSuffix \
+	$libDir/libgcrypt.so.$libVersion
+
+BUILD()
+{
+	runConfigure ./configure \
+		--disable-jent-support
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	#remove libtool file
+	rm -f $libDir/*.la
+
+	prepareInstalledDevelLib libgcrypt
+	fixPkgconfig
+
+	if [ -z "$secondaryArchSuffix" ]; then
+		maybe_infoDir=$infoDir
+		maybe_manDir=$manDir
+	else
+		maybe_infoDir=
+		maybe_manDir=
+		rm -rf $documentationDir
+	fi
+
+	packageEntries devel \
+		$developDir \
+		$binDir \
+		$dataDir \
+		$maybe_infoDir \
+		$maybe_manDir
+}
+
+TEST()
+{
+	LIBRARY_PATH="$sourceDir/src/.libs${LIBRARY_PATH:+:$LIBRARY_PATH}" \
+	make check
+}
diff --git a/dev-libs/libgcrypt/patches/libgcrypt-1.11.0.patchset b/dev-libs/libgcrypt/patches/libgcrypt-1.11.0.patchset
new file mode 100644
index 000000000..80297555c
--- /dev/null
+++ b/dev-libs/libgcrypt/patches/libgcrypt-1.11.0.patchset
@@ -0,0 +1,73 @@
+From 75ecbda504baa3d6d0a24e42987ef32b5b9f511a 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 1d06ca3..25ae69a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -854,6 +854,7 @@ fi
+ AC_SEARCH_LIBS(setsockopt, [socket], ,
+ 	[AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
+ AC_SEARCH_LIBS(setsockopt, [nsl])
++AC_SEARCH_LIBS(socket, [network])
+ 
+ ##################################
+ #### Checks for header files. ####
+-- 
+2.48.1
+
+
+From b2cfa7fc95a7762c2297684abb75deea9653f065 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 bda14d9..6ea19ff 100644
+--- a/src/hwf-x86.c
++++ b/src/hwf-x86.c
+@@ -119,7 +119,7 @@ get_xgetbv(void)
+   unsigned int t_eax, t_edx;
+ 
+   asm volatile
+-    ("xgetbv\n\t"
++    (".byte 0x0f, 0x01, 0xd0\n\t"
+      : "=a" (t_eax), "=d" (t_edx)
+      : "c" (0)
+     );
+-- 
+2.48.1
+
+
+From dfbcd57afa21f4c27ca4f858a0ceee3e404b6f40 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 9cad7a4..d9a8ba8 100644
+--- a/src/gcrypt.h.in
++++ b/src/gcrypt.h.in
+@@ -74,9 +74,14 @@ extern "C" {
+    underscore they are subject to change without notice. */
+ #ifdef __GNUC__
+ 
++#ifdef __GNUC_PATCHLEVEL__
+ #define _GCRY_GCC_VERSION (__GNUC__ * 10000 \
+                              + __GNUC_MINOR__ * 100 \
+                              + __GNUC_PATCHLEVEL__)
++#else
++#define _GCRY_GCC_VERSION (__GNUC__ * 10000 \
++                             + __GNUC_MINOR__ * 100)
++#endif
+ 
+ #if _GCRY_GCC_VERSION >= 30100
+ #define _GCRY_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
+-- 
+2.48.1
+