Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 net/openconnect/DETAILS                                                      
          |    5 -
 net/openconnect/HISTORY                                                      
          |    6 +
 net/openconnect/PRE_BUILD                                                    
          |    3 
 
net/openconnect/patches/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS.patch
 |   43 ++++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)

New commits:
commit 9c4efed364d7bccb8e84dbeda35c1bd1e1961c26
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    openconnect: Fix build against gnutls 3.8.1

commit 3ad3dd2c0da1b9866d5e25f231e44f25ed84053e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    openconnect 9.12

commit 31aa748e90c79415ef3d9696990d4df8ccc876c9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    openconnect: Add Watch line

diff --git a/net/openconnect/DETAILS b/net/openconnect/DETAILS
index 4569d4a..44dfc6d 100755
--- a/net/openconnect/DETAILS
+++ b/net/openconnect/DETAILS
@@ -1,8 +1,9 @@
+# Watch: ftp://ftp.infradead.org/pub/openconnect/
            SPELL=openconnect
-         VERSION=8.20
+         VERSION=9.12
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=ftp://ftp.infradead.org/pub/${SPELL}/${SOURCE}
-     
SOURCE_HASH=sha512:76f5e49948391397ea1f7d2fca5798731f4278fee74c3da9b0f0daba6c386ce79ec5d87d40b6d3d99bb2528a038b5a2076df4159bb29c52cba62efb2ca52c8ab
+     
SOURCE_HASH=sha512:5c622e8bdfac3d21b5881660444e5d2b84e9463a99493d42cbfb480c3aa3972076bdeeb618aca02abed68e31dbeadcb66fb1c370e62a20f20cd544753c7ac48e
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://www.infradead.org/openconnect/";
       LICENSE[0]="LGPL-2.1"
diff --git a/net/openconnect/HISTORY b/net/openconnect/HISTORY
index cfad4a0..8f92993 100644
--- a/net/openconnect/HISTORY
+++ b/net/openconnect/HISTORY
@@ -1,3 +1,9 @@
+2023-09-04 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 9.12
+       * PRE_BUILD,
+         0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS.patch:
+         fixed build against gnutls 3.8.1
+
 2022-05-30 Ismael Luceno <ismael AT sourcemage.org>
        * DEPENDS, DETAILS: updated spell to 8.20
 
diff --git a/net/openconnect/PRE_BUILD b/net/openconnect/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/net/openconnect/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git 
a/net/openconnect/patches/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS.patch
 
b/net/openconnect/patches/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS.patch
new file mode 100644
index 0000000..f0195f4
--- /dev/null
+++ 
b/net/openconnect/patches/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS.patch
@@ -0,0 +1,43 @@
+From 7512698217c4104aade7a2df669a20de68f3bb8c Mon Sep 17 00:00:00 2001
+From: Daniel Lenski <dlenski AT gmail.com>
+Date: Tue, 22 Aug 2023 12:02:19 -0700
+Subject: [PATCH 1/1] Shim for renaming of GNUTLS_NO_EXTENSIONS in GnuTLS
+ v3.8.1
+
+The constant `GNUTLS_NO_EXTENSIONS` was renamed in
+https://gitlab.com/gnutls/gnutls/-/commit/a7c4a04e (released in v3.8.1), and
+then a backwards-compatibility shim was belatedly added in
+https://gitlab.com/gnutls/gnutls/-/commit/abfa8634, which has not yet been
+released.
+
+We need to re-add the constant ourselves in order to build correctly with
+GnuTLS v3.8.1.  This should fix
+https://gitlab.com/openconnect/openconnect/-/issues/650.
+
+Signed-off-by: Daniel Lenski <dlenski AT gmail.com>
+---
+ gnutls-dtls.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gnutls-dtls.c b/gnutls-dtls.c
+index 3fd78e95..50a4bb4e 100644
+--- a/gnutls-dtls.c
++++ b/gnutls-dtls.c
+@@ -39,6 +39,14 @@
+ # define GNUTLS_CIPHER_CHACHA20_POLY1305 23
+ #endif
+ 
++#if GNUTLS_VERSION_NUMBER >= 0x030801 && !defined(GNUTLS_NO_EXTENSIONS)
++/* XX: GNUTLS_NO_EXTENSIONS was renamed in GnuTLS v3.8.1. A
++ * backwards-compatibility shim was added in a subsequent commit, but
++ * not yet released.
++ */
++# define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
++#endif
++
+ /* sets the DTLS MTU and returns the actual tunnel MTU */
+ unsigned dtls_set_mtu(struct openconnect_info *vpninfo, unsigned mtu)
+ {
+-- 
+2.37.1
+