20341749 Backport 20318849 to 11.3 - Update links to version 2.9 s11-update
authorRich Burridge <rich.burridge@oracle.com>
Mon, 09 Feb 2015 12:38:38 -0800
branchs11-update
changeset 3751 f7b7c259669f
parent 3748 4e3605a7e3c0
child 3760 b92075be8b9d
20341749 Backport 20318849 to 11.3 - Update links to version 2.9 20352128 links should be delivered 64-bit.
components/links/Makefile
components/links/links.p5m
components/links/patches/init-openssl.patch
components/links/resolve.deps
--- a/components/links/Makefile	Fri Feb 06 14:10:05 2015 -0800
+++ b/components/links/Makefile	Mon Feb 09 12:38:38 2015 -0800
@@ -18,39 +18,48 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		links
-COMPONENT_VERSION=	1.03
-IPS_COMPONENT_VERSION=	1.0.3
+COMPONENT_VERSION=	2.9
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://jikos.cz/~mikulas/links/
+COMPONENT_PROJECT_URL=	http://links.twibright.com/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:32443c6f011216a8a43ed0806d9d23c1defdd19bc4b021ee00cda197782e175a
-COMPONENT_ARCHIVE_URL=	http://www.jikos.cz/~mikulas/$(COMPONENT_NAME)/download/$(COMPONENT_ARCHIVE)
+    sha256:e2d4e193eb3147f0d745e28d37d510edb22697707e329cbe361bb79037bae332
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/links
 
-TPNO=			9049
+TPNO=			21157
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+# 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) 
+COMPONENT_PREP_ACTION=	(cd $(@D) ; autoconf)
 
-CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) -xstrconst -Dinline"
+ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-build:		$(BUILD_32)
+configure:	$(CONFIGURE_64)
+
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
-test:	$(NO_TESTS)
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/links/links.p5m	Fri Feb 06 14:10:05 2015 -0800
+++ b/components/links/links.p5m	Mon Feb 09 12:38:38 2015 -0800
@@ -33,12 +33,8 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2008/322
+set name=org.opensolaris.arc-caseid value=LSARC/2008/322
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir  path=usr
-dir  path=usr/bin
-file path=usr/bin/links
-dir  path=usr/share
-dir  path=usr/share/man
-dir  path=usr/share/man/man1
+file usr/bin/$(MACH64)/links path=usr/bin/links
 file path=usr/share/man/man1/links.1
 license links.license license=GPLv2
--- a/components/links/patches/init-openssl.patch	Fri Feb 06 14:10:05 2015 -0800
+++ b/components/links/patches/init-openssl.patch	Mon Feb 09 12:38:38 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. */
- 		/*{
+ 
+ 	}
--- a/components/links/resolve.deps	Fri Feb 06 14:10:05 2015 -0800
+++ b/components/links/resolve.deps	Mon Feb 09 12:38:38 2015 -0800
@@ -1,3 +1,5 @@
+compress/bzip2
+compress/xz
 library/security/openssl
+library/zlib
 system/library
-system/linker