From 5a212b72e03879a58b18f604879e603a4dcda0d9 Mon Sep 17 00:00:00 2001
From: Joe Bo Run <joborun@disroot.org>
Date: Wed, 25 May 2022 23:50:24 +0300
Subject: [PATCH] upg gnutls

---
 gnutls/PKGBUILD      | 14 +++++++++++---
 gnutls/PKGBUILD-arch | 12 ++++++++++--
 gnutls/deps          |  2 ++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/gnutls/PKGBUILD b/gnutls/PKGBUILD
index eecff08..462df11 100644
--- a/gnutls/PKGBUILD
+++ b/gnutls/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=gnutls
 pkgver=3.7.5
-pkgrel=01
+pkgrel=02
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('x86_64')
 url="https://www.gnutls.org/"
@@ -19,7 +19,14 @@ makedepends=('tpm2-tss')
 checkdepends=('net-tools' 'tpm2-tools')
 optdepends=('guile: for use with Guile bindings'
             'tpm2-tss: support for TPM2 wrapped keys')
-source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/${pkgname}-${pkgver}.tar.xz{,.sig}
+        0001_Fix_out-of-bounds_memcpy_in_gnutls_realloc_zero.diff::https://gitlab.com/gnutls/gnutls/-/merge_requests/1592.patch)
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # FS#74770 / https://gitlab.com/gnutls/gnutls/-/issues/1367
+  patch -Np1 -i ../0001_Fix_out-of-bounds_memcpy_in_gnutls_realloc_zero.diff
+}
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -63,4 +70,5 @@ license=('GPL3' 'LGPL2.1')
 validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno@unixuser.org>"
 
 sha256sums=(1f85028475b4f255cc5b480af0c37e61eab43024c1507c8b75d6be506c0553ad # gnutls-3.7.5.tar.xz
-	465049fb74a87df5528269ce2757f8a03b78bb028d87641c30f7243d12c3c634) # gnutls-3.7.5.tar.xz.sig
+	465049fb74a87df5528269ce2757f8a03b78bb028d87641c30f7243d12c3c634 # gnutls-3.7.5.tar.xz.sig
+	0bdd0c3de8de9d77183b2ad4eb021ddcaf43450f07d9db4b93c7d6d1528051db) # 0001_Fix_out-of-bounds_memcpy_in_gnutls_realloc_zero.diff
diff --git a/gnutls/PKGBUILD-arch b/gnutls/PKGBUILD-arch
index 57d9ea2..eb5a1c1 100644
--- a/gnutls/PKGBUILD-arch
+++ b/gnutls/PKGBUILD-arch
@@ -3,7 +3,7 @@
 
 pkgname=gnutls
 pkgver=3.7.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('x86_64')
 license=('GPL3' 'LGPL2.1')
@@ -16,11 +16,19 @@ checkdepends=('net-tools' 'tpm2-tools')
 optdepends=('guile: for use with Guile bindings'
             'tpm2-tss: support for TPM2 wrapped keys'
             'zstd: for compression support')
-source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/${pkgname}-${pkgver}.tar.xz{,.sig}
+        0001_Fix_out-of-bounds_memcpy_in_gnutls_realloc_zero.diff::https://gitlab.com/gnutls/gnutls/-/merge_requests/1592.patch)
 sha256sums=('1f85028475b4f255cc5b480af0c37e61eab43024c1507c8b75d6be506c0553ad'
+            'SKIP'
             'SKIP')
 validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno@unixuser.org>"
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # FS#74770 / https://gitlab.com/gnutls/gnutls/-/issues/1367
+  patch -Np1 -i ../0001_Fix_out-of-bounds_memcpy_in_gnutls_realloc_zero.diff
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
diff --git a/gnutls/deps b/gnutls/deps
index 8f63e0b..58fc549 100644
--- a/gnutls/deps
+++ b/gnutls/deps
@@ -2,3 +2,5 @@ net-tools
 tpm2-tss
 tpm2-tools
 
+
+