From aaa1e71f9074c1add56dc445d5e4372be6df4e36 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 5 Jun 2021 14:55:52 +0200
Subject: [PATCH] libidn: bump version

---
 ...{libidn-1.36.recipe => libidn-1.37.recipe} |  6 +-
 net-dns/libidn/patches/libidn-1.36.patchset   | 55 -------------------
 net-dns/libidn/patches/libidn-1.37.patchset   | 29 ++++++++++
 3 files changed, 32 insertions(+), 58 deletions(-)
 rename net-dns/libidn/{libidn-1.36.recipe => libidn-1.37.recipe} (93%)
 delete mode 100644 net-dns/libidn/patches/libidn-1.36.patchset
 create mode 100644 net-dns/libidn/patches/libidn-1.37.patchset

diff --git a/net-dns/libidn/libidn-1.36.recipe b/net-dns/libidn/libidn-1.37.recipe
similarity index 93%
rename from net-dns/libidn/libidn-1.36.recipe
rename to net-dns/libidn/libidn-1.37.recipe
index 419c78871..229a36e7e 100644
--- a/net-dns/libidn/libidn-1.36.recipe
+++ b/net-dns/libidn/libidn-1.37.recipe
@@ -4,16 +4,16 @@ on the Stringprep, Punycode, IDNA and TLD specifications."
 HOMEPAGE="https://www.gnu.org/software/libidn/"
 COPYRIGHT="2002-2018 Simon Josefsson"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://ftpmirror.gnu.org/libidn/libidn-$portVersion.tar.gz
 	https://ftp.gnu.org/gnu/libidn/libidn-$portVersion.tar.gz"
-CHECKSUM_SHA256="14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038"
+CHECKSUM_SHA256="3c8e970d5cd80a8cb56f59c61611535336343942e3f1c81b0190c69993a692c2"
 PATCHES="libidn-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-libVersion="12.6.1"
+libVersion="12.6.2"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
diff --git a/net-dns/libidn/patches/libidn-1.36.patchset b/net-dns/libidn/patches/libidn-1.36.patchset
deleted file mode 100644
index e40a55de5..000000000
--- a/net-dns/libidn/patches/libidn-1.36.patchset
+++ /dev/null
@@ -1,55 +0,0 @@
-From cc357bdbece703ccbefe06529e50d71160e62d02 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Tue, 19 Jan 2021 12:39:38 +0000
-Subject: Fix build for gcc2
-
-
-diff --git a/gl/version-etc.h b/gl/version-etc.h
-index 813084c..dd1edaf 100644
---- a/gl/version-etc.h
-+++ b/gl/version-etc.h
-@@ -61,7 +61,7 @@ extern void version_etc (FILE *stream,
-                          const char *command_name, const char *package,
-                          const char *version,
-                          /* const char *author1, ..., NULL */ ...)
--  _GL_ATTRIBUTE_SENTINEL ();
-+  _GL_ATTRIBUTE_SENTINEL ((0));
- 
- /* Display the usual "Report bugs to" stanza.  */
- extern void emit_bug_reporting_address (void);
-diff --git a/lib/gl/attribute.h b/lib/gl/attribute.h
-index 9c09ecc..842c75b 100644
---- a/lib/gl/attribute.h
-+++ b/lib/gl/attribute.h
-@@ -80,7 +80,7 @@
- /* Attributes for variadic functions.  */
- 
- /* The variadic function expects a trailing NULL argument.
--   ATTRIBUTE_SENTINEL () - The last argument is NULL.
-+   ATTRIBUTE_SENTINEL () - The last argument is NULL (requires c99).
-    ATTRIBUTE_SENTINEL ((N)) - The (N+1)st argument from the end is NULL.  */
- /* Applies to: functions.  */
- #define ATTRIBUTE_SENTINEL(pos) _GL_ATTRIBUTE_SENTINEL (pos)
-diff --git a/lib/gl/strverscmp.c b/lib/gl/strverscmp.c
-index f55856e..3b4dd58 100644
---- a/lib/gl/strverscmp.c
-+++ b/lib/gl/strverscmp.c
-@@ -73,6 +73,7 @@ __strverscmp (const char *s1, const char *s2)
-   if (p1 == p2)
-     return 0;
- 
-+{  
-   unsigned char c1 = *p1++;
-   unsigned char c2 = *p2++;
-   /* Hint: '0' is a digit too.  */
-@@ -107,6 +108,7 @@ __strverscmp (const char *s1, const char *s2)
-     default:
-       return state;
-   }
-+  }
- }
- libc_hidden_def (__strverscmp)
- weak_alias (__strverscmp, strverscmp)
--- 
-2.30.0
-
diff --git a/net-dns/libidn/patches/libidn-1.37.patchset b/net-dns/libidn/patches/libidn-1.37.patchset
new file mode 100644
index 000000000..f12411186
--- /dev/null
+++ b/net-dns/libidn/patches/libidn-1.37.patchset
@@ -0,0 +1,29 @@
+From 4b7fbbba7f3a49301ce1d70433ff9a6c044d5be7 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Tue, 19 Jan 2021 12:39:38 +0000
+Subject: Fix build for gcc2
+
+
+diff --git a/lib/gl/strverscmp.c b/lib/gl/strverscmp.c
+index 2dcf359..d4a5d23 100644
+--- a/lib/gl/strverscmp.c
++++ b/lib/gl/strverscmp.c
+@@ -73,6 +73,7 @@ __strverscmp (const char *s1, const char *s2)
+   if (p1 == p2)
+     return 0;
+ 
++{  
+   unsigned char c1 = *p1++;
+   unsigned char c2 = *p2++;
+   /* Hint: '0' is a digit too.  */
+@@ -107,6 +108,7 @@ __strverscmp (const char *s1, const char *s2)
+     default:
+       return state;
+   }
++  }
+ }
+ libc_hidden_def (__strverscmp)
+ weak_alias (__strverscmp, strverscmp)
+-- 
+2.30.0
+