22903703 Update perl module Net-SSLeay to 1.78
authorEsha Wang <esha.wang@oracle.com>
Fri, 23 Dec 2016 13:56:44 -0800
changeset 7526 196c04a6f823
parent 7525 947a050aafb2
child 7527 352b7a456c30
22903703 Update perl module Net-SSLeay to 1.78
components/perl_modules/net-ssleay/Makefile
components/perl_modules/net-ssleay/net-ssleay.copyright
components/perl_modules/net-ssleay/patches/test_fix.patch
components/perl_modules/net-ssleay/test/results-all.master
--- a/components/perl_modules/net-ssleay/Makefile	Fri Dec 23 01:33:53 2016 -0800
+++ b/components/perl_modules/net-ssleay/Makefile	Fri Dec 23 13:56:44 2016 -0800
@@ -26,15 +26,15 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		Net-SSLeay
-COMPONENT_VERSION=	1.52
+COMPONENT_VERSION=	1.78
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_PROJECT_URL=	http://search.cpan.org/dist/Net-SSLeay/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:48ece32f8f1b4c20acedfcaefd5d66f0ab8818ae6f994ab7c02da7f42e6d77ba
+    sha256:e7f56427602f897446013b84b9ff51b8e8ab4fce0bbd086c4e28c198a942ed53
 COMPONENT_ARCHIVE_URL=	http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	perl-mod/net-ssleay
-TPNO=			21963
+TPNO=			33013
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/makemaker.mk
--- a/components/perl_modules/net-ssleay/net-ssleay.copyright	Fri Dec 23 01:33:53 2016 -0800
+++ b/components/perl_modules/net-ssleay/net-ssleay.copyright	Fri Dec 23 13:56:44 2016 -0800
@@ -1,26 +1,205 @@
+Portions of this program use Net-SSLeay version 1.78, the open source version is
+made available by CPAN under the terms of the below version of the Artistic 
+License.  As such, Oracle is required to provide the following notices.  Note, 
+however, that the Oracle program license that accompanied this program 
+determines your right to use the Oracle program, including Net-SSLeay, and the 
+terms contained in the following notices do not change those rights.
+
+Oracle elects to license this file available under the Artistic License as 
+expressly permitted by the Perl licensing terms.
+
+This product includes software developed by the OpenSSL Project for use in the 
+OpenSSL Toolkit (http://www.openssl.org/). This product includes cryptographic 
+software written by Eric Young ([email protected]).  This product includes 
+software written by Tim Hudson ([email protected]).
+
 Copyright (c) 1996-2002 Sampo Kellomaki <[email protected]>
 Copyright (c) 2005 Florian Ragwitz <[email protected]>
 Copyright (c) 2005 Mike McCauley <[email protected]>
+
 All Rights Reserved.
 
-Distribution and use of this module is under the same terms as the
-OpenSSL package itself (i.e. free, but mandatory attribution; NO
-WARRANTY). Please consult LICENSE file in the root of the OpenSSL
-distribution.
+From version
+1.66 onwards, this Net-SSLeay package is issued under the "Perl Artistic
+License 2.0", the same license as Perl itself.
 
-While the source distribution of this perl module does not contain
-Eric's or OpenSSL's code, if you use this module you will use OpenSSL
-library. Please give Eric and OpenSSL team credit (as required by
-their licenses).
+The Authors credit Eric Young and the OpenSSL team with the development of the
+excellent OpenSSL library, which this Perl package uses.
 
 And remember, you, and nobody else but you, are responsible for
 auditing this module and OpenSSL library for security problems,
 backdoors, and general suitability for your application.
 
+-------------------------
+Perl Artistic License 2.0
+-------------------------
 
---------
+Artistic License 2.0
+Copyright (c) 2000-2006, The Perl Foundation.
+
+Everyone is permitted to copy and distribute verbatim copies of this license 
+document, but changing it is not allowed.
+
+Preamble
+This license establishes the terms under which a given free software Package 
+may be copied, modified, distributed, and/or redistributed. The intent is that 
+the Copyright Holder maintains some artistic control over the development of 
+that Package while still keeping the Package available as open source and free 
+software.
+
+You are always permitted to make arrangements wholly outside of this license 
+directly with the Copyright Holder of a given Package. If the terms of this 
+license do not permit the full use that you propose to make of the Package, you 
+should contact the Copyright Holder and seek a different licensing arrangement.
+
+Definitions
+"Copyright Holder" means the individual(s) or organization(s) named in the 
+copyright notice for the entire Package.
+
+"Contributor" means any party that has contributed code or other material to 
+the Package, in accordance with the Copyright Holder's procedures.
+
+"You" and "your" means any person who would like to copy, distribute, or modify 
+the Package.
+
+"Package" means the collection of files distributed by the Copyright Holder, 
+and derivatives of that collection and/or of those files. A given Package may 
+consist of either the Standard Version, or a Modified Version.
+
+"Distribute" means providing a copy of the Package or making it accessible to 
+anyone else, or in the case of a company or organization, to others outside of 
+your company or organization.
+
+"Distributor Fee" means any fee that you charge for Distributing this Package 
+or providing support for this Package to another party. It does not mean 
+licensing fees.
+
+"Standard Version" refers to the Package if it has not been modified, or has 
+been modified only in ways explicitly requested by the Copyright Holder.
+
+"Modified Version" means the Package, if it has been changed, and such changes 
+were not explicitly requested by the Copyright Holder.
+
+"Original License" means this Artistic License as Distributed with the Standard 
+Version of the Package, in its current version or as it may be modified by The 
+Perl Foundation in the future.
+
+"Source" form means the source code, documentation source, and configuration 
+files for the Package.
+
+"Compiled" form means the compiled bytecode, object code, binary, or any other 
+form resulting from mechanical transformation or translation of the Source form.
+
+Permission for Use and Modification Without Distribution
+(1) You are permitted to use the Standard Version and create and use Modified 
+Versions for any purpose without restriction, provided that you do not 
+Distribute the Modified Version.
+
+Permissions for Redistribution of the Standard Version
+(2) You may Distribute verbatim copies of the Source form of the Standard 
+Version of this Package in any medium without restriction, either gratis or for 
+a Distributor Fee, provided that you duplicate all of the original copyright 
+notices and associated disclaimers. At your discretion, such verbatim copies 
+may or may not include a Compiled form of the Package.
+
+(3) You may apply any bug fixes, portability changes, and other modifications 
+made available from the Copyright Holder. The resulting Package will still be 
+considered the Standard Version, and as such will be subject to the Original 
+License.
+
+Distribution of Modified Versions of the Package as Source
+(4) You may Distribute your Modified Version as Source (either gratis or for a 
+Distributor Fee, and with or without a Compiled form of the Modified Version) 
+provided that you clearly document how it differs from the Standard Version, 
+including, but not limited to, documenting any non-standard features, 
+executables, or modules, and provided that you do at least ONE of the following:
+
+(a) make the Modified Version available to the Copyright Holder of the Standard 
+Version, under the Original License, so that the Copyright Holder may include 
+your modifications in the Standard Version.
+(b) ensure that installation of your Modified Version does not prevent the user 
+installing or running the Standard Version. In addition, the Modified Version 
+must bear a name that is different from the name of the Standard Version.
+(c) allow anyone who receives a copy of the Modified Version to make the Source 
+form of the Modified Version available to others under
+(i) the Original License or
+(ii) a license that permits the licensee to freely copy, modify and 
+redistribute the Modified Version using the same licensing terms that apply to 
+the copy that the licensee received, and requires that the Source form of the 
+Modified Version, and of any works derived from it, be made freely available in 
+that license fees are prohibited but Distributor Fees are allowed.
+
+Distribution of Compiled Forms of the Standard Version or Modified Versions 
+without the Source
+(5) You may Distribute Compiled forms of the Standard Version without the 
+Source, provided that you include complete instructions on how to get the 
+Source of the Standard Version. Such instructions must be valid at the time of 
+your distribution. If these instructions, at any time while you are carrying 
+out such distribution, become invalid, you must provide new instructions on 
+demand or cease further distribution. If you provide valid instructions or 
+cease distribution within thirty days after you become aware that the 
+instructions are invalid, then you do not forfeit any of your rights under this 
+license.
+
+(6) You may Distribute a Modified Version in Compiled form without the Source, 
+provided that you comply with Section 4 with respect to the Source of the 
+Modified Version.
+
+Aggregating or Linking the Package
+(7) You may aggregate the Package (either the Standard Version or Modified 
+Version) with other packages and Distribute the resulting aggregation provided 
+that you do not charge a licensing fee for the Package. Distributor Fees are 
+permitted, and licensing fees for other components in the aggregation are 
+permitted. The terms of this license apply to the use and Distribution of the 
+Standard or Modified Versions as included in the aggregation.
+
+(8) You are permitted to link Modified and Standard Versions with other works, 
+to embed the Package in a larger work of your own, or to build stand-alone 
+binary or bytecode versions of applications that include the Package, and 
+Distribute the result without restriction, provided the result does not expose 
+a direct interface to the Package.
+
+Items That are Not Considered Part of a Modified Version
+(9) Works (including, but not limited to, modules and scripts) that merely 
+extend or make use of the Package, do not, by themselves, cause the Package to 
+be a Modified Version. In addition, such works are not considered parts of the 
+Package itself, and are not subject to the terms of this license.
+
+General Provisions
+(10) Any use, modification, and distribution of the Standard or Modified 
+Versions is governed by this Artistic License. By using, modifying or 
+distributing the Package, you accept this license. Do not use, modify, or 
+distribute the Package, if you do not accept this license.
+
+(11) If your Modified Version has been derived from a Modified Version made by 
+someone other than you, you are nevertheless required to ensure that your 
+Modified Version complies with the requirements of this license.
+
+(12) This license does not grant you the right to use any trademark, service 
+mark, tradename, or logo of the Copyright Holder.
+
+(13) This license includes the non-exclusive, worldwide, free-of-charge patent 
+license to make, have made, use, offer to sell, sell, import and otherwise 
+transfer the Package with respect to any patent claims licensable by the 
+Copyright Holder that are necessarily infringed by the Package. If you 
+institute patent litigation (including a cross-claim or counterclaim) against 
+any party alleging that the Package constitutes direct or contributory patent 
+infringement, then this Artistic License to you shall terminate on the date 
+that such litigation is filed.
+
+(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER 
+AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR 
+NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. 
+UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR 
+ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY 
+OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
+DAMAGE.
+
+
+---------------
 OpenSSL License
---------
+---------------
 
   LICENSE ISSUES
   ==============
--- a/components/perl_modules/net-ssleay/patches/test_fix.patch	Fri Dec 23 01:33:53 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# A change in OpenSSL changes the hash that is expected.  This updates the hash.
-# This will not be sent up stream since it is already fixed in later versions.
-diff -ur orig_Net-SSLeay-1.52/t/local/33_x509_create_cert.t Net-SSLeay-1.52/t/local/33_x509_create_cert.t
---- orig_Net-SSLeay-1.52/t/local/33_x509_create_cert.t	2015-02-05 10:23:55.296178177 -0800
-+++ Net-SSLeay-1.52/t/local/33_x509_create_cert.t	2015-02-05 10:27:24.727716789 -0800
[email protected]@ -104,7 +104,7 @@
-   like(my $key_pem4 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg2), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg");
-   
-   is(Net::SSLeay::X509_NAME_print_ex($name), "O=Company Name,C=UK,CN=Common name text X509", "X509_NAME_print_ex");  
--  is(unpack("H*",Net::SSLeay::X509_NAME_digest($name, $sha1_digest)), "044d7ea7fddced7b9b63799600b9989a63b36819", "X509_NAME_digest");
-+  is(unpack("H*",Net::SSLeay::X509_NAME_digest($name, $sha1_digest)), "ce83889f1beab8e70aa142e07e94b0ebbd9d59e0", "X509_NAME_digest");
-   
-   ok(my $ext_idx = Net::SSLeay::X509_get_ext_by_NID($x509, &Net::SSLeay::NID_ext_key_usage), "X509_get_ext_by_NID");
-   ok(my $ext = Net::SSLeay::X509_get_ext($x509, $ext_idx), "X509_get_ext");
--- a/components/perl_modules/net-ssleay/test/results-all.master	Fri Dec 23 01:33:53 2016 -0800
+++ b/components/perl_modules/net-ssleay/test/results-all.master	Fri Dec 23 13:56:44 2016 -0800
@@ -1,6 +1,6 @@
 t/handle/local/05_use.t ................ ok
 t/local/01_pod.t ....................... skipped: Test::Pod 1.00 required for testing POD
-t/local/02_pod_coverage.t .............. skipped: Test::Pod::Coverage 1.00 required for testing POD coverage
+t/local/02_pod_coverage.t .............. skipped: these tests are for only for release candidate testing. Enable with RELEASE_TESTING=1
 t/local/03_use.t ....................... ok
 t/local/04_basic.t ..................... ok
 t/local/05_passwd_cb.t ................. ok
@@ -13,13 +13,7 @@
 t/local/30_error.t ..................... skipped: Requires Test::Exception, Test::Warn and Test::NoWarnings
 t/local/31_rsa_generate_key.t .......... skipped: Test::Exception required
 t/local/32_x509_get_cert_info.t ........ ok
-
-#   Failed test 'PEM_get_string_PrivateKey+passwd+enc_alg'
-#   at t/local/33_x509_create_cert.t line 104.
-#                   undef
-# Looks like you failed 1 test of 124.
-t/local/33_x509_create_cert.t .......... 
-Dubious, test returned 1 (wstat 256, 0x100)
+t/local/33_x509_create_cert.t .......... ok
 t/local/34_x509_crl.t .................. ok
 t/local/35_ephemeral.t ................. ok
 t/local/36_verify.t .................... ok
@@ -27,12 +21,11 @@
 t/local/38_priv-key.t .................. ok
 t/local/39_pkcs12.t .................... ok
 t/local/40_npn_support.t ............... ok
+t/local/41_alpn_support.t .............. ok
+t/local/42_info_callback.t ............. ok
 t/local/50_digest.t .................... ok
-t/local/kwalitee.t ..................... skipped: Test::Kwalitee not installed; skipping
-
-Test Summary Report
--------------------
-t/local/33_x509_create_cert.t        (Wstat: 256 Tests: 124 Failed: 1)
-  Failed test:  39
-  Non-zero exit status: 1
-Result: FAIL
+t/local/63_ec_key_generate_key.t ....... ok
+t/local/64_ticket_sharing.t ............ ok
+t/local/kwalitee.t ..................... skipped: these tests are for only for release candidate testing. Enable with RELEASE_TESTING=1
+All tests successful.
+Result: PASS