Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20555289 lynx should be updated to version 2.8.8
authorRich Burridge <rich.burridge@oracle.com>
Mon, 02 Mar 2015 16:23:36 -0800
changeset 3886 23032290b95a
parent 3885 446b930bb478
child 3887 f1f03630e87f
20555289 lynx should be updated to version 2.8.8
components/lynx/Makefile file | annotate | diff | comparison | revisions
components/lynx/lynx.p5m file | annotate | diff | comparison | revisions
components/lynx/patches/01-locale.patch file | annotate | diff | comparison | revisions
components/lynx/patches/02-init-openssl.patch file | annotate | diff | comparison | revisions 
--- a/components/lynx/Makefile	Mon Mar 02 14:09:07 2015 -0800
+++ b/components/lynx/Makefile	Mon Mar 02 16:23:36 2015 -0800
@@ -23,16 +23,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		lynx
-COMPONENT_VERSION=	2.8.7
+COMPONENT_VERSION=	2.8.8
 COMPONENT_PROJECT_URL=	http://lynx.isc.org/
-COMPONENT_SRC=		$(COMPONENT_NAME)2-8-7
+COMPONENT_SRC=		$(COMPONENT_NAME)2-8-8
 COMPONENT_ARCHIVE=	$(COMPONENT_NAME)$(COMPONENT_VERSION).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:301bda96ad3cd5032805e8d5315a42061a11e472e3d3a7baee3a2879517ef627
+    sha256:6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_NAME)$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/lynx
 
-TPNO=			9373
+TPNO=			21553
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -71,6 +71,7 @@
 
 test:		$(TEST_64)
 
+REQUIRED_PACKAGES += library/libidn
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
--- a/components/lynx/lynx.p5m	Mon Mar 02 14:09:07 2015 -0800
+++ b/components/lynx/lynx.p5m	Mon Mar 02 16:23:36 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -41,48 +41,26 @@
 file path=etc/lynx/lynx.lss
 file usr/bin/$(MACH64)/lynx path=usr/bin/lynx
 file path=usr/share/locale/ca/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/ca/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/cs/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/cs/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/da/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/da/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/de/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/de/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/en/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/en/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/et/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/et/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/fi/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/fi/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/fr/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/fr/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/hu/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/hu/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/id/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/id/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/it/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/it/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/ja/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/ja/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/nl/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/nl/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/pt_BR/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/pt_BR/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/ru/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/ru/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/sl/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/sl/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/sv/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/sv/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/tr/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/tr/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/uk/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/uk/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/vi/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/vi/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/zh_CN/LC_MESSAGES/lynx.mo
-file path=usr/share/locale/zh_TW/LC_MESSAGES/lynx.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/lynx.mo
 file path=usr/share/man/man1/lynx.1
 license COPYING license=GPLv2
--- a/components/lynx/patches/01-locale.patch	Mon Mar 02 14:09:07 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# Copied over from the desktop consolidation, which has the comment:
-# date:2010-01-27 owner:yippi type:bug state:upstream
-
---- lynx2-8-7/src/LYMain.c-orig	2010-12-30 16:59:09.933129015 -0600
-+++ lynx2-8-7/src/LYMain.c	2010-12-30 16:59:56.506438066 -0600
-@@ -57,7 +57,7 @@
- #include <io.h>
- #endif
- 
--#if defined(LOCALE) && !defined(HAVE_LIBINTL_H)
-+#if defined(LOCALE) && (!defined(HAVE_LIBINTL_H) || !defined(LC_ALL))
- #undef gettext			/* Solaris locale.h prototypes gettext() */
- #include <locale.h>
- #ifndef HAVE_GETTEXT
--- a/components/lynx/patches/02-init-openssl.patch	Mon Mar 02 14:09:07 2015 -0800
+++ b/components/lynx/patches/02-init-openssl.patch	Mon Mar 02 16:23:36 2015 -0800
@@ -1,15 +1,16 @@
 Disable SSLv2 and SSLv3 in lynx to "mitigate POODLE vulnerability".
 
-This change will be passed upstream.
+This change has been passed upstream.
 
---- lynx2-8-7/WWW/Library/Implementation/HTTP.c.orig	2015-01-29 08:30:29.185065523 -0800
-+++ lynx2-8-7/WWW/Library/Implementation/HTTP.c	2015-01-29 08:48:49.143858796 -0800
-@@ -123,6 +123,8 @@
+--- lynx2-8-8/WWW/Library/Implementation/HTTP.c.orig	2015-02-16 12:48:34.014809453 -0800
++++ lynx2-8-8/WWW/Library/Implementation/HTTP.c	2015-02-16 12:49:09.627395954 -0800
+@@ -119,7 +119,8 @@
+ #else
  	SSLeay_add_ssl_algorithms();
  	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
- 	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL);
+-	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
 +	/* Always disable SSLv2 & SSLv3 to "mitigate POODLE vulnerability". */
-+	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
- 	SSL_CTX_set_default_verify_paths(ssl_ctx);
- 	SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, HTSSLCallback);
- #endif /* SSLEAY_VERSION_NUMBER < 0x0800 */
++	SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+ #ifdef SSL_OP_NO_COMPRESSION
+ 	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_COMPRESSION);
+ #endif
upstream/oracle/userland-gate