23131855 Upgrade xml-simple to 2.22
authorJingning Ji <jingning.ji@oracle.com>
Thu, 22 Sep 2016 16:33:05 -0700
changeset 7117 f7dc231928a9
parent 7116 24e5d18aa27c
child 7118 42f3be2cf0ae
23131855 Upgrade xml-simple to 2.22
components/perl_modules/xml-simple/Makefile
components/perl_modules/xml-simple/patches/t-8_Namespaces.patch
components/perl_modules/xml-simple/xml-simple.license
--- a/components/perl_modules/xml-simple/Makefile	Mon Oct 17 09:22:53 2016 -0700
+++ b/components/perl_modules/xml-simple/Makefile	Thu Sep 22 16:33:05 2016 -0700
@@ -23,20 +23,23 @@
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
+# Note that the use of this module itself is discouraged in new code.
+# Other modules like XML::LibXML is highly recommended.
+
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		XML-Simple
-COMPONENT_VERSION=	2.20
+COMPONENT_VERSION=	2.22
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:5cff13d0802792da1eb45895ce1be461903d98ec97c9c953bc8406af7294434a
+    sha256:b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49
 COMPONENT_ARCHIVE_URL=	\
     http://www.cpan.org/authors/id/G/GR/GRANTM/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://search.cpan.org/~grantm/
 COMPONENT_BUGDB=	perl-mod/xml-parser
 
-TPNO=			17624
+TPNO=			31845
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
--- a/components/perl_modules/xml-simple/patches/t-8_Namespaces.patch	Mon Oct 17 09:22:53 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# Regex pattern needs updating for newer versions of perl.
-# This fix is from a newer version of this component.
-
-
---- XML-Simple-2.20/t/8_Namespaces.t_orig	2012-06-20 03:00:21.000000000 -0700
-+++ XML-Simple-2.20/t/8_Namespaces.t	2016-04-05 09:07:27.004767331 -0700
[email protected]@ -122,16 +122,16 @@
- };
- 
- $xml = XMLout($opt);
--like($xml, qr{
-+like($xml, qr[
-   ^\s*<opt
-   (\s+{http://www.w3.org/2000/xmlns/}perl="http://www.perl.com/"
-   |\s+{http://www.perl.com/}attr="value"
-   |\s+bare="Beer!"){3}
-   \s*>
--  \s*<{http://www.perl.com/}element\s*>data</{http://www.perl.com/}element\s*>
-+  \s*<\{http://www.perl.com/\}element\s*>data</\{http://www.perl.com/\}element\s*>
-   \s*</opt>
-   \s*$
--}sx, 'clarkian names not converted to qnames on output by default');
-+]sx, 'clarkian names not converted to qnames on output by default');
- 
- 
- # Confirm nsexpand option works on output
--- a/components/perl_modules/xml-simple/xml-simple.license	Mon Oct 17 09:22:53 2016 -0700
+++ b/components/perl_modules/xml-simple/xml-simple.license	Thu Sep 22 16:33:05 2016 -0700
@@ -1,174 +1,125 @@
-Portions of this program use xml-simple version 2.20, the open source version
-is made available by Grant McLean 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 xml-simple, and the
-terms contained in the following notices do not change those rights.
- 	 
-The current open source version of xml-simple can be downloaded at:
-http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz
+Portions of this program use xml-simple version 2.22, the open source version is made available by Grant McLean 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 xml-simple, and the terms contained in the following notices do not change those rights.
+
+The current open source version of xml-simple can be downloaded at: http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-Simple-2.22.tar.gz
 
-Oracle elects to license this file available under the Artistic License as
-expressly permitted by the Perl licensing terms.
+Oracle elects to license this file available under the Artistic License as expressly permitted by the Perl licensing terms.
+
+This software is copyright (c) 2015 by Grant McLean.
 
-  Copyright 1999-2004 Grant McLean <[email protected]>
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 
-  This library is free software; you can redistribute it
-  and/or modify it under the same terms as Perl itself.
-
-----------------------
+Terms of the Perl programming language system itself
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of either:
-
-        a) the GNU General Public License as published by the Free
-        Software Foundation; either version 1, or (at your option) any
-        later version, or
-
-        b) the "Artistic License" which comes with this Kit.
+a) the GNU General Public License as published by the Free
+   Software Foundation; either version 1, or (at your option) any
+   later version, or
+b) the "Artistic License"
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See either
-the GNU General Public License or the Artistic License for more details.
+--- The Artistic License 1.0 ---
+
+This software is Copyright (c) 2015 by Grant McLean.
 
-You should have received a copy of the Artistic License with this
-Kit, in the file named "Artistic".  If not, I'll be glad to provide one.
+This is free software, licensed under:
 
-You should also have received a copy of the GNU General Public License
-along with this program in the file named "Copying". If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA or visit their web page on the internet at
-http://www.gnu.org/copyleft/gpl.html.
+  The Artistic License 1.0
 
-=======================================================================
+The Artistic License
 
-Copyright (c) 1986 - 2010, Larry Wall and others
-
-	      	    The "Artistic License"
+Preamble
 
-					Preamble
-
-The intent of this document is to state the conditions under which a
-Package may be copied, such that the Copyright Holder maintains some
-semblance of artistic control over the development of the package,
-while giving the users of the package the right to use and distribute
-the Package in a more-or-less customary fashion, plus the right to make
-reasonable modifications.
+The intent of this document is to state the conditions under which a Package
+may be copied, such that the Copyright Holder maintains some semblance of
+artistic control over the development of the package, while giving the users of
+the package the right to use and distribute the Package in a more-or-less
+customary fashion, plus the right to make reasonable modifications.
 
 Definitions:
 
-	"Package" refers to the collection of files distributed by the
-	Copyright Holder, and derivatives of that collection of files
-	created through textual modification.
-
-	"Standard Version" refers to such a Package if it has not been
-	modified, or has been modified in accordance with the wishes
-	of the Copyright Holder as specified below.
-
-	"Copyright Holder" is whoever is named in the copyright or
-	copyrights for the package.
-
-	"You" is you, if you're thinking about copying or distributing
-	this Package.
-
-	"Reasonable copying fee" is whatever you can justify on the
-	basis of media cost, duplication charges, time of people involved,
-	and so on.  (You will not be required to justify it to the
-	Copyright Holder, but only to the computing community at large
-	as a market that must bear the fee.)
-
-	"Freely Available" means that no fee is charged for the item
-	itself, though there may be fees involved in handling the item.
-	It also means that recipients of the item may redistribute it
-	under the same conditions they received it.
+  - "Package" refers to the collection of files distributed by the Copyright
+    Holder, and derivatives of that collection of files created through
+    textual modification. 
+  - "Standard Version" refers to such a Package if it has not been modified,
+    or has been modified in accordance with the wishes of the Copyright
+    Holder. 
+  - "Copyright Holder" is whoever is named in the copyright or copyrights for
+    the package. 
+  - "You" is you, if you're thinking about copying or distributing this Package.
+  - "Reasonable copying fee" is whatever you can justify on the basis of media
+    cost, duplication charges, time of people involved, and so on. (You will
+    not be required to justify it to the Copyright Holder, but only to the
+    computing community at large as a market that must bear the fee.) 
+  - "Freely Available" means that no fee is charged for the item itself, though
+    there may be fees involved in handling the item. It also means that
+    recipients of the item may redistribute it under the same conditions they
+    received it. 
 
 1. You may make and give away verbatim copies of the source form of the
 Standard Version of this Package without restriction, provided that you
 duplicate all of the original copyright notices and associated disclaimers.
 
-2. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.
+2. You may apply bug fixes, portability fixes and other modifications derived
+from the Public Domain or from the Copyright Holder. A Package modified in such
+a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided that
+you insert a prominent notice in each changed file stating how and when you
+changed that file, and provided that you do at least ONE of the following:
 
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:
+  a) place your modifications in the Public Domain or otherwise make them
+     Freely Available, such as by posting said modifications to Usenet or an
+     equivalent medium, or placing the modifications on a major archive site
+     such as ftp.uu.net, or by allowing the Copyright Holder to include your
+     modifications in the Standard Version of the Package.
 
-    a) place your modifications in the Public Domain or otherwise make them
-    Freely Available, such as by posting said modifications to Usenet or
-    an equivalent medium, or placing the modifications on a major archive
-    site such as uunet.uu.net, or by allowing the Copyright Holder to include
-    your modifications in the Standard Version of the Package.
-
-    b) use the modified Package only within your corporation or organization.
+  b) use the modified Package only within your corporation or organization.
 
-    c) rename any non-standard executables so the names do not conflict
-    with standard executables, which must also be provided, and provide
-    a separate manual page for each non-standard executable that clearly
-    documents how it differs from the Standard Version.
+  c) rename any non-standard executables so the names do not conflict with
+     standard executables, which must also be provided, and provide a separate
+     manual page for each non-standard executable that clearly documents how it
+     differs from the Standard Version.
 
-    d) make other distribution arrangements with the Copyright Holder.
+  d) make other distribution arrangements with the Copyright Holder.
 
-4. You may distribute the programs of this Package in object code or
-executable form, provided that you do at least ONE of the following:
+4. You may distribute the programs of this Package in object code or executable
+form, provided that you do at least ONE of the following:
 
-    a) distribute a Standard Version of the executables and library files,
-    together with instructions (in the manual page or equivalent) on where
-    to get the Standard Version.
+  a) distribute a Standard Version of the executables and library files,
+     together with instructions (in the manual page or equivalent) on where to
+     get the Standard Version.
+
+  b) accompany the distribution with the machine-readable source of the Package
+     with your modifications.
 
-    b) accompany the distribution with the machine-readable source of
-    the Package with your modifications.
+  c) accompany any non-standard executables with their corresponding Standard
+     Version executables, giving the non-standard executables non-standard
+     names, and clearly documenting the differences in manual pages (or
+     equivalent), together with instructions on where to get the Standard
+     Version.
 
-    c) give non-standard executables non-standard names, and clearly
-    document the differences in manual pages (or equivalent), together
-    with instructions on where to get the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
+  d) make other distribution arrangements with the Copyright Holder.
 
 5. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this
-Package.  You may not charge a fee for this Package itself.  However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you do not advertise this Package as a
-product of your own.  You may embed this Package's interpreter within
-an executable of yours (by linking); this shall be construed as a mere
-form of aggregation, provided that the complete Standard Version of the
-interpreter is so embedded.
+Package.  You may charge any fee you choose for support of this Package. You
+may not charge a fee for this Package itself. However, you may distribute this
+Package in aggregate with other (possibly commercial) programs as part of a
+larger (possibly commercial) software distribution provided that you do not
+advertise this Package as a product of your own.
 
-6. The scripts and library files supplied as input to or produced as
-output from the programs of this Package do not automatically fall
-under the copyright of this Package, but belong to whoever generated
-them, and may be sold commercially, and may be aggregated with this
-Package.  If such scripts or library files are aggregated with this
-Package via the so-called "undump" or "unexec" methods of producing a
-binary executable image, then distribution of such an image shall
-neither be construed as a distribution of this Package nor shall it
-fall under the restrictions of Paragraphs 3 and 4, provided that you do
-not represent such an executable image as a Standard Version of this
-Package.
+6. The scripts and library files supplied as input to or produced as output
+from the programs of this Package do not automatically fall under the copyright
+of this Package, but belong to whomever generated them, and may be sold
+commercially, and may be aggregated with this Package.
 
-7. C subroutines (or comparably compiled subroutines in other
-languages) supplied by you and linked into this Package in order to
-emulate subroutines and variables of the language defined by this
-Package shall not be considered part of this Package, but are the
-equivalent of input as in Paragraph 6, provided these subroutines do
-not change the language in any way that would cause it to fail the
-regression tests for the language.
+7. C or perl subroutines supplied by you and linked into this Package shall not
+be considered part of this Package.
 
-8. Aggregation of this Package with a commercial distribution is always
-permitted provided that the use of this Package is embedded; that is,
-when no overt attempt is made to make this Package's interfaces visible
-to the end user of the commercial distribution.  Such use shall not be
-construed as a distribution of this Package.
-
-9. The name of the Copyright Holder may not be used to endorse or promote
+8. The name of the Copyright Holder may not be used to endorse or promote
 products derived from this software without specific prior written permission.
 
-10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-	      		      	  The End
+The End
+