Attachment 896779 Details for Bug 1098785 – jwhois-4.0-libidn2.patch

[patch] jwhois-4.0-libidn2.patch

jwhois-4.0-libidn2.patch (text/plain), 2.66 KB, created by Robert Scheck on 2014-05-18 14:39:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Scheck

Created: 2014-05-18 14:39:48 UTC

Size: 2.66 KB

patch

obsolete

>Patch by Robert Scheck <robert@fedoraproject.org> for jwhois >= 4.0 which replaces
>current GNU Libidn support (IDNA 2003) by GNU Libidn2 support (IDNA 2008). This is
>e.g. allowing the 'Ã' character in domain names. See also Red Hat Bugzilla #1098785
>for further information: https://bugzilla.redhat.com/show_bug.cgi?id=1098785
>
>--- jwhois-4.0/configure.ac			2014-05-18 16:28:18.000000000 +0200
>+++ jwhois-4.0/configure.ac.libidn2		2014-05-18 16:27:48.000000000 +0200
>@@ -154,26 +154,26 @@
>      ], AC_MSG_RESULT(no),AC_MSG_RESULT(no))
> fi
> 
>-AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
>-                                     [Support IDN (needs GNU Libidn)]),
>-       libidn=$withval, libidn=yes)
>- if test "$libidn" != "no"; then
>-   if test "$libidn" != "yes"; then
>-     LDFLAGS="${LDFLAGS} -L$libidn/lib"
>-     CPPFLAGS="${CPPFLAGS} -I$libidn/include"
>+AC_ARG_WITH(libidn2, AC_HELP_STRING([--with-libidn2=[DIR]],
>+                                     [Support IDNA 2008 (needs GNU Libidn2)]),
>+       libidn2=$withval, libidn2=yes)
>+ if test "$libidn2" != "no"; then
>+   if test "$libidn2" != "yes"; then
>+     LDFLAGS="${LDFLAGS} -L$libidn2/lib"
>+     CPPFLAGS="${CPPFLAGS} -I$libidn2/include"
>    fi
>-   AC_CHECK_HEADER(idna.h,
>-     AC_CHECK_LIB(idn, stringprep_check_version,
>-       [libidn=yes LIBS="${LIBS} -lidn"], libidn=no),
>-     libidn=no)
>+   AC_CHECK_HEADER(idn2.h,
>+     AC_CHECK_LIB(idn2, idn2_lookup_ul,
>+       [libidn2=yes LIBS="${LIBS} -lidn2"], libidn2=no),
>+     libidn2=no)
>  fi
>- if test "$libidn" != "no" ; then
>-  AC_DEFINE(LIBIDN, 1, [Define to 1 if you want IDN support.])
>+ if test "$libidn2" != "no" ; then
>+  AC_DEFINE(LIBIDN2, 1, [Define to 1 if you want IDNA 2008 support.])
>  else
>-  AC_MSG_WARN([Libidn not found])
>+  AC_MSG_WARN([Libidn2 not found])
> fi
>-AC_MSG_CHECKING([if Libidn should be used])
>-AC_MSG_RESULT($libidn)
>+AC_MSG_CHECKING([if Libidn2 should be used])
>+AC_MSG_RESULT($libidn2)
> 
> 
> found=no
>--- jwhois-4.0/src/jwhois.c			2007-06-26 08:59:35.000000000 +0200
>+++ jwhois-4.0/src/jwhois.c.liblidn2		2014-05-18 16:27:38.000000000 +0200
>@@ -59,8 +59,8 @@
> # include <langinfo.h>
> #endif
> 
>-#ifdef LIBIDN
>-# include <idna.h>
>+#ifdef LIBIDN2
>+# include <idn2.h>
> #endif
> 
> #ifdef ENABLE_NLS
>@@ -117,11 +117,11 @@
>       optind++;
>     }
>   qstring[strlen(qstring)-1] = '\0';
>-#ifdef LIBIDN
>-  rc = idna_to_ascii_lz(qstring, &idn, 0);
>-  if (rc != IDNA_SUCCESS)
>+#ifdef LIBIDN2
>+  rc = idn2_lookup_ul(qstring, &idn, 0);
>+  if (rc != IDN2_OK)
>     {
>-      printf("[IDN encoding of '%s' failed with error code %d]\n", qstring, rc);
>+      printf("[IDN encoding of '%s' failed: %s)]\n", qstring, idn2_strerror(rc));
>       exit(1);
>     }
>   wq.query = strdup(idn);

Flags:

vcrhonek: review+

Actions: View | Diff

Attachments on bug 1098785: 896779