gnutls30-3.6.16 build against nettle8, patched for arm64

10.9-libcxx/stable/main/finkinfo/crypto/gnutls30-shlibs.info

@@ -1,18 +1,18 @@
 Package: gnutls30-shlibs
 # If update to >= 3.7.2, update gsasl19 for GNUTLS_CB_TLS_EXPORTER
-Version: 3.6.13
-Revision: 2
+Version: 3.6.16
+Revision: 1
 Source: https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-%v.tar.xz
-Source-Checksum: SHA256(32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38)
+Source-Checksum: SHA256(1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3)
 GCC: 4.0
 Depends: <<
 	gmp5-shlibs,
 	libgettext8-shlibs,
-	libhogweed5-shlibs,
+	libhogweed6-shlibs,
 	libidn2.0-shlibs,
 	libtasn1-6-shlibs (>= 3.9-1),
 	libunistring2-shlibs,
-	nettle7-shlibs
+	nettle8-shlibs
 <<
 BuildDepends: <<
 	autoconf2.6,
@@ -27,26 +27,17 @@ BuildDepends: <<
 	libtasn1-6-dev (>= 4.12-1),
 	libtool2,
 	libunistring2,
-	nettle7,
+	nettle8,
 	pkgconfig
 <<
-PatchFile: gnutls30-xcode11.4.patch
-PatchFile-MD5: e486231c88c44082fe75a7d0984fc06d
 PatchScript: <<
-	#!/bin/bash -ev
-	XCODE_VERSION=`xcodebuild -version 2>/dev/null | head -n 1 | cut -f 2 -d ' '`
-	XCODE_CLT_VERSION=`pkgutil --pkg-info com.apple.pkg.CLTools_Executables | grep version | cut -d: -f2 | cut -d'.' -f1-2`
-	if `dpkg --compare-versions $XCODE_VERSION ge 11.4` || `dpkg --compare-versions $XCODE_CLT_VERSION ge 11.4`; then
-		# -no_weak_imports causes failure with Xcode11.4
-		# https://gitlab.com/gnutls/gnutls/-/issues/966
-		%{default_script}
-		autoreconf -vfi
-	fi
 	#strip unnecessary lines from .pc
 	perl -pi -e "s|^Libs\.private.*\n||g" lib/gnutls.pc.in
 	perl -pi -e "s|\@GNUTLS_REQUIRES_PRIVATE\@\n||g" lib/gnutls.pc.in
 	# clean up -framework flags
 	perl -pi -e 's|-framework Security -framework CoreFoundation|-Wl,-framework,Security -Wl,-framework,CoreFoundation|g' lib/Makefile.in
+	# missing vm_region_64 declaration on arm64
+	perl -pi -e 's/(defined __x86_64__)$/$1 || defined __arm64__/' gl/tests/vma-iter.c
 <<
 ConfigureParams: <<
 	--libdir=%p/lib/gnutls30 \
@@ -66,7 +57,6 @@ ConfigureParams: <<
 	--disable-guile \
 	--disable-libdane \
 	--with-system-priority-file="%p/etc/gnutls/default-priorities" \
-	ac_cv_func_nettle_cfb8_encrypt=no \
 	ac_cv_prog_AWK=/usr/bin/awk \
 	ac_cv_path_GREP=/usr/bin/grep \
 	ac_cv_path_SED=/usr/bin/sed
@@ -99,11 +89,11 @@ SplitOff: <<
 		%N (>= %v-%r),
 		gmp5-shlibs,
 		libgettext8-shlibs,
-		libhogweed5-shlibs,
+		libhogweed6-shlibs,
 		libidn2.0-shlibs,
 		libtasn1-6-shlibs (>= 3.9-1),
 		libunistring2-shlibs,
-		nettle7-shlibs
+		nettle8-shlibs
 	<<
 	BuildDependsOnly: True
 	Replaces: <<
@@ -155,9 +145,13 @@ DescPackaging: <<
    libdane (the feature that is enabled by libunbound being detected)
    for consistent results. Alt would be to enable it and add deps.
 
-   ac_cv_func_nettle_cfb8_encrypt=no because 3.6.13 checks for 
+   ac_cv_func_nettle_cfb8_encrypt=no because 3.6.13 checked for 
    nettle-3.5 but needs unreleased v3.6 to pass some tests.
    https://gitlab.com/gnutls/gnutls/-/issues/974
+   dhomeier: Xcode 11.4 failure from
+   https://gitlab.com/gnutls/gnutls/-/issues/966
+   fixed in https://gitlab.com/gnutls/gnutls/-/merge_requests/1266
+   Both reverted for 3.6.16.
 <<
 License: GPL/LGPL
 Maintainer: Dave Reiser <[email protected]>