vapier 14/09/11 05:19:22 Modified: openssl-1.0.1h-ipv6.patch Log: Delete bogus hunk that creates a .rej file #522102 by Anthony Basile. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.2 dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch?r1=1.1&r2=1.2 Index: openssl-1.0.1h-ipv6.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openssl-1.0.1h-ipv6.patch 5 Jun 2014 12:53:23 -0000 1.1 +++ openssl-1.0.1h-ipv6.patch 11 Sep 2014 05:19:22 -0000 1.2 @@ -1,5 +1,4 @@ -http://rt.openssl.org/Ticket/Display.html?id=2051 -user/pass: guest/guest +http://rt.openssl.org/Ticket/Display.html?id=2051&user=guest&pass=guest Forward ported from openssl-1.0.1e-ipv6.patch @@ -641,35 +640,3 @@ if (ret == NULL) return(NULL); /* else add to cache */ if(strlen(name) < sizeof ghbn_cache[0].name) ---- openssl-1.0.1h/apps/s_socket.c.rej -+++ openssl-1.0.1h/apps/s_socket.c.rej -@@ -0,0 +1,29 @@ -+--- apps/s_socket.c 2 Dec 2011 14:39:40 -0000 1.43.2.3.2.2 -++++ apps/s_socket.c 28 Dec 2011 00:28:14 -0000 -+@@ -546,15 +646,23 @@ -+ } -+ BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1); -+ -+- h2=GetHostByName(*host); -++#if OPENSSL_USE_IPV6 -++ h2=GetHostByName(*host, from.ss_family); -++#else -++ h2=GetHostByName(*host, from.sin_family); -++#endif -+ if (h2 == NULL) -+ { -+ BIO_printf(bio_err,"gethostbyname failure\n"); -+ return(0); -+ } -+- if (h2->h_addrtype != AF_INET) -++#if OPENSSL_USE_IPV6 -++ if (h2->h_addrtype != from.ss_family) -++#else -++ if (h2->h_addrtype != from.sin_family) -++#endif -+ { -+- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n"); -++ BIO_printf(bio_err,"gethostbyname addr address is not correct\n"); -+ return(0); -+ } -+ }
