20352128 links should be delivered 64-bit.
authorRich Burridge <rich.burridge@oracle.com>
Wed, 14 Jan 2015 07:56:59 -0800
changeset 3636 ca7fe1fad4ea
parent 3633 dc8489206e64
child 3637 ccffa596a69c
20352128 links should be delivered 64-bit.
components/links/Makefile
components/links/patches/init-openssl.patch
--- a/components/links/Makefile	Sat Jan 10 08:18:26 2015 -0800
+++ b/components/links/Makefile	Wed Jan 14 07:56:59 2015 -0800
@@ -41,6 +41,11 @@
 # Because the Studio compiler generates thousands of lines of warnings.
 COMPILER =		gcc
 
+# Needed to generate a 64-bit executable.
+CC +=			$(CC_BITS)
+
+PATCH_LEVEL =		0
+
 # Configure in links does not understand CC, CXX, etc.  Need to generate a
 # new configure for it to configure and build properly.
 COMPONENT_PREP_ACTION=	(cd $(@D) ; autoconf)
--- a/components/links/patches/init-openssl.patch	Sat Jan 10 08:18:26 2015 -0800
+++ b/components/links/patches/init-openssl.patch	Wed Jan 14 07:56:59 2015 -0800
@@ -1,14 +1,14 @@
-Disable SSLv2 and SSLv3 in elinks to "mitigate POODLE vulnerability".
+Disable SSLv2 and SSLv3 in links to "mitigate POODLE vulnerability".
 
 This change will be passed upstream.
 
---- links-1.03/https.c.orig	2014-12-17 15:47:04.315785336 -0800
-+++ links-1.03/https.c	2015-01-06 13:08:06.766439550 -0800
[email protected]@ -41,6 +41,7 @@
- 		SSLeay_add_ssl_algorithms();
- 		context = SSL_CTX_new(SSLv23_client_method());
+--- https.c.orig	2015-01-13 06:51:50.062449801 -0800
++++ https.c	2015-01-13 06:52:03.963799972 -0800
[email protected]@ -63,6 +63,7 @@
+ 		context = SSL_CTX_new((void *)m);
+ 		if (!context) return NULL;
  		SSL_CTX_set_options(context, SSL_OP_ALL);
 +		SSL_CTX_set_options(context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
  		SSL_CTX_set_default_verify_paths(context);
- /* needed for systems without /dev/random, but obviously kills security. */
- 		/*{
+ 
+ 	}