25654409 Update links to version 2.14
authorRich Burridge <rich.burridge@oracle.com>
Tue, 14 Mar 2017 13:18:47 -0700
changeset 7747 83e42ef0155e
parent 7746 7b54a7b25ab4
child 7748 fd32bbfab08c
25654409 Update links to version 2.14
components/links/Makefile
components/links/patches/init-openssl.patch
--- a/components/links/Makefile	Tue Mar 14 11:44:22 2017 -0700
+++ b/components/links/Makefile	Tue Mar 14 13:18:47 2017 -0700
@@ -28,14 +28,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		links
-COMPONENT_VERSION=	2.12
+COMPONENT_VERSION=	2.14
 COMPONENT_PROJECT_URL=	http://links.twibright.com/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:2e3da6193de9d6ee71bc4beab17169ecc58d7cbf2e20192a3f518ed9f7f22e33
+    sha256:22fa8dcb5a60b8ffd611de31ebd4c79edce472637a3554bab401795da91d4387
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 COMPONENT_ANITYA_ID=	1822
 
-TPNO=			27168
+TPNO=			34022
 
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
--- a/components/links/patches/init-openssl.patch	Tue Mar 14 11:44:22 2017 -0700
+++ b/components/links/patches/init-openssl.patch	Tue Mar 14 13:18:47 2017 -0700
@@ -2,14 +2,14 @@
 
 This change will be passed upstream.
 
---- https.c.orig	2016-03-02 16:24:33.763060204 -0800
-+++ https.c	2016-03-02 16:25:14.036046032 -0800
[email protected]@ -100,7 +100,7 @@
- 		if (!m) return NULL;
- 		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);
- 		if (ssl_set_private_paths())
- 			SSL_CTX_set_default_verify_paths(context);
- 		SSL_CTX_set_default_passwd_cb(context, ssl_password_callback);
+--- https.c.orig	2017-03-01 16:33:15.504062101 +0000
++++ https.c	2017-03-01 16:33:47.467654008 +0000
[email protected]@ -114,7 +114,7 @@
+ #ifndef SSL_OP_NO_COMPRESSION
+ #define SSL_OP_NO_COMPRESSION	0
+ #endif
+-		SSL_CTX_set_options(context, SSL_OP_ALL | SSL_OP_NO_COMPRESSION);
++		SSL_CTX_set_options(context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION);
+ #ifdef SSL_MODE_ENABLE_PARTIAL_WRITE
+ 		SSL_CTX_set_mode(context, SSL_MODE_ENABLE_PARTIAL_WRITE);
+ #endif