libs/libidn: Update to 1.28

Signed-off-by: Marcel Denia <naoir@gmx.net>

diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile
index c23ce7088cfa273f993de6b89ce8c270cfd93ece..e7254c29b3bb4bc6fef377c84d900b25c483de41 100644 (file)
--- a/libs/libidn/Makefile
+++ b/libs/libidn/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libidn
-PKG_VERSION:=1.18
+PKG_VERSION:=1.28
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libidn
-PKG_MD5SUM:=66f115347439f56386f37a3ad92c1da2
+PKG_MD5SUM:=43a6f14b16559e10a492acc65c4b0acc
 
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=GNUmakefile aclocal.m4

diff --git a/libs/libidn/patches/002-disable-po-docs-examples.patch b/libs/libidn/patches/002-disable-po-docs-examples.patch
index 817749ef1291b297bfc98ff681c153f1c08d0b0a..27a6f947e1972649daadb9f36a20a987dadee82e 100644 (file)
--- a/libs/libidn/patches/002-disable-po-docs-examples.patch
+++ b/libs/libidn/patches/002-disable-po-docs-examples.patch
@@ -11,12 +11,12 @@
  EXTRA_DIST = cfg.mk maint.mk .clcopying
 --- a/configure.ac
 +++ b/configure.ac
-@@ -46,8 +46,6 @@ gl_EARLY
- AC_PROG_LIBTOOL
+@@ -51,8 +51,6 @@ AC_PROG_LIBTOOL
+ # Checks for programs.
  AM_MISSING_PROG(PERL, perl, $missing_dir)
  AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
 -AM_GNU_GETTEXT(external)
--AM_GNU_GETTEXT_VERSION(0.17)
+-AM_GNU_GETTEXT_VERSION(0.18.3)
  AM_ICONV
  AM_PATH_LISPDIR
  

diff --git a/libs/libidn/patches/010-fix-idn-error-usage.patch b/libs/libidn/patches/010-fix-idn-error-usage.patch
index f07a4239691a44cce9d70fc69570f94b57d4ff81..9b7ab2cca3b71cc86e81716e7e9bb036e86dc044 100644 (file)
--- a/libs/libidn/patches/010-fix-idn-error-usage.patch
+++ b/libs/libidn/patches/010-fix-idn-error-usage.patch
@@ -1,6 +1,6 @@
 --- a/src/idn.c
 +++ b/src/idn.c
-@@ -171,7 +171,7 @@ main (int argc, char *argv[])
+@@ -169,7 +169,7 @@ main (int argc, char *argv[])
        (args_info.idna_to_unicode_given ? 1 : 0) +
        (args_info.nfkc_given ? 1 : 0) != 1)
      {
@@ -9,16 +9,16 @@
        usage (EXIT_FAILURE);
      }
  
-@@ -182,7 +182,7 @@ main (int argc, char *argv[])
-     fprintf (stderr, _("Charset `%s'.\n"), stringprep_locale_charset ());
- 
-   if (!args_info.quiet_given && args_info.inputs_num == 0)
+@@ -184,7 +184,7 @@ main (int argc, char *argv[])
+   if (!args_info.quiet_given
+       && args_info.inputs_num == 0
+       && isatty (fileno (stdin)))
 -    fprintf (stderr, _("Type each input string on a line by itself, "
 +    fprintf (stderr, "%s", _("Type each input string on a line by itself, "
                       "terminated by a newline character.\n"));
  
    do
-@@ -197,7 +197,7 @@ main (int argc, char *argv[])
+@@ -199,7 +199,7 @@ main (int argc, char *argv[])
          if (feof (stdin))
            break;
  
@@ -27,7 +27,7 @@
        }
  
        if (readbuf[strlen (readbuf) - 1] == '\n')
-@@ -214,7 +214,7 @@ main (int argc, char *argv[])
+@@ -216,7 +216,7 @@ main (int argc, char *argv[])
          if (!q)
            {
              free (p);
@@ -36,7 +36,7 @@
                     _("could not convert from UTF-8 to UCS-4"));
            }
  
-@@ -239,7 +239,7 @@ main (int argc, char *argv[])
+@@ -241,7 +241,7 @@ main (int argc, char *argv[])
          if (!q)
            {
              free (r);
@@ -45,7 +45,7 @@
                     _("could not convert from UTF-8 to UCS-4"));
            }
  
-@@ -275,7 +275,7 @@ main (int argc, char *argv[])
+@@ -277,7 +277,7 @@ main (int argc, char *argv[])
          q = stringprep_utf8_to_ucs4 (p, -1, &len);
          free (p);
          if (!q)
@@ -54,7 +54,7 @@
                   _("could not convert from UTF-8 to UCS-4"));
  
          if (args_info.debug_given)
-@@ -334,7 +334,7 @@ main (int argc, char *argv[])
+@@ -336,7 +336,7 @@ main (int argc, char *argv[])
          r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
          free (q);
          if (!r)
@@ -63,7 +63,7 @@
                   _("could not convert from UCS-4 to UTF-8"));
  
          p = stringprep_utf8_to_locale (r);
-@@ -358,7 +358,7 @@ main (int argc, char *argv[])
+@@ -360,7 +360,7 @@ main (int argc, char *argv[])
          q = stringprep_utf8_to_ucs4 (p, -1, NULL);
          free (p);
          if (!q)
@@ -72,7 +72,7 @@
                   _("could not convert from UCS-4 to UTF-8"));
  
          if (args_info.debug_given)
-@@ -436,7 +436,7 @@ main (int argc, char *argv[])
+@@ -438,7 +438,7 @@ main (int argc, char *argv[])
          if (!q)
            {
              free (p);
@@ -81,7 +81,7 @@
                     _("could not convert from UCS-4 to UTF-8"));
            }
  
-@@ -492,7 +492,7 @@ main (int argc, char *argv[])
+@@ -494,7 +494,7 @@ main (int argc, char *argv[])
          r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
          free (q);
          if (!r)
@@ -90,7 +90,7 @@
                   _("could not convert from UTF-8 to UCS-4"));
  
          p = stringprep_utf8_to_locale (r);
-@@ -521,7 +521,7 @@ main (int argc, char *argv[])
+@@ -523,7 +523,7 @@ main (int argc, char *argv[])
              if (!q)
                {
                  free (p);
@@ -99,7 +99,7 @@
                         _("could not convert from UTF-8 to UCS-4"));
                }
  
-@@ -535,7 +535,7 @@ main (int argc, char *argv[])
+@@ -537,7 +537,7 @@ main (int argc, char *argv[])
          r = stringprep_utf8_nfkc_normalize (p, -1);
          free (p);
          if (!r)
@@ -108,7 +108,7 @@
  
          if (args_info.debug_given)
            {
-@@ -545,7 +545,7 @@ main (int argc, char *argv[])
+@@ -547,7 +547,7 @@ main (int argc, char *argv[])
              if (!q)
                {
                  free (r);