Attachment #399288 for bug #543826

Lines 1-4 Link Here

(-)a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch (+6 lines)
		1	http://bugs.gentoo.org/181438
1	http://bugs.gentoo.org/327421	2	http://bugs.gentoo.org/327421
		3	https://rt.openssl.org/Ticket/Display.html?id=3332&user=guest&pass=guest
		4
		5	make sure we respect LDFLAGS
		6
		7	also make sure we don't add useless -rpath flags to the system libdir
2		8
3	--- Makefile.org	9	--- Makefile.org
4	+++ Makefile.org	10	+++ Makefile.org

Lines 1-4 Link Here

(-)a/dev-libs/openssl/files/openssl-1.0.0d-windres.patch (-1 / +1 lines)
1	URL: http://rt.openssl.org/Ticket/Display.html?id=2558	1	URL: http://rt.openssl.org/Ticket/Display.html?id=2558&user=guest&pass=guest
2	Subject: make windres controllable via build env var settings	2	Subject: make windres controllable via build env var settings
3		3
4	atm, the windres code in openssl is only usable via the cross-compile prefix	4	atm, the windres code in openssl is only usable via the cross-compile prefix

Lines 1-3 Link Here

(-)a/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch (+2 lines)
		1	https://rt.openssl.org/Ticket/Display.html?id=3332&user=guest&pass=guest
		2
1	depend on other pc files rather than encoding library info directly in	3	depend on other pc files rather than encoding library info directly in
2	every pkg-config file	4	every pkg-config file
3		5




 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
--- a/crypto/objects/Makefile
+++ b/crypto/objects/Makefile
@@ -44,11 +44,11 @@ obj_dat.h: obj_dat.pl obj_mac.h
 # objects.pl both reads and writes obj_mac.num
 obj_mac.h: objects.pl objects.txt obj_mac.num
 	$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
-	@sleep 1; touch obj_mac.h; sleep 1
 
-obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
+# This doesn't really need obj_mac.h, but since that rule reads & writes
+# obj_mac.num, we can't run in parallel with it.
+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
 	$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
-	@sleep 1; touch obj_xref.h; sleep 1
 
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO




--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -899,7 +899,7 @@
 	if (!set_cert_key_stuff(ctx,cert,key))
 		goto end;
 
-	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
+	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) &&
 		(!SSL_CTX_set_default_verify_paths(ctx)))
 		{
 		/* BIO_printf(bio_err,"error setting default verify locations\n"); */


Lines 1-6 Link Here

(-)a/dev-libs/openssl/files/openssl-1.0.1f-revert-alpha-perl-generation.patch (-2 / +3 lines)
1	when gcc is given a .s file and told to preprocess it, it outputs nothing
2
3	https://bugs.gentoo.org/499086	1	https://bugs.gentoo.org/499086
		2	https://rt.openssl.org/Ticket/Display.html?id=3333&user=guest&pass=guest
		3
		4	when gcc is given a .s file and told to preprocess it, it outputs nothing
4		5
5	From a2976461784ce463fc7f336cd0dce607d21c2fad Mon Sep 17 00:00:00 2001	6	From a2976461784ce463fc7f336cd0dce607d21c2fad Mon Sep 17 00:00:00 2001
6	From: Mike Frysinger <vapier@gentoo.org>	7	From: Mike Frysinger <vapier@gentoo.org>




http://rt.openssl.org/Ticket/Display.html?id=2051&user=guest&pass=guest
user/pass: guest/guest

Forward ported from openssl-1.0.1e-ipv6.patch


 		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);
+ 			}
+ 		}
- 

Return to bug 543826

Lines 335-337 http://rt.openssl.org/Ticket/Display.html?id=2084 Link Here

(-)a/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch (+17 lines)
335		335
336	# DO NOT DELETE THIS LINE -- make depend depends on it.	336	# DO NOT DELETE THIS LINE -- make depend depends on it.
337		337
		338	--- a/crypto/objects/Makefile
		339	+++ b/crypto/objects/Makefile
		340	@@ -44,11 +44,11 @@ obj_dat.h: obj_dat.pl obj_mac.h
		341	# objects.pl both reads and writes obj_mac.num
		342	obj_mac.h: objects.pl objects.txt obj_mac.num
		343	$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
		344	- @sleep 1; touch obj_mac.h; sleep 1
		345
		346	-obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
		347	+# This doesn't really need obj_mac.h, but since that rule reads & writes
		348	+# obj_mac.num, we can't run in parallel with it.
		349	+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
		350	$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
		351	- @sleep 1; touch obj_xref.h; sleep 1
		352
		353	files:
		354	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

Lines 7-17 we properly fallback to setting the default paths. Link Here

(-)a/dev-libs/openssl/files/openssl-1.0.1e-s_client-verify.patch (-6 / +7 lines)
7	--- a/apps/s_client.c	7	--- a/apps/s_client.c
8	+++ b/apps/s_client.c	8	+++ b/apps/s_client.c
9	@@ -899,7 +899,7 @@	9	@@ -899,7 +899,7 @@
10	if (!set_cert_key_stuff(ctx,cert,key))	10	if (!set_cert_key_stuff(ctx,cert,key))
11	goto end;	11	goto end;
12		12
13	- if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) \|\|	13	- if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) \|\|
14	+ if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) &&	14	+ if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) &&
15	(!SSL_CTX_set_default_verify_paths(ctx)))	15	(!SSL_CTX_set_default_verify_paths(ctx)))
16	{	16	{
17	/* BIO_printf(bio_err,"error setting default verify locations\n"); */	17	/* BIO_printf(bio_err,"error setting default verify locations\n"); */
		18

Lines 1-5 Link Here

(-)a/dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch (-35 / +1 lines)
1	http://rt.openssl.org/Ticket/Display.html?id=2051	1	http://rt.openssl.org/Ticket/Display.html?id=2051&user=guest&pass=guest
2	user/pass: guest/guest
3		2
4	Forward ported from openssl-1.0.1e-ipv6.patch	3	Forward ported from openssl-1.0.1e-ipv6.patch
5		4
Lines 641-675 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> Link Here
641	if (ret == NULL) return(NULL);	640	if (ret == NULL) return(NULL);
642	/* else add to cache */	641	/* else add to cache */
643	if(strlen(name) < sizeof ghbn_cache[0].name)	642	if(strlen(name) < sizeof ghbn_cache[0].name)
644	--- openssl-1.0.1h/apps/s_socket.c.rej
645	+++ openssl-1.0.1h/apps/s_socket.c.rej
646	@@ -0,0 +1,29 @@
647	+--- apps/s_socket.c 2 Dec 2011 14:39:40 -0000 1.43.2.3.2.2
648	++++ apps/s_socket.c 28 Dec 2011 00:28:14 -0000
649	+@@ -546,15 +646,23 @@
650	+ }
651	+ BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
652	+
653	+- h2=GetHostByName(*host);
654	++#if OPENSSL_USE_IPV6
655	++ h2=GetHostByName(*host, from.ss_family);
656	++#else
657	++ h2=GetHostByName(*host, from.sin_family);
658	++#endif
659	+ if (h2 == NULL)
660	+ {
661	+ BIO_printf(bio_err,"gethostbyname failure\n");
662	+ return(0);
663	+ }
664	+- if (h2->h_addrtype != AF_INET)
665	++#if OPENSSL_USE_IPV6
666	++ if (h2->h_addrtype != from.ss_family)
667	++#else
668	++ if (h2->h_addrtype != from.sin_family)
669	++#endif
670	+ {
671	+- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
672	++ BIO_printf(bio_err,"gethostbyname addr address is not correct\n");
673	+ return(0);
674	+ }
675	+ }
676	-