[gtk-osx: 5/6] Update libtasn1 to latest, patch to avoid GnuLib configuration GCE.

[John Ralls <jralls src gnome org>]

commit 66632e1ec96c9ec1850a73459ea2562c4279c295
Author: John Ralls <jralls ceridwen us>
Date:   Thu Aug 5 11:19:34 2021 -0700

    Update libtasn1 to latest, patch to avoid GnuLib configuration GCE.

 modulesets-stable/gtk-osx-network.modules   | 11 ++++++-----
 modulesets-unstable/gtk-osx-network.modules | 14 +++++++++-----
 modulesets/gtk-osx-network.modules          | 12 +++++++-----
 patches/libtasn1-inline-fix.patch           | 10 ++++++++++
 4 files changed, 32 insertions(+), 15 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 2bd9dc85..c9a0b58d 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -47,11 +47,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libtasn1" supports-non-srcdir-builds="no"
-             autogen-sh="configure">
-    <branch repo="ftp.gnu.org" version="4.16.0"
-            module="libtasn1/libtasn1-4.16.0.tar.gz"
-             hash="sha256:0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d"/>
+  <autotools id="libtasn1" autogen-sh="configure">
+    <branch repo="ftp.gnu.org" version="4.17.0"
+            module="libtasn1/libtasn1-4.17.0.tar.gz"
+            hash="sha256:ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5">
+      <patch file="libtasn1-inline-fix.patch" strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index b27695cd..a2312fb0 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -51,11 +51,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libtasn1" supports-non-srcdir-builds="no"
-             autogen-sh="configure">
-    <branch repo="ftp.gnu.org" version="4.16.0"
-            module="libtasn1/libtasn1-4.16.0.tar.gz"
-             hash="sha256:0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d"/>
+  <autotools id="libtasn1" autogen-sh="configure">
+    <!-- Git repository is missing GnuLib files required to build libtasn1
+    <branch repo="git.gnu.org" tag="libtasn1_4_4"  module="libtasn1"/> -->
+    <branch repo="ftp.gnu.org" version="4.17.0"
+            module="libtasn1/libtasn1-4.17.0.tar.gz"
+             hash="sha256:ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5">
+      <patch file="libtasn1-inline-fix.patch" strip="1"/>
+    </branch>
+
   </autotools>
 
   <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index ff18b663..a1a2cd5d 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -51,12 +51,14 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libtasn1" supports-non-srcdir-builds="no" autogen-sh="configure">
-    <!-- Git repository is missing files required to build libtasn1
+  <autotools id="libtasn1" autogen-sh="configure">
+    <!-- Git repository is missing GnuLib files required to build libtasn1
     <branch repo="git.gnu.org" tag="libtasn1_4_4"  module="libtasn1"/> -->
-    <branch repo="ftp.gnu.org" version="4.16.0"
-            module="libtasn1/libtasn1-4.16.0.tar.gz"
-             hash="sha256:0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d"/>
+    <branch repo="ftp.gnu.org" version="4.17.0"
+            module="libtasn1/libtasn1-4.17.0.tar.gz"
+             hash="sha256:ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5">
+      <patch file="libtasn1-inline-fix.patch" strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
diff --git a/patches/libtasn1-inline-fix.patch b/patches/libtasn1-inline-fix.patch
new file mode 100644
index 00000000..10160ab5
--- /dev/null
+++ b/patches/libtasn1-inline-fix.patch
@@ -0,0 +1,10 @@
+--- a/lib/parser_aux.c 2021-05-13 08:59:58.000000000 -0700
++++ b/lib/parser_aux.c 2021-08-03 10:25:36.000000000 -0700
+@@ -20,8 +20,9 @@
+  */
+
+ #include <limits.h> // WORD_BIT
++#define _GL_EXTERN_INLINE_STDHEADER_BUG
+
+ #include "int.h"
+ #include "parser_aux.h"