From 8ac8f64e348a88f8d7e767f155c0d6e3552d9f13 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 19 Nov 2023 16:11:37 +0000
Subject: [PATCH] core/gnutls to 3.8.2-1

---
 core/gnutls/.SRCINFO                          | 40 +++++++++++++++++++
 core/gnutls/PKGBUILD                          | 25 +++++++-----
 .../gnutls-ktls_disable_keyupdate_test.patch  | 13 ++++++
 3 files changed, 69 insertions(+), 9 deletions(-)
 create mode 100644 core/gnutls/.SRCINFO
 create mode 100644 core/gnutls/gnutls-ktls_disable_keyupdate_test.patch

diff --git a/core/gnutls/.SRCINFO b/core/gnutls/.SRCINFO
new file mode 100644
index 000000000..f63c914d1
--- /dev/null
+++ b/core/gnutls/.SRCINFO
@@ -0,0 +1,40 @@
+pkgbase = gnutls
+	pkgdesc = A library which provides a secure layer over a reliable transport layer
+	pkgver = 3.8.2
+	pkgrel = 1
+	url = https://www.gnutls.org/
+	arch = x86_64
+	license = GPL3
+	license = LGPL2.1
+	checkdepends = net-tools
+	checkdepends = tpm2-tools
+	makedepends = tpm2-tss
+	makedepends = gtk-doc
+	depends = glibc
+	depends = gcc-libs
+	depends = gmp
+	depends = libtasn1
+	depends = readline
+	depends = zlib
+	depends = nettle
+	depends = libp11-kit
+	depends = libidn2
+	depends = zstd
+	depends = libidn2.so
+	depends = libunistring
+	depends = brotli
+	optdepends = tpm2-tss: support for TPM2 wrapped keys
+	options = !zipman
+	backup = etc/gnutls/config
+	backup = etc/modules-load.d/gnutls.conf
+	source = https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.2.tar.xz
+	source = https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.2.tar.xz.sig
+	source = config
+	source = gnutls-ktls_disable_keyupdate_test.patch
+	validpgpkeys = 462225C3B46F34879FC8496CD605848ED7E69871
+	sha256sums = e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77
+	sha256sums = SKIP
+	sha256sums = 22e614510fe52defe8c233ce3e5ead2205739fd967657ce3176ca121f3c562b5
+	sha256sums = 2a911615739cb327b6dced36b595ea10c89f40bb7274d062dab14a9ecfe89708
+
+pkgname = gnutls
diff --git a/core/gnutls/PKGBUILD b/core/gnutls/PKGBUILD
index d89027b27..64cfa71c6 100644
--- a/core/gnutls/PKGBUILD
+++ b/core/gnutls/PKGBUILD
@@ -5,8 +5,8 @@
 #  - compile v7 with -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64
 
 pkgname=gnutls
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.8.2
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('x86_64')
 license=('GPL3' 'LGPL2.1')
@@ -14,19 +14,29 @@ url="https://www.gnutls.org/"
 options=('!zipman')
 depends=('glibc' 'gcc-libs' 'gmp' 'libtasn1' 'readline' 'zlib' 'nettle'
          'libp11-kit' 'libidn2' 'zstd' 'libidn2.so' 'libunistring' 'brotli')
-makedepends=('tpm2-tss')
+makedepends=('tpm2-tss'
+            # required for autoreconf when patching
+            'gtk-doc')
 checkdepends=('net-tools' 'tpm2-tools')
 optdepends=('tpm2-tss: support for TPM2 wrapped keys')
 backup=(etc/gnutls/config
         etc/modules-load.d/gnutls.conf)
 source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/${pkgname}-${pkgver}.tar.xz{,.sig}
-        config)
-sha256sums=('ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c'
+        config
+        gnutls-ktls_disable_keyupdate_test.patch)
+sha256sums=('e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77'
             'SKIP'
-            '22e614510fe52defe8c233ce3e5ead2205739fd967657ce3176ca121f3c562b5')
+            '22e614510fe52defe8c233ce3e5ead2205739fd967657ce3176ca121f3c562b5'
+            '2a911615739cb327b6dced36b595ea10c89f40bb7274d062dab14a9ecfe89708')
 validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno@unixuser.org>"
 #validpgpkeys=('5D46CB0F763405A7053556F47A75A648B3F9220C') # "Zoltan Fridrich <zfridric@redhat.com>"
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../gnutls-ktls_disable_keyupdate_test.patch
+  autoreconf -vfi
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   [[ $CARCH == "armv7h" ]] && CPPFLAGS+=" -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64"
@@ -45,9 +55,6 @@ build() {
 
 check() {
   cd ${pkgname}-${pkgver}
-  # disable parallel tests:
-  # FAIL: serv-udp.sh
-#  make -j1 check
   make check
 }
 
diff --git a/core/gnutls/gnutls-ktls_disable_keyupdate_test.patch b/core/gnutls/gnutls-ktls_disable_keyupdate_test.patch
new file mode 100644
index 000000000..cab7547c6
--- /dev/null
+++ b/core/gnutls/gnutls-ktls_disable_keyupdate_test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 2872cb1aa..247dfd3d8 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -504,8 +504,6 @@ endif
+ if ENABLE_KTLS
+ indirect_tests += gnutls_ktls
+ dist_check_SCRIPTS += ktls.sh
+-indirect_tests += ktls_keyupdate
+-dist_check_SCRIPTS += ktls_keyupdate.sh
+ endif
+ 
+ if !WINDOWS