# HG changeset patch # User Misaki Miyashita # Date 1402086525 25200 # Node ID 64093c7a1f5c682721f7fa83dc1d5278b039319f # Parent d5ec681afe01e24e42409d2317a845fb69170dd3 18913684 Upgrade OpenSSL to 1.0.1h 18889862 problem in UTILITY/OPENSSL 18889844 problem in UTILITY/OPENSSL 18889837 problem in UTILITY/OPENSSL 18889740 problem in UTILITY/OPENSSL 18889720 problem in UTILITY/OPENSSL 18889686 problem in UTILITY/OPENSSL diff -r d5ec681afe01 -r 64093c7a1f5c components/openssl/openssl-1.0.1-fips-140/Makefile --- a/components/openssl/openssl-1.0.1-fips-140/Makefile Thu Jun 05 02:15:23 2014 -0700 +++ b/components/openssl/openssl-1.0.1-fips-140/Makefile Fri Jun 06 13:28:45 2014 -0700 @@ -29,14 +29,14 @@ COMPONENT_NAME = openssl-fips-140 # Note that this is the OpenSSL version that is used to build FIPS-140 certified # libraries. However, we use the FIPS canister version for the IPS package. -COMPONENT_VERSION = 1.0.1g +COMPONENT_VERSION = 1.0.1h IPS_COMPONENT_VERSION = 2.0.6 COMPONENT_PROJECT_URL= http://www.openssl.org/ COMPONENT_SRC_NAME = openssl COMPONENT_SRC = $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE = $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 + sha256:9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 COMPONENT_ARCHIVE_URL = $(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/openssl diff -r d5ec681afe01 -r 64093c7a1f5c components/openssl/openssl-1.0.1-fips-140/openssl-1.0.1-fips-140.p5m --- a/components/openssl/openssl-1.0.1-fips-140/openssl-1.0.1-fips-140.p5m Thu Jun 05 02:15:23 2014 -0700 +++ b/components/openssl/openssl-1.0.1-fips-140/openssl-1.0.1-fips-140.p5m Fri Jun 06 13:28:45 2014 -0700 @@ -34,7 +34,7 @@ set name=pkg.human-version value=$(COMPONENT_VERSION) set name=com.oracle.info.description \ value="the FIPS 140-2 Capable OpenSSL libraries" -set name=com.oracle.info.tpno value=17171 +set name=com.oracle.info.tpno value=17979 set name=info.classification value=org.opensolaris.category.2008:System/Security set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) diff -r d5ec681afe01 -r 64093c7a1f5c components/openssl/openssl-1.0.1/Makefile --- a/components/openssl/openssl-1.0.1/Makefile Thu Jun 05 02:15:23 2014 -0700 +++ b/components/openssl/openssl-1.0.1/Makefile Fri Jun 06 13:28:45 2014 -0700 @@ -28,15 +28,15 @@ # When upgrading OpenSSL, please, DON'T FORGET TO TEST WANBOOT too. # For more information about wanboot-openssl testing, please refer to # ../README. -COMPONENT_VERSION = 1.0.1g +COMPONENT_VERSION = 1.0.1h # Version for IPS. It is easier to do it manually than convert the letter to a # number while taking into account that there might be no letter at all. -IPS_COMPONENT_VERSION = 1.0.1.7 +IPS_COMPONENT_VERSION = 1.0.1.8 COMPONENT_PROJECT_URL= http://www.openssl.org/ COMPONENT_SRC = $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE = $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 + sha256:9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 COMPONENT_ARCHIVE_URL = $(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/openssl diff -r d5ec681afe01 -r 64093c7a1f5c components/openssl/openssl-1.0.1/openssl-1.0.1.p5m --- a/components/openssl/openssl-1.0.1/openssl-1.0.1.p5m Thu Jun 05 02:15:23 2014 -0700 +++ b/components/openssl/openssl-1.0.1/openssl-1.0.1.p5m Fri Jun 06 13:28:45 2014 -0700 @@ -30,7 +30,7 @@ value="OpenSSL is a full-featured toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well as a full-strength general purpose cryptography library." set name=pkg.human-version value=$(COMPONENT_VERSION) set name=com.oracle.info.description value=OpenSSL -set name=com.oracle.info.tpno value=17171 +set name=com.oracle.info.tpno value=17979 set name=info.classification value=org.opensolaris.category.2008:System/Security set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)