From 4395ac42b40c910d6130f9930e9620ef6bcc0b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Sat, 20 Mar 2021 22:00:09 -0400
Subject: [PATCH 1/2] [libgnutls] macOS fix; additional optimizations

- add missing macOS SDK CoreFoundation framework reference
- add OpenSSL compatibility feature
- explicitly disable libdane (was disabled implicitly due to
  a missing libunbound)
- no need for autoconfig
---
 ports/libgnutls/portfile.cmake | 14 +++++++++++++-
 ports/libgnutls/vcpkg.json     |  9 ++++++++-
 scripts/ci.baseline.txt        |  1 -
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ports/libgnutls/portfile.cmake b/ports/libgnutls/portfile.cmake
index 5b027cca66f372..2a84d955abee71 100644
--- a/ports/libgnutls/portfile.cmake
+++ b/ports/libgnutls/portfile.cmake
@@ -14,8 +14,17 @@ vcpkg_extract_source_archive_ex(
     REF ${GNUTLS_VERSION}
 )
 
+if(VCPKG_TARGET_IS_OSX)
+    set(LDFLAGS "-framework CoreFoundation")
+else()
+    set(LDFLAGS "")
+endif()
+
+if ("openssl" IN_LIST FEATURES)
+  set(OPENSSL_COMPATIBILITY "--enable-openssl-compatibility")
+endif()
+
 vcpkg_configure_make(
-    AUTOCONFIG
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         --disable-doc
@@ -23,8 +32,11 @@ vcpkg_configure_make(
         --disable-tests
         --disable-maintainer-mode
         --disable-rpath
+        --disable-libdane
         --with-included-unistring
         --without-p11-kit
+        ${OPENSSL_COMPATIBILITY}
+        "LDFLAGS=${LDFLAGS}"
 )
 
 vcpkg_install_make()
diff --git a/ports/libgnutls/vcpkg.json b/ports/libgnutls/vcpkg.json
index 08cc0beb9116db..784dcb5734d459 100644
--- a/ports/libgnutls/vcpkg.json
+++ b/ports/libgnutls/vcpkg.json
@@ -1,13 +1,20 @@
 {
   "name": "libgnutls",
   "version": "3.6.15",
+  "port-version": 1,
   "description": "A secure communications library implementing the SSL, TLS and DTLS protocols",
   "homepage": "https://www.gnutls.org/",
   "supports": "!windows",
   "dependencies": [
+    "gettext",
     "gmp",
     "libidn2",
     "libtasn1",
     "nettle"
-  ]
+  ],
+  "features": {
+    "openssl": {
+      "description": "enables the OpenSSL compatibility library"
+    }
+  }
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 36519bbef7664c..1242df1a1ae922 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -605,7 +605,6 @@ libfreenect2:x64-linux=fail
 libfreenect2:x64-osx=fail
 libgit2:arm-uwp=fail
 libgit2:x64-uwp=fail
-libgnutls:x64-osx=fail
 libgo:arm-uwp=fail
 libgo:x64-uwp=fail
 libgo:arm64-windows=fail

From a85a4283822800427ba7717e6a4138f0db36bc1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Sat, 20 Mar 2021 22:29:51 -0400
Subject: [PATCH 2/2] [libgnutls] update versions

---
 versions/baseline.json     | 2 +-
 versions/l-/libgnutls.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index e9a1417fd742ec..bdb2382e9ac240 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3046,7 +3046,7 @@
     },
     "libgnutls": {
       "baseline": "3.6.15",
-      "port-version": 0
+      "port-version": 1
     },
     "libgo": {
       "baseline": "3.1-1",
diff --git a/versions/l-/libgnutls.json b/versions/l-/libgnutls.json
index 2348a766795ba0..feca522a6b2467 100644
--- a/versions/l-/libgnutls.json
+++ b/versions/l-/libgnutls.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "09f2d8c5e4e07d2076324767d251fef3bc4acb8c",
+      "version": "3.6.15",
+      "port-version": 1
+    },
     {
       "git-tree": "089f1c103a3f2c52e6ae54e8956a98345502e286",
       "version": "3.6.15",