Attachment 896795 Details for Bug 1098789 – elinks-0.12-libidn2.patch

[patch] elinks-0.12-libidn2.patch

elinks-0.12-libidn2.patch (text/plain), 3.14 KB, created by Robert Scheck on 2014-05-18 15:07:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Scheck

Created: 2014-05-18 15:07:54 UTC

Size: 3.14 KB

patch

obsolete

>Patch by Robert Scheck <robert@fedoraproject.org> for elinks >= 0.12 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 the Red Hat Bugzilla #1098789 for some further
>information: https://bugzilla.redhat.com/show_bug.cgi?id=1098789
>
>--- elinks-0.12pre6/configure.in			2014-05-18 16:55:00.000000000 +0200
>+++ elinks-0.12pre6/configure.in.libidn2		2014-05-18 16:53:17.000000000 +0200
>@@ -473,8 +473,8 @@
> EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_BZIP2, bzlib, bzlib.h, bz2, BZ2_bzReadOpen,
> 	[  --without-bzlib         disable bzlib support])
> 
>-EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_IDN, idn, idna.h, idn, stringprep_check_version,
>-	[  --without-idn           disable international domain names support])
>+EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_IDN2, idn2, idn2.h, idn2, idn2_lookup_ul,
>+	[  --without-idn2           disable international domain names support])
> 
> if test "x${with_gc}" != xno; then
> 	EL_CONFIG_OPTIONAL_LIBRARY(CONFIG_GC, gc, gc.h, gc, GC_init,
>--- elinks-0.12pre6/Makefile.config.in			2014-05-18 16:55:00.000000000 +0200
>+++ elinks-0.12pre6/Makefile.config.in.libidn2		2014-05-18 16:54:06.000000000 +0200
>@@ -130,7 +130,7 @@
> CONFIG_GPM = @CONFIG_GPM@
> CONFIG_GZIP = @CONFIG_GZIP@
> CONFIG_HTML_HIGHLIGHT = @CONFIG_HTML_HIGHLIGHT@
>-CONFIG_IDN = @CONFIG_IDN@
>+CONFIG_IDN2 = @CONFIG_IDN2@
> CONFIG_INTERLINK = @CONFIG_INTERLINK@
> CONFIG_IPV6 = @CONFIG_IPV6@
> CONFIG_JW = @CONFIG_JW@
>--- elinks-0.12pre6/src/osdep/win32/win32.c		2012-10-28 13:57:15.000000000 +0100
>+++ elinks-0.12pre6/src/osdep/win32/win32.c.libidn2	2014-05-18 16:54:20.000000000 +0200
>@@ -48,7 +48,7 @@
> #ifdef HAVE_LOCALE_H
> 	setlocale(LC_ALL, "");
> #endif
>-#ifdef CONFIG_IDN
>+#ifdef CONFIG_IDN2
> 	{
> 		char buf[60];
> 		UINT cp = GetACP();
>--- elinks-0.12pre6/src/protocol/uri.c			2012-10-28 13:57:15.000000000 +0100
>+++ elinks-0.12pre6/src/protocol/uri.c.libidn2		2014-05-18 16:53:44.000000000 +0200
>@@ -6,8 +6,8 @@
> 
> #include <ctype.h>
> #include <errno.h>
>-#ifdef HAVE_IDNA_H
>-#include <idna.h>
>+#ifdef HAVE_IDN2_H
>+#include <idn2.h>
> #endif
> #include <stdio.h>
> #include <stdlib.h>
>@@ -531,24 +531,20 @@
> 		 * --pasky */
> 		if (uri->ipv6 && wants(URI_PORT)) add_char_to_string(string, '[');
> #endif
>-#ifdef CONFIG_IDN
>+#ifdef CONFIG_IDN2
> 		/* Support for the GNU International Domain Name library.
> 		 *
>-		 * http://www.gnu.org/software/libidn/manual/html_node/IDNA-Functions.html
>-		 *
>-		 * Now it is probably not perfect because idna_to_ascii_lz()
>-		 * will be using a ``zero terminated input string encoded in
>-		 * the current locale's character set''. Anyway I don't know
>-		 * how to convert anything to UTF-8 or Unicode. --jonas */
>+		 * http://www.gnu.org/software/libidn/libidn2/manual/libidn2.html
>+		 */
> 		if (wants(URI_IDN)) {
> 			unsigned char *host = memacpy(uri->host, uri->hostlen);
> 
> 			if (host) {
> 				char *idname;
>-				int code = idna_to_ascii_lz(host, &idname, 0);
>+				int code = idn2_lookup_ul(host, &idname, 0);
> 
> 				/* FIXME: Return NULL if it coughed? --jonas */
>-				if (code == IDNA_SUCCESS) {
>+				if (code == IDN2_OK) {
> 					add_to_string(string, idname);
> 					free(idname);
> 					add_host = 0;

Flags:

kdudka: review+

Actions: View | Diff

Attachments on bug 1098789: 896795