From 6dbf434e2130de4c7ae6dd2b32fcd70a0f9fe097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= <me@dawidwrobel.com>
Date: Wed, 27 Oct 2021 07:59:35 +0200
Subject: [PATCH] [libgcrypt] update to 1.9.4, fix arm64-osx compilation
 (#20854)

* [libgcrypt] update to 1.9.3

* [libgcrypt] use numeric versioning

* [libgcrypt] fix description

* [libgcrypt] update to 1.9.4

Use upstream Git repo, since the GitHub mirror appears out-of-sync

* [libgcrypt] update versions
---
 ports/libgcrypt/fix-flags.patch     | 13 -------------
 ports/libgcrypt/fix-pkgconfig.patch | 11 -----------
 ports/libgcrypt/portfile.cmake      | 11 ++++-------
 ports/libgcrypt/vcpkg.json          |  5 ++---
 versions/baseline.json              |  4 ++--
 versions/l-/libgcrypt.json          |  5 +++++
 6 files changed, 13 insertions(+), 36 deletions(-)
 delete mode 100644 ports/libgcrypt/fix-flags.patch
 delete mode 100644 ports/libgcrypt/fix-pkgconfig.patch

diff --git a/ports/libgcrypt/fix-flags.patch b/ports/libgcrypt/fix-flags.patch
deleted file mode 100644
index 7ccf41c63e..0000000000
--- a/ports/libgcrypt/fix-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cipher/Makefile.am b/cipher/Makefile.am
-index 95c4510..d43350c 100644
---- a/cipher/Makefile.am
-+++ b/cipher/Makefile.am
-@@ -112,7 +112,7 @@ gost-sb.h: gost-s-box
- 	./gost-s-box $@
- 
- gost-s-box: gost-s-box.c
--	$(CC_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c
-+	$(CC_FOR_BUILD) $(CFLAGS) -o $@ $(srcdir)/gost-s-box.c
- 
- 
- if ENABLE_O_FLAG_MUNGING
diff --git a/ports/libgcrypt/fix-pkgconfig.patch b/ports/libgcrypt/fix-pkgconfig.patch
deleted file mode 100644
index 0c269b2a6b..0000000000
--- a/ports/libgcrypt/fix-pkgconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in
-index ec68fa2..6bf7a07 100644
---- a/src/libgcrypt.pc.in
-+++ b/src/libgcrypt.pc.in
-@@ -13,5 +13,5 @@ Description: General purpose cryptographic library
- Requires: gpg-error
- Version: @PACKAGE_VERSION@
- Cflags: @LIBGCRYPT_CONFIG_CFLAGS@
--Libs: @LIBGCRYPT_CONFIG_LIBS@
-+Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@
- URL: https://www.gnupg.org/software/libgcrypt/index.html
diff --git a/ports/libgcrypt/portfile.cmake b/ports/libgcrypt/portfile.cmake
index 658418e2c2..5455cb0eae 100644
--- a/ports/libgcrypt/portfile.cmake
+++ b/ports/libgcrypt/portfile.cmake
@@ -1,14 +1,11 @@
 vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows")
 
-vcpkg_from_github(
+vcpkg_from_git(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO gpg/libgcrypt
-    REF libgcrypt-1.8.7
-    SHA512 43e50a1b8a3cdbf420171c785fe558f443b414b708defa585277ac5ea59f9d8ae7f4555ed291c16fa004e7d4dd93a5ab2011c3c591e784ce3c6662a3193fd3e1
+    URL git://git.gnupg.org/libgcrypt.git
+    FETCH_REF libgcrypt-1.9.4
+    REF 05422ca24a0391dad2a0b7790a904ce348819c10 # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=05422ca24a0391dad2a0b7790a904ce348819c10
     HEAD_REF master
-    PATCHES
-        fix-pkgconfig.patch
-        fix-flags.patch
 )
 
 vcpkg_configure_make(
diff --git a/ports/libgcrypt/vcpkg.json b/ports/libgcrypt/vcpkg.json
index 40a0566446..efc6cdda81 100644
--- a/ports/libgcrypt/vcpkg.json
+++ b/ports/libgcrypt/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "name": "libgcrypt",
-  "version-string": "1.8.7",
-  "port-version": 2,
-  "description": "A library implementing the so-called Assuan protocol",
+  "version": "1.9.4",
+  "description": "A general purpose cryptographic library",
   "homepage": "https://gnupg.org/software/libgcrypt/index.html",
   "supports": "linux | osx",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 34d54697a3..9c8b2d500f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3421,8 +3421,8 @@
       "port-version": 1
     },
     "libgcrypt": {
-      "baseline": "1.8.7",
-      "port-version": 2
+      "baseline": "1.9.4",
+      "port-version": 0
     },
     "libgd": {
       "baseline": "2.3.2",
diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json
index 75cf88e870..06e8a93b02 100644
--- a/versions/l-/libgcrypt.json
+++ b/versions/l-/libgcrypt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7b99b42dfc0f469a13d4e39d9802012b9a7e78d1",
+      "version": "1.9.4",
+      "port-version": 0
+    },
     {
       "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
       "version-string": "1.8.7",