16431724 Adjust how license text and Oracle internal tracking numbers are propagated
--- a/components/a2ps/a2ps.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/a2ps/a2ps.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
---------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/a2ps/a2ps.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/a2ps/a2ps.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -28,6 +28,7 @@
value="GNU a2ps converts files into PostScript for printing or viewing."
set name=pkg.summary \
value="GNU a2ps - 'Anything to PostScript' converter and pretty printer"
+set name=com.oracle.info.description value="GNU a2ps"
set name=info.classification \
value=org.opensolaris.category.2008:System/Printing
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/aalib/aalib.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/aalib/aalib.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=====================================================================
-
Copyright (C) 1997-2009 Jan Hubicka ([email protected])
Copyright (C) 1997-2009 Thomas A. K. Kjaer ([email protected])
Copyright (C) 1997-2009 Tim Newsome ([email protected])
--- a/components/aalib/aalib.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/aalib/aalib.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
set name=pkg.fmri value=pkg:/library/aalib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="AAlib - Ascii art graphics library"
+set name=com.oracle.info.description value="the AAlib library"
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/acpidump/acpidump.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/acpidump/acpidump.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------
-
Copyright (c) 1999 - 2006, Intel Corp.
--- a/components/acpidump/acpidump.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/acpidump/acpidump.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommited>
@@ -29,6 +29,7 @@
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary \
value="acpidump - utilities used to display ACPI tables"
+set name=com.oracle.info.description value="the acpidump utilities"
set name=info.classification \
value="org.opensolaris.category.2008:System/Administration and Configuration"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ant/ant.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ant/ant.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-
--------------
-- ant 1.8.4 -
--------------
-
-Oracle Internal Tracking Number : 6147
-
-
File NOTICE:
---------------------------------------------------
--- a/components/ant/ant.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ant/ant.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -28,6 +28,8 @@
value=pkg:/developer/build/ant@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="Apache Ant is a Java-based build tool"
set name=pkg.summary value="Apache Ant"
+set name=com.oracle.info.description value="Apache Ant"
+set name=com.oracle.info.tpno value=6147
set name=info.classification \
value="org.opensolaris.category.2008:Development/Distribution Tools"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/apache2-modules/mod_dtrace/apache-dtrace.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_dtrace/apache-dtrace.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/apache-dtrace@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="DTrace plugin for Apache Web Server V2.2"
+set name=com.oracle.info.description value="the DTrace plugin for Apache Web Server V2.2"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_fcgid/apache-fcgid.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_fcgid/apache-fcgid.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/apache-fcgid@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
value="FastCGI plugin for Apache Web Server V2.2"
set name=pkg.description \
value="FastCGI plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the FastCGI plugin for Apache Web Server V2.2"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_jk/apache-jk.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_jk/apache-jk.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/apache-jk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
value="Tomcat Connector plugin for Apache Web Server V2.2"
set name=pkg.description \
value="Tomcat Connector plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the Tomcat Connector plugin for Apache Web Server V2.2"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_perl/apache-perl.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_perl/apache-perl.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
@@ -27,6 +27,7 @@
value="Perl plugin for Apache Web Server V2.2"
set name=pkg.description \
value="Perl plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the Perl plugin for Apache Web Server V2.2"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_proxy_html/apache-proxy_html.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_proxy_html/apache-proxy_html.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/apache-proxy_html@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
value="Proxy HTML plugin for Apache Web Server V2.2"
set name=pkg.description \
value="Proxy HTML plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the Proxy HTML plugin for Apache Web Server V2.2"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/[email protected],$(BUILD_VERSION)
@@ -26,6 +26,7 @@
value="xml2nec plugin for Apache Web Server V2.2"
set name=pkg.description \
value="xml2enc plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the xml2nec plugin for Apache Web Server V2.2"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value="http://apache.webthing.com/mod_xml2enc/"
--- a/components/apache2-modules/mod_security2/apache-security.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_security2/apache-security.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/apache-security@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
value="Mod Security plugin for Apache Web Server V2.2"
set name=pkg.description \
value="Mod Security plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the Mod Security plugin for Apache Web Server V2.2"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_security2/security2.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_security2/security2.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/apache2-modules/mod_wsgi/mod_wsgi-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,13 +20,15 @@
#
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/apache-wsgi-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Python 2.6 mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.description value="the Python 2.6 mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.tpno value=7687
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/apache2-modules/mod_wsgi/mod_wsgi-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,13 +20,15 @@
#
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/apache-wsgi-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Python 2.7 mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.description value="the Python 2.7 mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.tpno value=7687
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/apache2-modules/mod_wsgi/mod_wsgi.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------
-- mod_wsgi 3.3 -
-----------------
-
-Oracle Internal Tracking Number 7687
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
--- a/components/apache2-modules/mod_wsgi/mod_wsgi.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,12 +20,14 @@
#
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/apache-wsgi@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.description value="the mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.tpno value=7687
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/apache2/apache-22.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2/apache-22.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
@@ -27,6 +27,7 @@
value="Apache Web Server V2.2"
set name=pkg.description \
value="The Apache HTTP Server Version 2.2"
+set name=com.oracle.info.description value="the Apache Web Server V2.2"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2/apache-sed.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2/apache-sed.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/apache-sed@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
value="mod_sed plugin for Apache Web Server V2.2"
set name=pkg.description \
value="mod_sed plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the mod_sed plugin for Apache Web Server V2.2"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value="$(COMPONENT_PROJECT_URL)/docs/2.3/mod/mod_sed.html"
--- a/components/apache2/documentation.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2/documentation.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -28,6 +28,7 @@
value="Apache Web Server V2.2 Documentation"
set name=pkg.description \
value="The Apache HTTP Server Version 2.2 (documentation)"
+set name=com.oracle.info.description value="the Apache Web Server V2.2 Documentation"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr-util/apr-util-13-apr-ldap.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr-util/apr-util-13-apr-ldap.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/apr-util-13/apr-ldap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Apache Portable Runtime Utility (APR-util) 1.3 LDAP's stub"
+set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 LDAP's stub"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr-util/apr-util-13-dbd-mysql.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr-util/apr-util-13-dbd-mysql.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/apr-util-13/dbd-mysql@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
- value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL 5.0"
+ value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL"
+set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr-util/apr-util-13-dbd-sqlite.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr-util/apr-util-13-dbd-sqlite.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/apr-util-13/dbd-sqlite@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
- value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite 3.5"
+ value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite"
+set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr-util/apr-util-13-doc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr-util/apr-util-13-doc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/apr-util/1.3/manual/(.+)$ -> set action.hash %<\1> >
<transform file path=usr/apr-util/1.3/manual/search/(.+)$ -> set action.hash %<\1> >
@@ -27,6 +27,7 @@
value=pkg:/library/apr-util-13/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Apache Portable Runtime Utility (APR-util) 1.3 documentation"
+set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 documentation"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr-util/apr-util-13.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr-util/apr-util-13.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/apr-util-13@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Apache Portable Runtime Utility (APR-util) 1.3 development header files and libraries"
+set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 development header files and libraries"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr/apr-13-doc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr/apr-13-doc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/apr/1.3/manual/(.+)$ -> set action.hash %<\1> >
<transform file path=usr/apr/1.3/manual/search/(.+)$ -> set action.hash %<\1> >
@@ -27,6 +27,7 @@
value=pkg:/library/apr-13/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Apache Portable Runtime (APR) 1.3 documentation"
+set name=com.oracle.info.description value="the Apache Portable Runtime (APR) 1.3 documentation"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr/apr-13.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr/apr-13.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/apr-13@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
value="Apache Portable Runtime (APR) 1.3 Shared Libraries"
set name=pkg.description \
value="The shared libraries for any component using Apache Portable Runtime (APR) Version 1.3"
+set name=com.oracle.info.description value="the Apache Portable Runtime (APR) 1.3 Shared Libraries"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/areca/areca.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/areca/areca.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------
-- areca 7.1 -
--------------
-
-Oracle Internal Tracking Number 6138
-
Copyright 2005-2009, Olivier PETRUCCI.
This program is distributed under the GNU General Public License v2.
--- a/components/areca/areca.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/areca/areca.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -34,6 +34,8 @@
set name=pkg.description \
value="Areca is file backup software that supports incremental, image and delta backup on local drives or FTP servers."
set name=pkg.summary value="Areca backup utilities."
+set name=com.oracle.info.description value="the Areca file backup software"
+set name=com.oracle.info.tpno value=6138
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/autoconf/autoconf.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/autoconf/autoconf.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
---------------------------------------------------------------------
-
-Copyright (C) 1985-2008 Free Software Foundation, Inc.
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/autoconf/autoconf.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/autoconf/autoconf.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/developer/build/autoconf@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU autoconf utility"
+set name=com.oracle.info.description value="GNU autoconf"
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/autogen/autogen.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/autogen/autogen.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------
-- autogen 5.9 -
----------------
-
-Oracle Internal Tracking Number 6148
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/autogen/autogen.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/autogen/autogen.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="AutoGen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text."
set name=pkg.summary value="GNU autogen utility"
+set name=com.oracle.info.description value="GNU autogen"
+set name=com.oracle.info.tpno value=6148
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/automake/automake-1.10/automake.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/automake/automake-1.10/automake.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,19 +1,3 @@
------------------
-- automake 1.10 -
------------------
-
-Oracle Internal Tracking Number 6149
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/automake/automake-1.10/automake.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/automake/automake-1.10/automake.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/developer/build/automake-110@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A Makefile generator"
+set name=com.oracle.info.description value="GNU automake"
+set name=com.oracle.info.tpno value=6149
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/automake/automake-1.11.2/automake-111.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/automake/automake-1.11.2/automake-111.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri \
value=pkg:/developer/build/automake-111@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A Makefile generator"
+set name=com.oracle.info.description value="GNU automake"
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/automake/automake-1.11.2/automake.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/automake/automake-1.11.2/automake.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/automake/automake-1.11.2/automake.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/automake/automake-1.11.2/automake.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/developer/build/automake@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A Makefile generator"
+set name=com.oracle.info.description value="GNU automake"
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/bash/bash.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bash/bash.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/bash/bash.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bash/bash.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri \
value=pkg:/shell/bash@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU Bourne-Again shell (bash)"
+set name=com.oracle.info.description value="GNU Bourne-Again shell (bash)"
set name=info.classification value=org.opensolaris.category.2008:System/Shells
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/bcc/bcc.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bcc/bcc.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/bcc/bcc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bcc/bcc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/developer/bcc@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="bcc - Development tools for 8086 code"
+set name=pkg.summary value="Bruce's C Compiler"
+set name=pkg.description value="bcc is a suite of development tools for 8086 code, including a compiler, an assembler, a linker, and an archive utility."
+set name=com.oracle.info.description value="Bruce's C Compiler"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/beanshell/beanshell.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/beanshell/beanshell.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
*****************************************************************************
* *
* This file is part of the BeanShell Java Scripting distribution. *
--- a/components/beanshell/beanshell.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/beanshell/beanshell.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary value="beanshell - a small and embeddable Java source interpreter"
set name=pkg.description value="BeanShell is a small, free, embeddable Java source interpreter with object scripting language features, written in Java. BeanShell dynamically executes standard Java syntax and extends it with common scripting conveniences such as loose types, commands, and method closures like those in Perl and JavaScript."
+set name=com.oracle.info.description value="the beanshell Java source interpreter"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Java"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/berkeleydb/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/berkeleydb/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -83,6 +83,9 @@
$(BUILD_DIR)/%/.tested: configure_test= --enable-test
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
build: $(BUILD_32_and_64)
--- a/components/bind/bind.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bind/bind.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-This package may include technology which may be subject to one or more of
-the following additional notices:
-
--------------------
-- BIND 9.6-ESV-R8 -
--------------------
-
-Oracle Internal Tracking Number: 10598
-
Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
Copyright (C) 1996-2003 Internet Software Consortium.
--- a/components/bind/bind.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bind/bind.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/share/doc/bind/html/(.+)$ -> \
@@ -30,7 +30,9 @@
set name=pkg.description \
value="BIND is open source software that implements the Domain Name System (DNS) protocols for the Internet. This package contains the DNS server 'named' and tools used to setup and validate configuration."
set name=pkg.summary \
- value="BIND DNS Name server and configuration tools."
+ value="BIND DNS name server and configuration tools."
+set name=com.oracle.info.description value="the BIND DNS name server and configuration tools"
+set name=com.oracle.info.tpno value=10598
set name=info.classification \
value="org.opensolaris.category.2008:System/Services"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/bind/bindc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bind/bindc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary value="BIND DNS tools"
+set name=com.oracle.info.description value="the BIND DNS tools"
+set name=com.oracle.info.tpno value=10598
set name=info.classification \
value="org.opensolaris.category.2008:Applications/Internet"
set name=pkg.description value="DNS tools and related libraries."
--- a/components/binutils/binutils.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/binutils/binutils.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------------
-- GNU Binutils v2.23.1 -
--------------------------
-Oracle Internal Tracking Number 7483
---------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/binutils/binutils.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/binutils/binutils.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -27,6 +27,8 @@
set name=pkg.fmri \
value=pkg:/developer/gnu-binutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="binutils - GNU binutils"
+set name=com.oracle.info.description value="GNU binutils"
+set name=com.oracle.info.tpno value=7483
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/bison/bison-runtime.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bison/bison-runtime.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,8 @@
set name=pkg.description \
value="Runtime library for a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for that grammar."
set name=pkg.summary value="bison - A YACC Replacement (Runtime Libraries)"
+set name=com.oracle.info.description value="the bison runtime libraries"
+set name=com.oracle.info.tpno value=6254
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/bison/bison.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bison/bison.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------
-- bison 2.3 -
--------------
-
-Oracle Internal Tracking Number 6254
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/bison/bison.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bison/bison.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,8 @@
set name=pkg.description \
value="a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for that grammar"
set name=pkg.summary value="bison - A YACC Replacement"
+set name=com.oracle.info.description value="the bison parser generator"
+set name=com.oracle.info.tpno value=6254
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/bzip2/bzip2.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bzip2/bzip2.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-----------------
-- bzip2 1.0.6 -
-----------------
-
-Oracle Internal Tracking Number 5547
-
---------------------------------------------------------------------------
-
This program, "bzip2", the associated library "libbzip2", and all
documentation, are copyright (C) 1996-2010 Julian R Seward. All
rights reserved.
--- a/components/bzip2/bzip2.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bzip2/bzip2.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -30,6 +30,8 @@
value="bzip2 is a freely available, patent free, high-quality data compressor."
set name=pkg.summary \
value="high-quality block-sorting file compressor - utilities"
+set name=com.oracle.info.description value="the bzip2 data compression utility"
+set name=com.oracle.info.tpno value=5547
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/cdrtools/cdrtools.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cdrtools/cdrtools.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/media/cdrtools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="CD/DVD/BluRay command line recording software"
+set name=com.oracle.info.description value="the cdrtools CD/DVD/BluRay recording software"
set name=info.classification value="org.opensolaris.category.2008:System/Media"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid \
--- a/components/clisp/clisp.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/clisp/clisp.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------
-- clisp 2.49 -
---------------
-
-Oracle Internal Tracking Number 8347
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/clisp/clisp.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/clisp/clisp.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
value=pkg:/runtime/clisp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="ANSI Common Lisp compiler, interpreter and debugger"
set name=pkg.summary value="GNU Common Lisp"
+set name=com.oracle.info.description value="GNU Common Lisp"
+set name=com.oracle.info.tpno value=8347
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/cmake/cmake.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cmake/cmake.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
------------------
-- CMake 2.8.6 -
------------------
-Oracle Internal Tracking Number 6581
-------------------------------------------------------------------------------
-
-Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-
-This package may include technology which may be subject to one or more of the
-following additional notices:
-
========================================================================
CMAKE BSD LICENSE:
========================================================================
--- a/components/cmake/cmake.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cmake/cmake.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -33,6 +33,8 @@
set name=pkg.summary value="A cross-platform, open-source make system"
set name=pkg.description \
value="CMake is a family of tools designed to build, test and package software. It is used to control the software compilation process using simple platform and compiler-independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice. "
+set name=com.oracle.info.description value="the cmake cross-platform make system"
+set name=com.oracle.info.tpno value=6581
set name=info.classification \
value="org.opensolaris.category.2008:Development/Distribution Tools"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/common/gcmn.license Fri Apr 05 07:47:58 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,350 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- Appendix: How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- 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 the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
--- a/components/common/gcmn.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/common/gcmn.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,18 +18,17 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/system/prerequisite/gnu@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="gcmn - Common GNU package"
+set name=pkg.summary value="GNU prerequisites"
set name=info.classification \
value="org.opensolaris.category.2008:Development/GNU"
set name=org.opensolaris.arc-caseid \
value=PSARC/2000/487
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license gcmn.license license=GPLv2
dir path=usr
dir path=usr/sfw
--- a/components/conflict/conflict.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/conflict/conflict.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------------
-- conflict 20100627 -
----------------------
-
-Oracle Internal Tracking Number 5761
-
Copyright 1995-2004,2010 by Thomas E. Dickey
Permission to use, copy, modify, and distribute this software and its
--- a/components/conflict/conflict.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/conflict/conflict.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,8 @@
set name=pkg.fmri \
value=pkg:/shell/conflict@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Displays conflicting filenames in $PATH (6.0)"
+set name=com.oracle.info.description value="the conflict utility"
+set name=com.oracle.info.tpno value=5761
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/convmv/convmv.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/convmv/convmv.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
----------------
-- convmv 1.15 -
----------------
-
-Oracle Internal Tracking Number 6307
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-----------------------------------------------------------------------
Copyright © 2003-2008 Bjoern JACKE <[email protected]>
GNU GENERAL PUBLIC LICENSE
--- a/components/convmv/convmv.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/convmv/convmv.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="Convmv helps convert a single filename, a directory tree and the contained files or a whole filesystem into a different encoding."
set name=pkg.summary value="Filename Encoding Conversion Tool"
+set name=com.oracle.info.description value="the convmv utility"
+set name=com.oracle.info.tpno value=6307
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/coreutils/coreutils.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/coreutils/coreutils.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
---
-
-Copyright (C) 1984-1986, 1988-2009 Free Software Foundation, Inc. And others
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/coreutils/coreutils.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/coreutils/coreutils.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="GNU Core Utilities are the basic file, shell and text manipulation utilities"
set name=pkg.summary value="GNU Core Utilities"
+set name=com.oracle.info.description value="GNU Core Utilities"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/cups/cups-libs.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cups/cups-libs.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/print/cups-libs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="CUPS (Runtime Libraries)"
+set name=pkg.summary value="Common Unix Print System (CUPS) runtime libraries"
+set name=com.oracle.info.description value="the Common Unix Print System (CUPS) runtime libraries"
set name=info.classification value="org.opensolaris.category.2008:System/Printing"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/cups/cups-license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cups/cups-license Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
--------------------------------------------------------------------------------
CUPS License Agreement
Copyright 2007-2009 by Apple Inc.
--- a/components/cups/cups.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cups/cups.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
# This is the template for package manifest (.p5m) file
@@ -35,7 +35,8 @@
<transform file path=usr/lib/cups/.+ ->default mode 0555>
set name=pkg.fmri value=pkg:/print/cups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Common Unix Print System"
+set name=pkg.summary value="Common Unix Print System (CUPS)"
+set name=com.oracle.info.description value="the Common Unix Print System (CUPS)"
set name=info.classification value="org.opensolaris.category.2008:System/Printing"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/curl/curl.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/curl/curl.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
<transform file path=usr/share/doc/curl/html/(.+)$ -> \
@@ -29,6 +29,7 @@
set name=pkg.fmri value=pkg:/web/curl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The CURL Network Utility and Library"
set name=pkg.description value="A command-line tool and library for transforming data with URL syntax"
+set name=com.oracle.info.description value="the CURL Network Utility and Library"
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/cvs/cvs.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cvs/cvs.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-================================================================================
GNU GENERAL PUBLIC LICENSE
Version 1, February 1989
--- a/components/cvs/cvs.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cvs/cvs.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
set name=pkg.fmri \
value=pkg:/developer/versioning/cvs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The CVS version control system"
+set name=com.oracle.info.description value="the CVS version control system"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/diffutils/diffutils.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/diffutils/diffutils.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/diffutils/diffutils.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/diffutils/diffutils.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,7 @@
value=pkg:/text/gnu-diffutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="Finds differences between and among files"
set name=pkg.summary value="GNU diffutils"
+set name=com.oracle.info.description value="GNU diffutils"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/doxygen/doxygen.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/doxygen/doxygen.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/doxygen/doxygen.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/doxygen/doxygen.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."
set name=pkg.summary value="Source Code Documentation Tool"
+set name=com.oracle.info.description value="the Doxygen documentation system"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Distribution Tools"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ejabberd/ejabberd.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ejabberd/ejabberd.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/web/server/ejabberd@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="ejabberd - Jabber/XMPP instant messaging server"
+set name=com.oracle.info.description value="the ejabberd Jabber/XMPP instant messaging server"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Communications"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/elinks/elinks.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/elinks/elinks.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------------------
-
Copyright (c) 1991-2001 Unicode, Inc. All Rights reserved.
Copyright (C) 1999 - 2002 Mikulas Patocka
Copyright (C) 2001 - 2004 Petr Baudis
--- a/components/elinks/elinks.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/elinks/elinks.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/share/doc/elinks/(.+$) -> set action.hash doc/%<\1> >
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="ELinks is a feature-rich program for browsing the web in text mode. It is like enhanced Lynx and Links."
set name=pkg.summary value="advanced text-mode WWW browser"
+set name=com.oracle.info.description value="the elinks text based web browsing utility"
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Internet
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/emacs/emacs.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/emacs.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-====================================================================
-
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/emacs/gnu-emacs-gtk.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/gnu-emacs-gtk.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/editor/gnu-emacs/gnu-emacs-gtk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU emacs with X11 support (GTK toolkit)"
+set name=com.oracle.info.description value="GNU emacs with X11 support (GTK toolkit)"
set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/emacs/gnu-emacs-lisp.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/gnu-emacs-lisp.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/editor/gnu-emacs/gnu-emacs-lisp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU emacs LISP (.el) files"
set name=pkg.description value="GNU emacs LISP (.el) files not accessed in normal use but necessary for emacs development"
+set name=com.oracle.info.description value="GNU emacs LISP (.el) files"
set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/emacs/gnu-emacs-no-x11.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/gnu-emacs-no-x11.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/editor/gnu-emacs/gnu-emacs-no-x11@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU emacs without X Window System support"
+set name=com.oracle.info.description value="GNU emacs without X Window System support"
set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/emacs/gnu-emacs-x11.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/gnu-emacs-x11.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/editor/gnu-emacs/gnu-emacs-x11@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU emacs with X11 support (Xaw toolkit)"
+set name=com.oracle.info.description value="GNU emacs with X11 support (Xaw toolkit)"
set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/emacs/gnu-emacs.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/gnu-emacs.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -25,6 +25,7 @@
set name=pkg.fmri value=pkg:/editor/gnu-emacs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU emacs core"
set name=pkg.description value="GNU emacs core, runtime support for the emacs binary packages"
+set name=com.oracle.info.description value="GNU emacs core"
set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/erlang/erlang-doc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/erlang/erlang-doc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/runtime/erlang/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,6 +27,7 @@
value="Erlang/OTP Documentation"
set name=pkg.description \
value="Erlang HTML Documents"
+set name=com.oracle.info.description value="the Erlang/OTP Documentation"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/erlang/erlang.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/erlang/erlang.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/runtime/erlang@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,6 +27,7 @@
value="Erlang/OTP "
set name=pkg.description \
value="Erlang programming language and OTP librarie"
+set name=com.oracle.info.description value="the Erlang programming language and OTP libraries"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/fastcgi/fcgi-doc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/fastcgi/fcgi-doc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
# These are not installed, but can be found in the doc directory.
@@ -29,6 +29,7 @@
set name=pkg.description \
value="Documentation for FastCGI application libraries"
set name=pkg.summary value="FastCGI - documentation"
+set name=com.oracle.info.description value="the FastCGI documentation"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/fastcgi/fcgi.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/fastcgi/fcgi.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
@@ -26,6 +26,7 @@
set name=pkg.description \
value="FastCGI is a high-speed and scalable interface for communicating with the web server"
set name=pkg.summary value=FastCGI
+set name=com.oracle.info.description value="the FastCGI web server interface"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/fetchmail/fetchmail.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/fetchmail/fetchmail.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
This collective work is
Copyright (C) 2002, 2003 Eric S. Raymond
Copyright (C) 2004 Matthias Andree, Eric S. Raymond,
--- a/components/fetchmail/fetchmail.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/fetchmail/fetchmail.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -28,6 +28,7 @@
set name=pkg.fmri value=pkg:/mail/fetchmail@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="fetch mail from a POP, IMAP, ETRN, or ODMR-capable server"
set name=pkg.description value="Fetchmail is a full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC."
+set name=com.oracle.info.description value="the fetchmail utility"
set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/flex/flex.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/flex/flex.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/developer/lexer/flex@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Flex Lexer"
+set name=com.oracle.info.description value="the flex lexer utility"
set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/flex/flexruntime.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/flex/flexruntime.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/system/library/flex-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Flex Lexer (Runtime)"
+set name=com.oracle.info.description value="the flex lexer runtime"
set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/foomatic/db-engine/foomatic-db-engine.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/db-engine/foomatic-db-engine.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=========================================================================
-
Copyright 2001-2003 LinuxPrinting.org
This program is free software; you can redistribute it and/or modify it
--- a/components/foomatic/db-engine/foomatic-db-engine.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/db-engine/foomatic-db-engine.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri value=pkg:/print/cups/filter/[email protected],$(BUILD_VERSION)
set name=pkg.summary value="Foomatic Database Engine"
+set name=com.oracle.info.description value="the Foomatic Database Engine"
set name=info.classification value="org.opensolaris.category.2008:System/Printing"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/foomatic/db/foomatic-db.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/db/foomatic-db.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=========================================================================
-
Copyright 2001-2003 LinuxPrinting.org
This program is free software; you can redistribute it and/or modify it
--- a/components/foomatic/db/foomatic-db.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/db/foomatic-db.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/print/cups/filter/foomatic-db@0.$(COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Foomatic database of PostScript Printer Definition files"
+set name=com.oracle.info.description value="the Foomatic database of PostScript Printer Definition files"
set name=info.classification value="org.opensolaris.category.2008:System/Printing"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/foomatic/filters/foomatic-filters.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/filters/foomatic-filters.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
----------------------------
-- foomatic-filters 4.0.15 -
----------------------------
-Oracle Internal Tracking Number 6400
-
---------------------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/foomatic/filters/foomatic-rip.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/filters/foomatic-rip.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri value=pkg:/print/lp/filter/foomatic-rip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="foomatic-filters - Foomatic Print Filters"
+set name=com.oracle.info.description value="the Foomatic Print Filters"
+set name=com.oracle.info.tpno value=6400
set name=info.classification value="org.opensolaris.category.2008:System/Printing"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/foomatic/fppd/foomatic-ppds.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/fppd/foomatic-ppds.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=========================================================================
-
Copyright 2001-2003 LinuxPrinting.org
This program is free software; you can redistribute it and/or modify it
--- a/components/foomatic/fppd/foomatic-ppds.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/fppd/foomatic-ppds.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/print/lp/filter/[email protected],$(BUILD_VERSION)
set name=pkg.summary value="foomatic_ppds - Foomatic Print PPDs"
+set name=com.oracle.info.description value="the Foomatic Print PPDs"
set name=info.classification value="org.opensolaris.category.2008:System/Printing"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/fping/fping.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/fping/fping.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,7 @@
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary \
value="fping - a program to ping hosts in parallel"
+set name=com.oracle.info.description value="the fping utility"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gawk/gawk.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gawk/gawk.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------
-- gawk 3.1.8 -
---------------
-
-Oracle Internal Tracking Number 6808
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/gawk/gawk.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gawk/gawk.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="The awk utility interprets a special-purpose programming language that makes it possible to handle many data-reformatting jobs with just a few lines of code."
set name=pkg.summary value="GNU awk"
+set name=com.oracle.info.description value="GNU awk"
+set name=com.oracle.info.tpno value=6808
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gcc3/gcc-3-runtime.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc3/gcc-3-runtime.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/system/library/gcc-3-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GCC Runtime libraries"
set name=pkg.description value="GCC Runtime - Shared libraries used by gcc and other gnu components"
+set name=com.oracle.info.description value="the GNU Compiler Collection"
set name=info.classification value=org.opensolaris.category.2008:Development/C
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/gcc3/gcc-3.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc3/gcc-3.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/.*/man/.* -> default mangler.man.stability volatile >
@@ -28,6 +28,7 @@
set name=pkg.fmri value=pkg:/developer/gcc-3@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="gcc - The GNU C compiler"
set name=pkg.description value="GNU C - The GNU C compiler 3.4.3"
+set name=com.oracle.info.description value="the GNU Compiler Collection"
set name=info.classification value=org.opensolaris.category.2008:Development/C
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/gcc3/gcc.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc3/gcc.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/gcc45/gcc-45-runtime.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc45/gcc-45-runtime.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/system/library/gcc-45-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GCC - 4.5 Runtime"
+set name=com.oracle.info.description value="the GNU Compiler Collection"
set name=info.classification value="org.opensolaris.category.2008:Development/C" \
value="org.opensolaris.category.2008:Development/C++" \
value="org.opensolaris.category.2008:Development/Fortran" \
--- a/components/gcc45/gcc-45.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc45/gcc-45.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/developer/gcc-45@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GCC - 4.5 Compilers"
+set name=com.oracle.info.description value="the GNU Compiler Collection"
set name=info.classification value="org.opensolaris.category.2008:Development/C" \
value="org.opensolaris.category.2008:Development/C++" \
value="org.opensolaris.category.2008:Development/Fortran" \
--- a/components/gcc45/gcc45.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc45/gcc45.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
-License:
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-__________________________________________________________________________________
The GNU Compiler Collection version 4.5.2 includes the following licenses:
GNU GENERAL PUBLIC LICENSE Version 2, June 1991
GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
--- a/components/gd2/gd2.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gd2/gd2.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------------------------------
-- GD2 [Graphics Draw] Library v2.0.35 -
----------------------------------------
-Oracle Internal Tracking Number 8786
-------------------------------------------------------------------------------
-
John Ellson ([email protected]) Oct 31, 1997
==============================================================================
--- a/components/gd2/gd2.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gd2/gd2.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -29,6 +29,8 @@
set name=pkg.description \
value="GD - An open source code library for the dynamic creation of images by programmers"
set name=pkg.summary value="The Graphics Draw Library"
+set name=com.oracle.info.description value="the GD Graphics Draw Library"
+set name=com.oracle.info.tpno value=8786
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gdb/gdb.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gdb/gdb.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-=============================================================================
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/gdb/gdb.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gdb/gdb.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/developer/debug/gdb@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GDB: The GNU Project Debugger"
+set name=com.oracle.info.description value="GNU GDB"
set name=info.classification value="org.opensolaris.category.2008:Development/System"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gdbm/gdbm.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gdbm/gdbm.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- GNU dbm 1.8.3 -
------------------
-
-Oracle Internal Tracking Number 8440
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/gdbm/gdbm.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gdbm/gdbm.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability Uncommitted>
@@ -26,6 +26,8 @@
set name=pkg.summary value="GNU Database Manager"
set name=pkg.description \
value="GNU dbm is a set of database routines that use extensible hashing. It works similar to the standard UNIX dbm routines."
+set name=com.oracle.info.description value="the GNU Database Manager"
+set name=com.oracle.info.tpno value=8440
set name=info.classification value="org.opensolaris.category.2008:Development/Databases"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gettext/gettext.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gettext/gettext.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/gettext/gettext.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gettext/gettext.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
value=pkg:/text/gnu-gettext@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="GNU gettext - message handling utilities"
set name=pkg.summary value="GNU gettext"
+set name=com.oracle.info.description value="GNU gettext"
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ggrep/gnu-grep.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ggrep/gnu-grep.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-===================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/ggrep/gnu-grep.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ggrep/gnu-grep.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="The grep command searches one or more input files for lines containing a match to a specified pattern."
set name=pkg.summary value="GNU grep utilities"
+set name=com.oracle.info.description value="GNU grep"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ghostscript/ghostscript.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ghostscript/ghostscript.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 3 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv3 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=========================================================================
Copyright (C) 1994-2008 Artifex Software, Inc. All rights reserved.
Copyright (C) 1989-2002 Aladdin Enterprises, Menlo Park, CA. All rights reserved.
--- a/components/ghostscript/ghostscript.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ghostscript/ghostscript.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -24,6 +24,7 @@
set name=pkg.fmri value=pkg:/print/filter/ghostscript@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GPL Ghostscript"
+set name=com.oracle.info.description value="GNU Ghostscript"
set name=info.classification value="org.opensolaris.category.2008:System/Printing "
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/git/git.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/git/git.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------
-- git 1.7.9.2 -
----------------
-
-Oracle Internal Tracking Number 8436
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/git/git.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/git/git.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/lib/git-core/.* -> default mode 0555>
@@ -29,6 +29,8 @@
set name=pkg.summary value="git - Fast Version Control System"
set name=pkg.description \
value="Git is a free & open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency."
+set name=com.oracle.info.description value="the git version control system"
+set name=com.oracle.info.tpno value=8436
set name=info.classification \
value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnu-gs-fonts-other/gnu-gs-fonts-other.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
---------------------------
-- Ghostscript Fonts 6.0 -
---------------------------
-
-Oracle Internal Tracking Number 8517
-
------------------------------------------------------------------------------
- v.09232010
USE RESTRICTION:
This distribution of the Hershey Fonts may be used by anyone for
any purpose, commercial or otherwise, providing that:
--- a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-other@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU Ghostscript Fonts (Other)"
+set name=com.oracle.info.description value="GNU Ghostscript Fonts (Other)"
+set name=com.oracle.info.tpno value=8517
set name=info.classification \
value=org.opensolaris.category.2008:System/Printing
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
---------------------------
-- Ghostscript Fonts 6.0 -
---------------------------
-
-Oracle Internal Tracking Number 8517
-
------------------------------------------------------------------------------
- v.09232010
USE RESTRICTION:
This distribution of the Hershey Fonts may be used by anyone for
any purpose, commercial or otherwise, providing that:
--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-std@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU Ghostscript Fonts (Standard)"
+set name=com.oracle.info.description value="GNU Ghostscript Fonts (Standard)"
+set name=com.oracle.info.tpno value=8517
set name=info.classification \
value="org.opensolaris.category.2008:System/Printing "
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnump/gmp.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnump/gmp.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/gnump/gmp.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnump/gmp.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/gmp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU MP"
-set name=pkg.description value="The GNU Multiple Precision Bignum Library"
+set name=pkg.summary value="GNU Multiple Precision Bignum Library"
+set name=com.oracle.info.description value="the GNU Multiple Precision Bignum Library"
set name=info.classification value="org.opensolaris.category.2008:Development/High Performance Computing"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnupg/gnupg.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnupg/gnupg.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
---------------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/gnupg/gnupg.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnupg/gnupg.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
<transform dir path=usr/share/gnupg$ -> default facet.locale true>
@@ -27,6 +27,7 @@
set name=pkg.fmri value=pkg:/crypto/gnupg@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU Privacy Guard"
set name=pkg.description value="A complete and free implementation of the OpenPGP Standard as defined by RFC4880."
+set name=com.oracle.info.description value="GNU Privacy Guard"
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnuplot/gnuplot.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnuplot/gnuplot.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
------------------
-- gnuplot 4.6.0 -
------------------
-
-Oracle Internal Tracking Number 8452
-
-----------------------------------------------------------------------------
-
========== ADDENDUM 1: The gnuplot 4.6.0 general copyright ==========
/*[
* Copyright 1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley
--- a/components/gnuplot/gnuplot.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnuplot/gnuplot.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/demo/gnuplot/(.+[.-].+)$ -> set action.hash demo/%<\1> >
set name=pkg.fmri value=pkg:/image/gnuplot@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="gnuplot - plotting utility"
set name=pkg.description value="gnuplot - command-driven interactive function plotting program"
+set name=com.oracle.info.description value="the gnuplot plotting utility"
+set name=com.oracle.info.tpno value=8452
set name=info.classification value="org.opensolaris.category.2008:Applications/Graphics and Imaging"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnupth/gnupth.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnupth/gnupth.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,60 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-------------------------------------------------------------------
-
- ____ _ _
- | _ \| |_| |__ ``Ian Fleming was a UNIX fan!
- | |_) | __| '_ \ How do I know? Well, James Bond
- | __/| |_| | | | had the (license to kill) number 007,
- |_| \__|_| |_| i.e., he could execute anyone!''
-
- GNU Pth - The GNU Portable Threads
-
- LICENSE
- =======
-
- This library is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version.
-
- For some people, it is not clear, what is the real intention of the
- author by using the GNU Lesser General Public License (LGPL) as the
- distribution license for GNU Pth. This is, because the LGPL and the
- GPL can be (and are often) interpreted very differently and some
- interpretations seem to be not compatible with others. So an explicit
- clarification for the use of the LGPL for GNU Pth from the authors
- point of view might be useful.
-
- The author places this library under the LGPL to make sure that it
- can be used both commercially and non-commercially provided that
- modifications to the code base are always donated back to the official
- code base under the same license conditions. Please keep in mind that
- especially using this library in code not staying under the GPL or
- the LGPL _is_ allowed and that any taint or license creap into code
- that uses the library is not the authors intention. It is just the
- case that _including_ this library into the source tree of other
- applications is a little bit more inconvinient because of the LGPL.
- But it has to be this way for good reasons. And keep in mind that
- inconvinient doesn't mean not allowed or even impossible.
-
- Even if you want to use this library in some BSD-style licensed
- packages, this _is_ possible as long as you are a little bit
- carefully. Usually this means you have to make sure that the code is
- still clearly separated into the source tree and that modifications to
- this source area are done under the conditions of the LGPL. Read below
- for more details on the conditions. Contact the author if you have
- more questions.
-
- The license text of the GNU Lesser General Public License follows:
- __________________________________________________________________________
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/gnupth/gnupth.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnupth/gnupth.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/pth@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The GNU Portable Threads Library"
set name=pkg.description value="A portable POSIX/ANSI-C based library for Unix platforms providing non-preemptive priority-based scheduling for multiple threads"
+set name=com.oracle.info.description value="the GNU Portable Threads Library"
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gocr/gocr.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gocr/gocr.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------
-- GOCR 0.48 -
--------------
-
-Oracle Internal Tracking Number 8587
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/gocr/gocr.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gocr/gocr.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri value=pkg:/image/gocr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GOCR is an open source Optical Character Recognition program"
+set name=com.oracle.info.description value="the gocr Optical Character Recognition program"
+set name=com.oracle.info.tpno value=8587
set name=info.classification value="org.opensolaris.category.2008:Applications/Graphics and Imaging"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gperf/gperf.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gperf/gperf.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------
-- gperf 3.0.3 -
----------------
-
-Oracle Internal Tracking Number 8589
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/gperf/gperf.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gperf/gperf.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string."
set name=pkg.summary value="GNU gperf"
+set name=com.oracle.info.description value="GNU gperf"
+set name=com.oracle.info.tpno value=8589
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gpgme/gpgme.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gpgme/gpgme.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-------------------------------------
-- GPG ME [GNU PG Made Easy] v1.1.8 -
-------------------------------------
-
-Oracle Internal Tracking Number 8637
-------------------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/gpgme/gpgme.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gpgme/gpgme.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/security/gpgme@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GnuPG Made Easy"
set name=pkg.description value="A library designed to make access to GnuPG easier for applications."
+set name=com.oracle.info.description value="GnuPG Made Easy"
+set name=com.oracle.info.tpno value=8637
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/grails/grails.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/grails/grails.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
Grails uses the "Apache Software License, Version 2.0"
however Grails has dependencies and their licensing is summaried
in http://svn.codehaus.org/grails/trunk/grails/dependencies.txt.
--- a/components/grails/grails.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/grails/grails.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -34,6 +34,7 @@
set name=pkg.description \
value="A web application framework which uses the Groovy programming language (which is in turn based on the Java platform)"
set name=pkg.summary value="A web application framework"
+set name=com.oracle.info.description value="the grails web application framework"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-java.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-java.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
set name=pkg.fmri \
value=pkg:/image/graphviz/graphviz-java@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Java bindings for Graphviz"
+set name=com.oracle.info.description value="Java bindings for Graphviz"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-lua.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-lua.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
set name=pkg.fmri \
value=pkg:/image/graphviz/graphviz-lua@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Lua bindings for Graphviz"
+set name=com.oracle.info.description value="Lua bindings for Graphviz"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-ocaml.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-ocaml.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
set name=pkg.fmri \
value=pkg:/image/graphviz/graphviz-ocaml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="OCaml bindings for Graphviz"
+set name=com.oracle.info.description value="OCaml bindings for Graphviz"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-perl-512.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-perl-512.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
set name=pkg.fmri \
value=pkg:/image/graphviz/graphviz-perl-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Perl 5.12 bindings for Graphviz"
+set name=com.oracle.info.description value="Perl 5.12 bindings for Graphviz"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-php.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-php.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
set name=pkg.fmri \
value=pkg:/image/graphviz/graphviz-php@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="PHP bindings for Graphviz"
+set name=com.oracle.info.description value="PHP bindings for Graphviz"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-python-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-python-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
set name=pkg.fmri \
value=pkg:/image/graphviz/graphviz-python-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python 2.6 bindings for Graphviz"
+set name=com.oracle.info.description value="Python 2.6 bindings for Graphviz"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-python-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-python-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
set name=pkg.fmri \
value=pkg:/image/graphviz/graphviz-python-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python 2.7 bindings for Graphviz"
+set name=com.oracle.info.description value="Python 2.7 bindings for Graphviz"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-ruby.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-ruby.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
set name=pkg.fmri \
value=pkg:/image/graphviz/graphviz-ruby@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Ruby bindings for Graphviz"
+set name=com.oracle.info.description value="Ruby bindings for Graphviz"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-sharp.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-sharp.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
set name=pkg.fmri \
value=pkg:/image/graphviz/graphviz-sharp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="C# bindings for Graphviz"
+set name=com.oracle.info.description value="C# bindings for Graphviz"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-tcl.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-tcl.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
set name=pkg.fmri \
value=pkg:/image/graphviz/graphviz-tcl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Tcl bindings for Graphviz"
+set name=com.oracle.info.description value="Tcl bindings for Graphviz"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
value=pkg:/image/graphviz@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="The Graphviz layout programs take descriptions of graphs in a simple text language, and make diagrams in useful formats, such as images and SVG for web pages, PDF or PostScript for inclusion in other documents; or display in an interactive graph browser. Graphviz has many useful features for concrete diagrams, such as options for colors, fonts, tabular node layouts, line styles, hyperlinks, and custom shapes."
set name=pkg.summary value="Graph visualization software"
+set name=com.oracle.info.description value="Graphviz graph visualization software"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gtar/gtar.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gtar/gtar.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-=============================================================================
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/gtar/gtar.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gtar/gtar.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="Tar is a program for packaging a set of files as a single archive in tar format."
set name=pkg.summary value="GNU version of the tar archiving utility"
+set name=com.oracle.info.description value="GNU tar"
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/guile/guile.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/guile/guile.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,17 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
-Copyright (C) 1985-2007 Free Software Foundation, Inc.
-
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/guile/guile.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/guile/guile.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/share/guile/.+/scripts/.+$ -> default mode 0555>
@@ -28,6 +28,7 @@
set name=pkg.description \
value="Guile is the GNU Ubiquitous Intelligent Language for Extensions, the official extension language for the GNU operating system."
set name=pkg.summary value="GNU guile utility"
+set name=com.oracle.info.description value="GNU guile"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gutenprint/gutenprint.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gutenprint/gutenprint.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------------
-- Gutenprint 5.2.7 -
---------------------
-Oracle Internal Tracking Number TBD
-
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/gutenprint/gutenprint.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gutenprint/gutenprint.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,7 +27,8 @@
set name=pkg.fmri \
value=pkg:/print/filter/gutenprint@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
- value="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
+ value="Gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
+set name=com.oracle.info.description value="the Gutenprint drivers for Canon, Epson, Lexmark & PCL printers"
set name=info.classification \
value=org.opensolaris.category.2008:System/Printing
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gzip/gzip.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gzip/gzip.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-------------
-- gzip 1.5 -
-------------
-
-Oracle Internal Tracking Number 7913
-
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/gzip/gzip.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gzip/gzip.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -26,6 +26,8 @@
value=pkg:/compress/gzip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="The GNU Zip (gzip) compression utility"
set name=pkg.summary value="GNU Zip (gzip)"
+set name=com.oracle.info.description value="GNU zip"
+set name=com.oracle.info.tpno value=7913
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/hal-cups-utils/hal-cups-utils.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hal-cups-utils/hal-cups-utils.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
--------------------------
-- hal-cups-utils 0.6.19 -
--------------------------
-
-Oracle Internal Tracking Number 8957
-
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/hal-cups-utils/hal-cups-utils.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hal-cups-utils/hal-cups-utils.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="hal-cups-utils is a Hardware Abstraction Layer (HAL) plugin module that automatically creates print queues under the Common UNIX Printing System (CUPS) for printers detected by HAL."
set name=pkg.summary value="Automatic queue creation for CUPS"
+set name=com.oracle.info.description value="the HAL automatic queue creation plugin module for CUPS"
+set name=com.oracle.info.tpno value=8957
set name=info.classification \
value=org.opensolaris.category.2008:System/Printing
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/hexedit/hexedit.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hexedit/hexedit.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------------
-- hexedit 1.2.12 -
-------------------
-
-Oracle Internal Tracking Number 9060
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/hexedit/hexedit.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hexedit/hexedit.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommited>
@@ -28,6 +28,8 @@
value=pkg:/editor/hexedit@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Hexedit - a command-line binary file editor"
+set name=com.oracle.info.description value="the hexedit binary file editor"
+set name=com.oracle.info.tpno value=9060
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities" \
value="org.opensolaris.category.2008:Development/Editors"
--- a/components/hplip/hplip.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hplip/hplip.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
--------------------------------------------------------------------------------
-
(c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P.
This program is free software; you can redistribute it and/or modify
--- a/components/hplip/hplip.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hplip/hplip.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri \
value=pkg:/print/filter/hplip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="hpijs - HP InkJet Server"
+set name=com.oracle.info.description value="the hpijs HP InkJet Server"
set name=info.classification \
value="org.opensolaris.category.2008:System/Printing "
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/httping/httping.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/httping/httping.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
Copyright (C) 2007 by [email protected]
The GPL applies to this program. The license of this program
--- a/components/httping/httping.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/httping/httping.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
set name=pkg.summary value="Ping for HTTP requests"
set name=pkg.description \
value="Give httping an url, and it'll show you how long it takes to connect, send a request and retrieve the reply (only the headers)."
+set name=com.oracle.info.description value="the HTTP ping utility"
set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/hwdata/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hwdata/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -48,7 +48,16 @@
COMPONENT_BUGDB= utility/hwdata
+# Retrieve version from ids file
+ID_VERSION_EXTRACT_COMMAND=$(GSED) -n -e '/Version:/ { s/^.*: //p' -e ' q }'
+
PKG_OPTIONS += -D COMPONENT_ARCHIVE_URLS='$(COMPONENT_ARCHIVE_URLS:%=value="%")'
+PKG_MACROS += $(foreach i,$(ID_FILES),\
+ COMPONENT_VERSION_$(i)='$(shell $(ID_VERSION_EXTRACT_COMMAND) $(i))')
+
+# Since we have two separately licensed components we don't use the default
+# license transform rules, but handle the license info metadata directly
+LICENSE_TRANSFORMS =
$(ID_FILES):
curl -s -o $@ $(COMPONENT_ARCHIVE_URL_$(@F))
@@ -56,8 +65,6 @@
# License files for packaging are generated during the build
LICENSES = $(ID_FILES:%=%.license)
BUILT_LICENSES = $(LICENSES:%=$(BUILD_DIR)/%)
-TPNO_pci.ids.license = 7530
-TPNO_usb.ids.license = 7831
# Extract the header up to the first blank line
$(BUILD_DIR)/%.header: %
@@ -65,17 +72,10 @@
$(GSED) -e '/^$$/ q' $< > $@
# Generate license files for each document by substituting in templates:
-# __FILE_NAME_VERS__ replace with name & version of ids file
-# __TPNO__ - Oracle tracking number
# __HEADER__ - read in contents of generated header file, then delete the
# __HEADER__ line
$(BUILD_DIR)/%.license: $(BUILD_DIR)/%.header
- FILENAME="$(basename $(@F))" ; \
- VERSION="$$(awk -F: '/Version:/ { print $$2 ; exit }' $<)" ; \
- FILE_NAME_VERS="$${FILENAME}$${VERSION}" ; \
- $(GSED) -e "s/__FILE_NAME_VERS__/$${FILE_NAME_VERS}/" \
- -e 's/__TPNO__/$(TPNO_$(@F))/' \
- -e '/__HEADER__/ r $<' -e '/__HEADER__/ d' ids.license.tmpl > $@
+ $(GSED) -e '/__HEADER__/ r $<' -e '/__HEADER__/ d' ids.license.tmpl > $@
install build: $(BUILT_LICENSES)
--- a/components/hwdata/hwdata.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hwdata/hwdata.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -42,6 +42,11 @@
dir path=usr/share/hwdata group=sys
file pci.ids path=usr/share/hwdata/pci.ids
file usb.ids path=usr/share/hwdata/usb.ids
-license pci.ids.license license=pci.ids.license
-license usb.ids.license license=usb.ids.license
-
+license pci.ids.license license="BSD (pci.ids)" \
+ com.oracle.info.description="the pci.ids list of PCI device & vendor IDs" \
+ com.oracle.info.name=pci.ids com.oracle.info.tpno=7530 \
+ com.oracle.info.version=$(COMPONENT_VERSION_pci.ids)
+license usb.ids.license license="BSD (usb.ids)" \
+ com.oracle.info.description="the usb.ids list of USB device & vendor IDs" \
+ com.oracle.info.name=usb.ids com.oracle.info.tpno=7831 \
+ com.oracle.info.version=$(COMPONENT_VERSION_usb.ids)
--- a/components/hwdata/ids.license.tmpl Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hwdata/ids.license.tmpl Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------------
-- __FILE_NAME_VERS__ -
-----------------------
-
-Oracle Internal Tracking Number __TPNO__
-
Oracle elects to license this file under the 3-clause BSD license (the
template of which is reproduced below) based on the following notices
included within the file:
--- a/components/iftop/iftop.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/iftop/iftop.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
Copyright (C) 1987-2006 Free Software Foundation, Inc.
Copyright (C) 2000-2005, 2008 Tim Waugh <[email protected]>
Copyright (C) 2001 Marko Kreen
--- a/components/iftop/iftop.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/iftop/iftop.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/diagnostic/iftop@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="iftop - Display bandwidth usage on an interface"
+set name=com.oracle.info.description value="the iftop utility"
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ilmbase/ilmbase.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ilmbase/ilmbase.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- ilmbase 1.0.1 -
------------------
-
-Oracle Internal Tracking Number 5574
-
OPENEXR:
Copyright (c) 2006, Industrial Light & Magic, a division of Lucasfilm
--- a/components/ilmbase/ilmbase.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ilmbase/ilmbase.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,8 @@
value="Base libraries to support the OpenEXR IlmImf library"
set name=pkg.summary \
value="Ilmbase libraries used to read and write OpenEXR images"
+set name=com.oracle.info.description value="the OpenEXR IlmImf base libraries"
+set name=com.oracle.info.tpno value=5574
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/imagemagick/imagemagick.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/imagemagick/imagemagick.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,7 @@
value="ImageMagick is a software suite to create, edit, compose, or convert images"
set name=pkg.summary \
value="ImageMagick - Image Manipulation Utilities and Libraries"
+set name=com.oracle.info.description value="the ImageMagick Image Manipulation Utilities and Libraries"
set name=info.classification \
value="org.opensolaris.category.2008:System/Multimedia Libraries"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/iperf/iperf.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/iperf/iperf.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------
-- iperf 2.0.4 -
----------------
-
-Oracle Internal Tracking Number 5730
-
Copyright (c) 1999-2007, The Board of Trustees of the University of Illinois
All Rights Reserved.
--- a/components/iperf/iperf.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/iperf/iperf.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/benchmark/iperf@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="iperf - tool for measuring maximum TCP and UDP bandwidth performance"
+set name=com.oracle.info.description value="the iperf utility"
+set name=com.oracle.info.tpno value=5730
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ircii/ircii.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ircii/ircii.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------------
-- ircii 20060725 -
-------------------
-
-Oracle Internal Tracking Number 5578
-
/* $eterna: Copyright,v 1.13 2005/04/03 02:35:06 mrg Exp $ */
/*
--- a/components/ircii/ircii.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ircii/ircii.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.description value="A terminal-based IRC client that runs under most unix platforms."
set name=pkg.summary value="Internet Relay Chat Client"
+set name=com.oracle.info.description value="the ircii Internet Relay Chat Client"
+set name=com.oracle.info.tpno value=5578
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Internet
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/isc-dhcp/dhcp.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/isc-dhcp/dhcp.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
@@ -26,6 +26,8 @@
set name=pkg.description \
value="ISC DHCP is open source software that implements the Dynamic Host Configuration Protocols for connection to a local network. This package includes the ISC DHCP server, relay agent and the omshell tool."
set name=pkg.summary value="ISC DHCP Server and Relay Agent."
+set name=com.oracle.info.description value="the ISC DHCP Server and Relay Agent"
+set name=com.oracle.info.tpno value=10383
set name=info.classification \
value=org.opensolaris.category.2008:System/Services
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/isc-dhcp/isc-dhcp.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/isc-dhcp/isc-dhcp.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-
------------------------
-- ISC DHCP 4.1-ESV-R7 -
------------------------
-
-Oracle Internal Tracking Number : 10383
-
# Copyright (c) 2004-2012 by Internet Systems Consortium, Inc. ("ISC")
# Copyright (c) 1995-2003 by Internet Software Consortium
#
--- a/components/junit/junit.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/junit/junit.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
---------------
-- Junit 4.10 -
---------------
-
Common Public License - v 1.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
--- a/components/junit/junit.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/junit/junit.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -32,6 +32,7 @@
set name=pkg.description \
value="Junit is a unit testing framework for the Java programming language."
set name=pkg.summary value="Junit - Java unit testing framework"
+set name=com.oracle.info.description value="the Junit unit testing framework"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Java
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ksh93/developer-astdev93.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ksh93/developer-astdev93.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
# The man pages are all at the top of a "files" directory; setting the hash to
@@ -34,6 +34,7 @@
set name=pkg.description \
value="AT&T AST development utilities for extracting messages for localisation"
set name=pkg.summary value="AT&T AST development utilities"
+set name=com.oracle.info.description value="the AT&T AST development utilities"
set name=info.classification \
value="org.opensolaris.category.2008:System/Software Management"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ksh93/ksh93.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ksh93/ksh93.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
# The man pages are all at the top of a "files" directory; setting the hash to
@@ -32,6 +32,7 @@
set name=pkg.description \
value="Korn Shell 93: A command and programming language that executes commands read from a terminal or a file"
set name=pkg.summary value="Ksh93 - The AT&T Korn Shell"
+set name=com.oracle.info.description value="the AT&T ksh93 Korn Shell"
set name=info.classification value=org.opensolaris.category.2008:System/Shells
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream \
--- a/components/ksh93/source-demo-ksh93.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ksh93/source-demo-ksh93.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
# The man pages are all at the top of a "files" directory; setting the hash to
@@ -33,6 +33,7 @@
set name=pkg.human-version value=$(IPS_HUMAN_VERSION)
set name=pkg.description value="Source code to demonstrate the KornShell"
set name=pkg.summary value="KornShell demos"
+set name=com.oracle.info.description value="the Korn Shell demos"
set name=info.classification value=org.opensolaris.category.2008:System/Core
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream \
--- a/components/lcms/lcms-py26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lcms/lcms-py26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,14 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/library/python-2/lcms-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description \
- value="A small-footprint color management engine, with special focus on accuracy and performance"
-set name=pkg.summary value="The Little Color Management System"
+set name=pkg.summary value="Python 2.6 bindings for the Little Color Management System"
+set name=com.oracle.info.description value="the Python 2.6 bindings for the Little Color Management System"
+set name=com.oracle.info.tpno value=9072
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/lcms/lcms-py27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lcms/lcms-py27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,14 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/library/python-2/lcms-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description \
- value="A small-footprint color management engine, with special focus on accuracy and performance"
-set name=pkg.summary value="The Little Color Management System"
+set name=pkg.summary value="Python 2.7 bindings for the Little Color Management System"
+set name=com.oracle.info.description value="the Python 2.7 bindings for the Little Color Management System"
+set name=com.oracle.info.tpno value=9072
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/lcms/lcms.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lcms/lcms.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
----------------------
-- Little CMS v1.19 -
----------------------
-
-Oracle Internal Tracking Number 9072
-------------------------------------------------------------------------------
-
Little CMS
Copyright (c) 1998-2007 Marti Maria Saguer
--- a/components/lcms/lcms.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lcms/lcms.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
@@ -26,6 +26,8 @@
set name=pkg.description \
value="A small-footprint color management engine, with special focus on accuracy and performance"
set name=pkg.summary value="The Little Color Management System"
+set name=com.oracle.info.description value="the Little Color Management System"
+set name=com.oracle.info.tpno value=9072
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/less/less.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/less/less.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------
-- less 436 -
-------------
-
-Oracle Internal Tracking Number 9286
-
Less, version 436
This is the distribution of less, version 436, released 07 Jul 2009.
--- a/components/less/less.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/less/less.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,8 @@
set name=pkg.description \
value="The package provides less, a file pager (a memory-efficient utility for displaying text one screenful at a time)."
set name=pkg.summary value="pager program similar to more"
+set name=com.oracle.info.description value="the less pager program"
+set name=com.oracle.info.tpno value=9286
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/lftp/lftp.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lftp/lftp.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-=============================================================================
-
Copyright (c) 1996-2011 Alexander V. Lukyanov
GNU GENERAL PUBLIC LICENSE
--- a/components/lftp/lftp.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lftp/lftp.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/network/ftp/lftp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="lftp - Sophisticated file transfer program"
+set name=com.oracle.info.description value="the lftp file transfer program"
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libassuan/libassuan.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libassuan/libassuan.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,21 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
--------------------------------------------------------------------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------------
-
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/libassuan/libassuan.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libassuan/libassuan.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/security/libassuan@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GnuPG IPC implementation library"
set name=pkg.description value="A small library implementing the so-called Assuan protocol, used for interprocess communication between most GnuPG components."
+set name=com.oracle.info.description value="the GnuPG IPC implementation library"
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libconfuse/libconfuse.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libconfuse/libconfuse.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -41,6 +41,7 @@
value="Configuration file parser library"
set name=pkg.description \
value="libConfuse is a configuration file parser library written in C. It supports sections and lists of values. It makes it very easy to add configuration file capability to a program using a simple API."
+set name=com.oracle.info.description value="the libconfuse configuration file parser library"
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/libedit/libedit.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libedit/libedit.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------------------
-- libedit 20110802-3.0 -
-------------------------
-
-Oracle Internal Tracking Number : 7013
-
Copyright (c) 1992, 1993
The Regents of the University of California. All rights reserved.
--- a/components/libedit/libedit.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libedit/libedit.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
value=pkg:/library/libedit@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary value="Libedit - Command line editor library"
+set name=com.oracle.info.description value="the libedit command line editor library"
+set name=com.oracle.info.tpno value=7013
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libee/libee.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libee/libee.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
----------------
-- libee 0.3.2 -
----------------
-
-Oracle Internal Tracking Number 7585
-
-libee is available under the terms of the GNU GPL v2.1 or above (full
-text below).
------------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/libee/libee.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libee/libee.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,12 +20,14 @@
#
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/libee@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="event expression library"
+set name=com.oracle.info.description value="the libee event expression library"
+set name=com.oracle.info.tpno value=7585
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libestr/libestr.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libestr/libestr.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
------------------
-- libestr 0.1.2 -
------------------
-
-Oracle Internal Tracking Number 7585
-
-libestr is available under the terms of the GNU GPL v2.1 or above (full
-text below).
------------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/libestr/libestr.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libestr/libestr.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,12 +20,14 @@
#
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/libestr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="extended string handling library"
+set name=com.oracle.info.description value="the libestr extended string handling library"
+set name=com.oracle.info.tpno value=7585
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libevent/libevent.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libevent/libevent.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------------
-- libevent 1.4.14b -
---------------------
-
-Oracle Internal Tracking Number : 5581
-
buffer.c:
/*
* Copyright (c) 2002, 2003 Niels Provos <[email protected]>
--- a/components/libevent/libevent.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libevent/libevent.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -29,6 +29,8 @@
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary \
value="Libevent - an event notification library"
+set name=com.oracle.info.description value="the libevent event notification library"
+set name=com.oracle.info.tpno value=5581
set name=info.classification \
value="org.opensolaris.category.2008:System/Libraries"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libexpat/expat.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libexpat/expat.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/expat@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="libexpat - XML parser library"
set name=pkg.description value="A fast, non-validating, stream-oriented XML parsing library"
+set name=com.oracle.info.description value="the libexpat XML parser library"
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libidn/libidn.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libidn/libidn.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,25 +1,3 @@
------------------
-- GNU IDN v1.19 -
------------------
-Oracle Internal Tracking Number 8079
-------------------------------------------------------------------------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------------
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
---------------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/libidn/libidn.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libidn/libidn.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/libidn@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="IDN - The Internationalized Domains Library"
set name=pkg.description value="A fully documented implementation of the Stringprep, Punycode and IDNA specifications for the purpose of encoding and decoding internationalized domain names"
+set name=com.oracle.info.description value="the libidn Internationalized Domains Library"
+set name=com.oracle.info.tpno value=8079
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libksba/libksba.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libksba/libksba.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
----------------------
-- libksba v1.1.0 -
----------------------
-Oracle Internal Tracking Number 8768
---------------------------------------------------------------------------------
-
-GPLv3 license:
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/libksba/libksba.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libksba/libksba.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/security/libksba@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GnuPG X.509 certificate library"
set name=pkg.description value="A C library to make the tasks of working with X.509 certificates, CMS data and related objects easier, by encapsulating specific protocol details."
+set name=com.oracle.info.description value="the GnuPG X.509 certificate library"
+set name=com.oracle.info.tpno value=8768
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libmcrypt/libmcrypt.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmcrypt/libmcrypt.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
--------------------------------------------------------------------
Copyright (c) 1999 Mike Scott
Copyright (C) 1998,1999,2000,2001,2002 Nikos Mavroyanopoulos
--- a/components/libmcrypt/libmcrypt.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmcrypt/libmcrypt.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/system/library/security/libmcrypt@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Libmcrypt Encryption Algorithms Library"
+set name=com.oracle.info.description value="the libmcrypt encryption algorithms library"
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libmemcached/libmemcached.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmemcached/libmemcached.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------------
-- libmemcached 0.16 -
----------------------
-
-Oracle Internal Tracking Number 5582
-
Copyright (c) 2007, TangentOrg (Brian Aker)
All rights reserved.
--- a/components/libmemcached/libmemcached.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmemcached/libmemcached.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.summary value="An open source C/C++ client library and tools for the memcached server"
set name=pkg.description \
value="Libmemcached has been designed to be light on memory usage, thread safe, and provide full access to server side methods."
+set name=com.oracle.info.description value="the memcached server library"
+set name=com.oracle.info.tpno value=5582
set name=info.classification \
value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/libmng/libmng.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmng/libmng.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- libmng 1.0.10 -
------------------
-
-Oracle Internal Tracking Number 5583
-
/* * * */
/* * COPYRIGHT NOTICE: * */
/* * * */
--- a/components/libmng/libmng.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmng/libmng.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/graphics/libmng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Multiple Image Network Graphics Library"
set name=pkg.description value="A PNG-like image format library supporting multiple images, animations and transparent JPEG"
+set name=com.oracle.info.description value="the libmng multiple image network graphics library"
+set name=com.oracle.info.tpno value=5583
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libneon/libneon.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libneon/libneon.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------------------------------
-- NEON Client Library (libneon) v0.29.6 -
------------------------------------------
-
------------------------------------------------------------------------
-
GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/libneon/libneon.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libneon/libneon.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="An HTTP and WebDAV client library, with a C interface"
set name=pkg.summary value="The Neon WebDAV library"
+set name=com.oracle.info.description value="the libneon WebDAV library"
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libnet/libnet.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libnet/libnet.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------
-- libnet 1.1.5 -
-----------------
-
-Oracle Internal Tracking Number 5584
-
Copies of LICENSES and other notices:
=====================================
doc/COPYING:
--- a/components/libnet/libnet.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libnet/libnet.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.fmri value=pkg:/system/library/libnet@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="libnet - a library for portable network packet construction"
+set name=com.oracle.info.description value="the libnet network packet construction library"
+set name=com.oracle.info.tpno value=5584
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libpcap/libpcap.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libpcap/libpcap.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
# The libpcap man pages should go in section 3pcap instead of
@@ -27,6 +27,7 @@
set name=pkg.fmri \
value=pkg:/system/library/libpcap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Packet capture library"
+set name=com.oracle.info.description value="the libpcap package capture library"
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/librsync/librsync.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/librsync/librsync.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/librsync/librsync.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/librsync/librsync.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="A library that implements the rolling-checksum algorithm of remote file synchronization that was popularized by the rsync utility and is used in rproxy"
set name=pkg.summary value="A library that implements the rsync remote-delta algorithm"
+set name=com.oracle.info.description value="the librsync rsync remote-delta algorithm library"
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libsigsegv/libsigsegv.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libsigsegv/libsigsegv.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
Copyright 1998-1999, 2002-2008 Bruno Haible <[email protected]>
Copyright 2002-2005 Paolo Bonzini <[email protected]>
--- a/components/libsigsegv/libsigsegv.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libsigsegv/libsigsegv.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
# pull the manpages out of the component dir
@@ -30,6 +30,7 @@
set name=pkg.description \
value="libsigsegv provides a set of functions for handling page faults in user mode"
set name=pkg.summary value="libsigsegv - handling page faults in user mode"
+set name=com.oracle.info.description value="the libsigsegv page fault handling library"
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libsndfile/libsndfile.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libsndfile/libsndfile.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
--------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/libsndfile/libsndfile.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libsndfile/libsndfile.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/libsndfile@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="libsndfile - a library for reading/writing sound files"
set name=pkg.description \
value="Libsndfile is a C library for reading and writing files containing sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format) through one standard library interface."
+set name=com.oracle.info.description value="the libsndfile sound file library"
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libtecla/libtecla.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtecla/libtecla.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
# The man pages are all at the top of a "files" directory; setting the hash to
@@ -34,6 +34,7 @@
set name=pkg.fmri \
value=pkg:/library/libtecla@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Tecla command-line editing library"
+set name=com.oracle.info.description value="the libtecla command-line editing library"
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libtool/libltdl.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtool/libltdl.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/libtool/libltdl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU libtool dlopen wrapper"
+set name=com.oracle.info.description value="the GNU libtool dlopen wrapper"
+set name=com.oracle.info.tpno value=9088
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libtool/libtool.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtool/libtool.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- libtool 2.4.2 -
------------------
-
-Oracle Internal Tracking Number 9088
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/libtool/libtool.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtool/libtool.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/share/man/.+$ -> set mangler.man.stability 'uncommitted (obsolete)' >
set name=pkg.fmri \
value=pkg:/developer/build/libtool@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU libtool"
+set name=com.oracle.info.description value="GNU libtool"
+set name=com.oracle.info.tpno value=9088
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libtorrent/libtorrent.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtorrent/libtorrent.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
Copyright (C) 2005-2007, Jari Sundell <jaris (a] ifi.uio.no>
GNU GENERAL PUBLIC LICENSE
--- a/components/libtorrent/libtorrent.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtorrent/libtorrent.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/libtorrent@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="libtorrent - a Bittorrent library for rtorrent"
+set name=com.oracle.info.description value="the bittorrent library for rtorrent"
set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libusb/ugen/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libusb/ugen/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -40,6 +40,9 @@
$(BUILD_DIR_64)/.installed: BITS=64
COMPONENT_INSTALL_ARGS += BITS=$(BITS)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
download:
clobber: clean
--- a/components/libusb/wrapper/libusb.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libusb/wrapper/libusb.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,6 +1,3 @@
-This package may include technology covered by one or more of the
-following additional notices:
-
Copyright (c) 2000-2003 Johannes Erdfelt <[email protected]>
All rights reserved.
--- a/components/libusb/wrapper/libusb.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libusb/wrapper/libusb.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/system/library/usb/libusb@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary value="Sun wrapper library for libusb"
+set name=com.oracle.info.description value="the wrapper library for libusb"
set name=info.classification \
value="org.opensolaris.category.2008:System/Libraries"
set name=info.source-url value=http://opensolaris.org/
--- a/components/libxml2/libxml2-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxml2/libxml2-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XML library - Python 2.6 bindings"
+set name=com.oracle.info.description value="Python 2.6 bindings for the XML library"
+set name=com.oracle.info.tpno value=5302
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxml2/libxml2-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxml2/libxml2-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/libxml2-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XML library - Python 2.7 bindings"
+set name=com.oracle.info.description value="Python 2.7 bindings for the XML library"
+set name=com.oracle.info.tpno value=5302
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxml2/libxml2.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxml2/libxml2.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- libxml2 2.9.0 -
------------------
-
-Oracle Internal Tracking Number 5302
-
Except where otherwise noted in the source code (e.g. the files hash.c,
list.c and the trio files, which are covered by a similar licence but
with different Copyright notices) all the files are:
--- a/components/libxml2/libxml2.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxml2/libxml2.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
set name=pkg.fmri \
value=pkg:/library/libxml2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XML library"
+set name=com.oracle.info.description value="the XML library"
+set name=com.oracle.info.tpno value=5302
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxslt/libxsl-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxslt/libxsl-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/libxsl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XSLT library - Python 2.6 bindings"
+set name=com.oracle.info.description value="Python 2.6 bindings for the XSLT library"
+set name=com.oracle.info.tpno value=5303
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxslt/libxsl-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxslt/libxsl-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/libxsl-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XSLT library - Python 2.7 bindings"
+set name=com.oracle.info.description value="Python 2.7 bindings for the XSLT library"
+set name=com.oracle.info.tpno value=5303
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxslt/libxslt.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxslt/libxslt.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/library/libxslt@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XSLT library"
+set name=com.oracle.info.description value="the XSLT library"
+set name=com.oracle.info.tpno value=5303
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxslt/xsl.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxslt/xsl.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------------
-- libxslt 1.1.27 -
-------------------
-
-Oracle Internal Tracking Number 5303
-
Licence for libxslt except libexslt
----------------------------------------------------------------------
Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved.
--- a/components/lighttpd/lighttpd.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lighttpd/lighttpd.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------
-- lighttpd 1.4.23 -
--------------------
-
-Oracle Internal Tracking Number 5585
-
Copyright (c) 2004, Jan Kneschke, incremental
All rights reserved.
--- a/components/lighttpd/lighttpd.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lighttpd/lighttpd.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
value=pkg:/web/server/lighttpd-14@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="The Lighttpd Web Server"
+set name=com.oracle.info.description value="the Lightppd web server"
+set name=com.oracle.info.tpno value=5585
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/links/links.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/links/links.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,4 @@
---------------
-- links 1.03 -
---------------
-
-Oracle Internal Tracking Number 9049
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
--- a/components/links/links.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/links/links.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri value=pkg:/web/browser/links@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary value="Text based web browser"
+set name=com.oracle.info.description value="the links text based web browser"
+set name=com.oracle.info.tpno value=9049
set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-astng/logilab-astng-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-astng/logilab-astng-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -29,6 +29,8 @@
value="logilab-astng provides a common base representation of python source code for projects such as pylint."
set name=pkg.summary \
value="logilab-astng - Python Abstract Syntax Tree New Generation"
+set name=com.oracle.info.description value="the logilab-astng Python 2.6 module"
+set name=com.oracle.info.tpno value=8267
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-astng/logilab-astng-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-astng/logilab-astng-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -29,6 +29,8 @@
value="logilab-astng provides a common base representation of python source code for projects such as pylint."
set name=pkg.summary \
value="logilab-astng - Python Abstract Syntax Tree New Generation"
+set name=com.oracle.info.description value="the logilab-astng Python 2.7 module"
+set name=com.oracle.info.tpno value=8267
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-astng/logilab-astng.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-astng/logilab-astng.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,8 +1,3 @@
-------------------------
-- logilab-astng 0.24.0 -
-------------------------
-Oracle Internal Tracking Number 8267
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/logilab-astng/logilab-astng.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-astng/logilab-astng.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,8 @@
value="logilab-astng provides a common base representation of python source code for projects such as pylint."
set name=pkg.summary \
value="logilab-astng - Python Abstract Syntax Tree New Generation"
+set name=com.oracle.info.description value="the logilab-astng Python module"
+set name=com.oracle.info.tpno value=8267
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-common/logilab-common-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-common/logilab-common-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="Modules providing low level functionality shared among various python projects."
set name=pkg.summary value="common python libraries for logilab applications"
+set name=com.oracle.info.description value="the logilab-common Python 2.6 module"
+set name=com.oracle.info.tpno value=8268
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-common/logilab-common-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-common/logilab-common-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="Modules providing low level functionality shared among various python projects."
set name=pkg.summary value="common python libraries for logilab applications"
+set name=com.oracle.info.description value="the logilab-common Python 2.7 module"
+set name=com.oracle.info.tpno value=8268
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-common/logilab-common.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-common/logilab-common.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------------
-- logilab-common 0.58.2 -
--------------------------
-Oracle Internal Tracking Number 8268
-
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/logilab-common/logilab-common.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-common/logilab-common.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="Modules providing low level functionality shared among various python projects."
set name=pkg.summary value="common python libraries for logilab applications"
+set name=com.oracle.info.description value="the logilab-common Python module"
+set name=com.oracle.info.tpno value=8268
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/lua/lua.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lua/lua.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------
-- lua 5.1.4 -
--------------
-
-Oracle Internal Tracking Number 5814
-
License for Lua 5.0 and later versions
Copyright (C) 1994-2010 Lua.org, PUC-Rio.
--- a/components/lua/lua.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lua/lua.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="Lua is a powerful, fast, lightweight, embeddable scripting language."
set name=pkg.summary value="Lua Programming language"
+set name=com.oracle.info.description value="the lua scripting language"
+set name=com.oracle.info.tpno value=5814
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/m4/m4.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/m4/m4.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
---------------------------------------------------------------------
-
-Copyright (C) 1985-2008 Free Software Foundation, Inc.
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/m4/m4.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/m4/m4.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -29,6 +29,7 @@
set name=pkg.description \
value="GNU M4 is an implementation of the traditional Unix macro processor"
set name=pkg.summary value="GNU m4"
+set name=com.oracle.info.description value="GNU m4"
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/make/make.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/make/make.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
------------------
-- GNU Make 3.82 -
------------------
-Oracle Internal Tracking Number 5521
-
------------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/make/make.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/make/make.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,8 @@
set name=pkg.description \
value="GNU Make is an utility which controls the generation of executables and other target files."
set name=pkg.summary value="A utility for directing compilation."
+set name=com.oracle.info.description value="GNU make"
+set name=com.oracle.info.tpno value=5521
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mc/mc.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mc/mc.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/mc/mc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mc/mc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
set name=pkg.description \
value="GNU Midnight Commander is a full-screen text mode application that allows user to copy, move and delete files and whole directory trees, search for files and run commands in the subshell"
set name=pkg.summary value="The GNU Midnight Commander file manager"
+set name=com.oracle.info.description value="GNU Midnight Commander file manager"
set name=info.classification \
value="org.opensolaris.category.2008:Desktop (GNOME)/File Managers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/meld/meld.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/meld/meld.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------
-
Copyright (C) 2002-2006 Stephen Kennedy <[email protected]>
Copyright (C) 2003-2007 Free Software Foundation, Inc.
Copyright (C) 2003-2005 Miloslav Trmac <[email protected]>
--- a/components/meld/meld.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/meld/meld.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial."
set name=pkg.summary value="meld - graphical diff and merge tool"
+set name=com.oracle.info.description value="the meld graphical diff and merge tool"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/memcached-java/memcached-java.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/memcached-java/memcached-java.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------------
-- memchached-java 2.0.1 -
--------------------------
-
-Oracle Internal Tracking Number 5586
-
src/com/danga/ByteBufArrayInputStream.java
==========================================
* Copyright (c) 2007 Greg Whalin
--- a/components/memcached-java/memcached-java.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/memcached-java/memcached-java.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform dir file path=usr/share/lib/java/javadoc* -> default group other>
@@ -30,7 +30,9 @@
set action.hash javadocs/%<1>>
set name=pkg.fmri value=pkg:/library/java/memcached-java@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="memcached client for the java platform"
+set name=pkg.summary value="memcached client for the Java platform"
+set name=com.oracle.info.description value="the memcached client for the Java platform"
+set name=com.oracle.info.tpno value=5586
set name=info.classification value="org.opensolaris.category.2008:Development/Java"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/memcached/memcached.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/memcached/memcached.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------
-- memcached 1.4.5 -
--------------------
-
-Oracle Internal Tracking Number 5711
-
Copyright (c) 2003, Danga Interactive, Inc.
All rights reserved.
--- a/components/memcached/memcached.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/memcached/memcached.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/service/memcached@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The memcached memory object cache"
+set name=com.oracle.info.description value="the memcached memory object cache"
+set name=com.oracle.info.tpno value=5711
set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mercurial/mercurial-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mercurial/mercurial-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/developer/versioning/mercurial-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Mercurial Source Control Management System"
set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
+set name=com.oracle.info.description value="the Mercurial source control management system"
set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mercurial/mercurial-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mercurial/mercurial-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/developer/versioning/mercurial-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Mercurial Source Control Management System"
set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
+set name=com.oracle.info.description value="the Mercurial source control management system"
set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mercurial/mercurial.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mercurial/mercurial.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------
Copyright (C) 2004, 2005 Canonical Ltd
Copyright (C) 2005 Paul Mackerras. All rights reserved.
Copyright (C) 2005 Steve Borho
--- a/components/mercurial/mercurial.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mercurial/mercurial.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -35,6 +35,7 @@
set name=pkg.fmri value=pkg:/developer/versioning/mercurial@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Mercurial Source Control Management System"
set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
+set name=com.oracle.info.description value="the Mercurial source control management system"
set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mpc/mpc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mpc/mpc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/mpc@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Multiprecision complex data type evaluation library"
+set name=com.oracle.info.description value="GNU Mpc"
set name=info.classification value="org.opensolaris.category.2008:Development/High Performance Computing"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mpfr/mpfr.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mpfr/mpfr.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/mpfr/mpfr.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mpfr/mpfr.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/mpfr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU MPFR"
set name=pkg.description value="The GNU Multiple Precision with IEEE Rounding Floating-Point Library"
+set name=com.oracle.info.description value="GNU MPFR"
set name=info.classification value="org.opensolaris.category.2008:Development/High Performance Computing"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mutt/mutt.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mutt/mutt.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
The following copyright notices apply to most of the program. Some
modules are under different licenses, or in the public domain.
--- a/components/mutt/mutt.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mutt/mutt.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+/flea\.1$ -> default mangler.man.stability uncommitted>
@@ -38,6 +38,7 @@
set name=pkg.fmri value=pkg:/mail/mutt@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Mutt E-Mail Client"
set name=pkg.description value="Mutt is a small but very powerful text-based mail client for Unix operating systems."
+set name=com.oracle.info.description value="the Mutt email client"
set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mysql-5-1/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mysql-5-1/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -108,6 +108,9 @@
CONFIGURE_OPTIONS.64 += --libexecdir=$(CONFIGURE_PREFIX)/bin/$(MACH64)
CONFIGURE_OPTIONS.64 += --enable-dtrace DTRACEFLAGS='-64'
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/mysql-5-1/mysql-51.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mysql-5-1/mysql-51.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/ncftp/ncftp.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ncftp/ncftp.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-----------------
-- ncftp 3.2.3 -
-----------------
-
-Oracle Internal Tracking Number 9255
-
-
The Clarified Artistic License
Preamble
--- a/components/ncftp/ncftp.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ncftp/ncftp.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
<transform file path=usr.*/man/.+ -> default mangler.man.modified-date "April 20, 2011">
set name=pkg.fmri value=pkg:/network/ftp/ncftp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="NcFTP - client application implementing FTP"
+set name=com.oracle.info.description value="the ncftp file transfer application"
+set name=com.oracle.info.tpno value=9255
set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/net-snmp/net-snmp-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/net-snmp/net-snmp-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/net-snmp-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Net-SNMP - Python 2.6 bindings"
+set name=com.oracle.info.description value="Python 2.6 bindings for Net-SNMP"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/net-snmp/net-snmp-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/net-snmp/net-snmp-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/net-snmp-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Net-SNMP - Python 2.7 bindings"
+set name=com.oracle.info.description value="Python 2.7 bindings for Net-SNMP"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/net-snmp/net-snmp-addons.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/net-snmp/net-snmp-addons.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/system/management/snmp/net-snmp/addons@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Net-SNMP addon libraries"
+set name=com.oracle.info.description value="the Net-SNMP addon libraries"
set name=info.classification value="org.opensolaris.category.2008:System/Enterprise Management"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/net-snmp/net-snmp-base.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/net-snmp/net-snmp-base.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -28,6 +28,7 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=com.oracle.info.description value="the Net-SNMP agent files and libraries"
set name=info.classification value="org.opensolaris.category.2008:System/Enterprise Management"
set name=org.opensolaris.arc-caseid \
--- a/components/net-snmp/net-snmp-documentation.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/net-snmp/net-snmp-documentation.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
value=pkg:/system/management/snmp/net-snmp/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Net-SNMP Agent manpages and html documentation files"
+set name=com.oracle.info.description value="the Net-SNMP agent manpages and html documentation files"
set name=info.classification \
value="org.opensolaris.category.2008:System/Enterprise Management"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/nethack/nethack.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/nethack/nethack.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
value=pkg:/games/nethack@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="Nethack is a turn-based single-player dungeon exploration game related to Hack and Rogue. The primary interface is a pseudo-graphical display rendered in text in a terminal, and controlled by the keyboard."
set name=pkg.summary value="A single-player dungeon exploration game"
+set name=com.oracle.info.description value="the nethack game"
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Games
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/nmap/nmap.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/nmap/nmap.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------
-- nmap v6.25 -
---------------
-
-Oracle Internal Tracking Number 9217
-
/***************************************************************************
* COPYING -- Describes the terms under which Nmap is distributed. A copy *
* of the GNU GPL is appended to this file. *
--- a/components/nmap/nmap.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/nmap/nmap.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -33,6 +33,8 @@
value="Network exploration tool and security / port scanner."
set name=pkg.description \
value="Nmap is useful for inventorying the network, managing service upgrade schedules, and monitoring host or service uptime."
+set name=com.oracle.info.description value="the nmap network exploration tool and security / port scanner"
+set name=com.oracle.info.tpno value=9217
set name=info.classification \
value="org.opensolaris.category.2008:System/Administration and Configuration"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ntp/ntp.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ntp/ntp.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/share/doc/ntp/(.+$) -> set action.hash html/%<\1> >
@@ -29,6 +29,7 @@
set name=pkg.description \
value="Network Time Protocol v4, NTP Daemon and Utilities"
set name=pkg.summary value="Network Time Protocol Daemon v4"
+set name=com.oracle.info.description value="the Network Time Protocol Daemon"
set name=info.classification \
value=org.opensolaris.category.2008:System/Services
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/open-fabrics/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/open-fabrics/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
include ../../make-rules/ips.mk
@@ -35,6 +35,11 @@
# for now, everything with a Makefile should be built
SUBDIRS = $(shell echo */Makefile | sed -e 's;/Makefile;;g')
+# Do not apply the standard license transforms for this component. The
+# license actions in the open-fabrics.p5m file are already tagged with the
+# attributes.
+LICENSE_TRANSFORMS =
+
.PHONY: $(SUBDIRS)
download: TARGET = download
--- a/components/open-fabrics/open-fabrics.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/open-fabrics/open-fabrics.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -438,6 +438,70 @@
link path=usr/share/man/man3/ibv_init_ah_from_wc.3 target=ibv_create_ah_from_wc.3
link path=usr/share/man/man3/ibv_unregister_sm_events.3 target=ibv_register_sm_events.3
link path=usr/share/man/man3/mult_to_ibv_rate.3 target=ibv_rate_to_mult.3
-license open-fabrics.license license='open-fabrics'
+
+license open-fabrics.license license='open-fabrics' \
+ com.oracle.info.description="the OpenFabrics Enterprise Distribution" \
+ com.oracle.info.name=open-fabrics \
+ com.oracle.info.version=1.5.3
+
+license open-fabrics.license license='open-fabrics (ibutils)' \
+ com.oracle.info.description="the OpenFabrics User Level InfiniBand Management Utilities" \
+ com.oracle.info.name=ibutils \
+ com.oracle.info.version=1.5.7
+
+license open-fabrics.license license='open-fabrics (infiniband-diags)' \
+ com.oracle.info.description="the OpenFabrics Diagnostic Tools" \
+ com.oracle.info.name=infiniband-diags \
+ com.oracle.info.version=1.5.8
+
+license open-fabrics.license license='open-fabrics (libibmad)' \
+ com.oracle.info.description="the OpenFabrics InfiniBand MAD library" \
+ com.oracle.info.name=libibmad \
+ com.oracle.info.version=1.3.7
+
+license open-fabrics.license license='open-fabrics (libibumad)' \
+ com.oracle.info.description="the OpenFabrics user MAD interface library" \
+ com.oracle.info.name=libibumad \
+ com.oracle.info.version=1.3.7
+
+license open-fabrics.license license='open-fabrics (libibverbs)' \
+ com.oracle.info.description="the OpenFabrics RDMA verbs library" \
+ com.oracle.info.name=libibverbs \
+ com.oracle.info.version=1.1.4
+
+license open-fabrics.license license='open-fabrics (libmlx4)' \
+ com.oracle.info.description="the OpenFabrics Mellanox ConnectX driver" \
+ com.oracle.info.name=libmlx4 \
+ com.oracle.info.version=1.0.1
+
+license open-fabrics.license license='open-fabrics (librdmacm)' \
+ com.oracle.info.description="the OpenFabrics RDMA cm library" \
+ com.oracle.info.name=librdmacm \
+ com.oracle.info.version=1.0.14.1
+
+license open-fabrics.license license='open-fabrics (libsdp)' \
+ com.oracle.info.description="the OpenFabrics InfiniBand SDP library" \
+ com.oracle.info.name=libsdp \
+ com.oracle.info.version=1.1.108
+
+license open-fabrics.license license='open-fabrics (opensm)' \
+ com.oracle.info.description="the OpenFabrics InfiniBand Subnet Manager and Administrator" \
+ com.oracle.info.name=opensm \
+ com.oracle.info.version=3.3.9
+
+license open-fabrics.license license='open-fabrics (perftest)' \
+ com.oracle.info.description="the OpenFabrics performance tests" \
+ com.oracle.info.name=perftest \
+ com.oracle.info.version=1.3.0
+
+license open-fabrics.license license='open-fabrics (qperf)' \
+ com.oracle.info.description="the OpenFabrics RDMA and IP performance tests" \
+ com.oracle.info.name=qperf \
+ com.oracle.info.version=0.4.6
+
+license open-fabrics.license license='open-fabrics (rds-tools)' \
+ com.oracle.info.description="the OpenFabrics RDS support tools" \
+ com.oracle.info.name=rds-tools \
+ com.oracle.info.version=2.0.4
depend fmri=text/gawk type=require
--- a/components/openexr/openexr.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openexr/openexr.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- openexr 1.6.1 -
------------------
-
-Oracle Internal Tracking Number 5574
-
OPENEXR:
Copyright (c) 2006, Industrial Light & Magic, a division of Lucasfilm
--- a/components/openexr/openexr.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openexr/openexr.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/share/man/man./(.+$) -> set action.hash Solaris/%<\1> >
@@ -29,6 +29,8 @@
value="Libraries support for high dynamic-range image (HDR) format"
set name=pkg.summary \
value="OpenEXR header files and libraries used to read and write OpenEXR images"
+set name=com.oracle.info.description value="the OpenEXR header files and libraries"
+set name=com.oracle.info.tpno value=5574
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/openldap/openldap.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openldap/openldap.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------
-- openldap 2.4.30 -
--------------------
-
-Oracle Internal Tracking Number 5295
-
The OpenLDAP Public License
Version 2.8, 17 August 2003
--- a/components/openldap/openldap.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openldap/openldap.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -41,6 +41,8 @@
set name=pkg.description \
value="OpenLDAP is an open source implementation of the Lightweight Directory Access Protocol."
set name=pkg.summary value="OpenLDAP"
+set name=com.oracle.info.description value="OpenLDAP"
+set name=com.oracle.info.tpno value=5295
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/openscap/openscap-perl-512.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openscap/openscap-perl-512.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/perl-5/openscap-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Perl 5.12 bindings for the Open implementation of SCAP"
+set name=com.oracle.info.description value="Perl 5.12 bindings for the Open implementation of SCAP"
+set name=com.oracle.info.tpno value=8008
set name=info.classification value="org.opensolaris.category.2008:System/Security"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/openscap/openscap-python-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openscap/openscap-python-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/openscap-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python 2.6 bindings for the Open implementation of SCAP"
+set name=com.oracle.info.description value="the Python 2.6 bindings for the Open implementation of SCAP"
+set name=com.oracle.info.tpno value=8008
set name=info.classification value="org.opensolaris.category.2008:System/Security"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/openscap/openscap.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openscap/openscap.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------------
-- openscap 0.8.1 -
-------------------
-
-Oracle Internal Tracking Number 8008
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/openscap/openscap.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openscap/openscap.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
set name=pkg.fmri value=pkg:/security/compliance/openscap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Open implementation of SCAP; a line of standards managed by NIST"
+set name=com.oracle.info.description value="the Open implementation of SCAP"
+set name=com.oracle.info.tpno value=8008
set name=info.classification value="org.opensolaris.category.2008:System/Security"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
value=pkg:/library/security/openssl/openssl-fips-140@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary value="FIPS 140-2 Capable OpenSSL libraries"
+set name=com.oracle.info.description value="the FIPS 140-2 Capable OpenSSL libraries"
set name=info.classification \
value="org.opensolaris.category.2008:System/Security"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,7 @@
set name=pkg.description \
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.summary value="OpenSSL - a Toolkit for Secure Sockets Layer (SSL v2/v3) and Transport Layer (TLS v1) protocols and general purpose cryptographic library"
+set name=com.oracle.info.description value="OpenSSL"
set name=info.classification \
value="org.opensolaris.category.2008:System/Security"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/openusb/openusb.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openusb/openusb.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------------
-- OpenUSB v1.0.1 -
----------------------
-Oracle Internal Tracking Number 8843
-------------------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/openusb/openusb.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/openusb/openusb.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="A library to enable userspace application programs to communicate with USB devices"
set name=pkg.summary value="A USB device management library"
+set name=com.oracle.info.description value="the openusb USB device management library"
+set name=com.oracle.info.tpno value=8843
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/p7zip/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/p7zip/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -50,10 +50,8 @@
$(BUILD_DIR)/%: $(SOURCE_DIR)/DOCS/%
$(CP) $< $@
-$(BUILD_DIR)/copying.txt: $(SOURCE_DIR)/DOCS/copying.txt gpl_disclaimer
- $(CP) gpl_disclaimer $@
- echo "================================================================================" >> $@
- cat $(SOURCE_DIR)/DOCS/copying.txt >> $@
+$(BUILD_DIR)/copying.txt: $(SOURCE_DIR)/DOCS/copying.txt
+ $(CP) $(SOURCE_DIR)/DOCS/copying.txt $@
# common targets
build: $(BUILD_32)
--- a/components/p7zip/gpl_disclaimer Fri Apr 05 07:47:58 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
--- a/components/p7zip/p7zip.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/p7zip/p7zip.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -19,7 +19,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,7 @@
set name=pkg.description \
value="P7zip is a unix port of the 7-Zip utility. It has support for numerous compression algorithms, including LZMA and LZMA2, as well as for various archive and compression file formats, including 7z, xz, bzip2, gzip, tar, zip (read-write) and cab, cpio, deb, lzh, rar, and rpm (read-only)."
set name=pkg.summary value="The p7zip compression and archiving utility"
+set name=com.oracle.info.description value="the p7zip compression and archiving utility"
set name=info.classification value=org.opensolaris.category.2008:System/Core
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/pam_pkcs11/pam_pkcs11.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pam_pkcs11/pam_pkcs11.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/pam_pkcs11/pam_pkcs11.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pam_pkcs11/pam_pkcs11.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/security/pam/module/pam-pkcs11@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The OpenSC PKCS#11 PAM Login Tools"
+set name=com.oracle.info.description value="the OpenSC PKCS#11 PAM login tools"
set name=info.classification \
value="org.opensolaris.category.2008:System/Security"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/patch/patch.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/patch/patch.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------
-- patch 2.5.9 -
-----------------
-
-Oracle Internal Tracking Number 8588
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/patch/patch.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/patch/patch.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/text/gnu-patch@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The GNU Patch utility"
+set name=com.oracle.info.description value="GNU patch"
+set name=com.oracle.info.tpno value=8588
set name=info.classification \
value=org.opensolaris.category.2008:Development/GNU
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/pconsole/pconsole.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pconsole/pconsole.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
PCONSOLE LICENSE [ http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt ]
--------------------------------------------------------
--- a/components/pconsole/pconsole.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pconsole/pconsole.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,7 @@
value=pkg:/terminal/pconsole@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="pconsole is an administrative tool for working with clusters of machines: it distributes the commands you type to each node in the cluster."
set name=pkg.summary value="Parallel console"
+set name=com.oracle.info.description value="pconsole, the parallel console"
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/pcre/pcre.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pcre/pcre.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------
-- PCRE v8.21 -
---------------
-Oracle Internal Tracking Number 9271
-------------------------------------------------------------------------------
-
PCRE LICENCE
------------
--- a/components/pcre/pcre.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pcre/pcre.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
set name=pkg.fmri value=pkg:/library/pcre@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Perl-Compatible Regular Expressions"
set name=pkg.description value="The PCRE library is a set of functions that implement regular expression pattern matching using almost the same syntax and semantics as Perl"
+set name=com.oracle.info.description value="the PCRE library"
+set name=com.oracle.info.tpno value=9271
set name=info.classification value="org.opensolaris.category.2008:Development/C"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl512/perl-512.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl512/perl-512.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -27,6 +27,7 @@
set name=pkg.description \
value="Perl is a general-purpose programming language originally developed for text manipulation and now used for a wide range of tasks including system administration, web development, network programming, GUI development, and more."
set name=pkg.summary value=Perl
+set name=com.oracle.info.description value="Perl 5.12"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Perl
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/DBI/DBI.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/DBI/DBI.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=====================================================================
-
The DBI module is Copyright (c) 1994-2004 Tim Bunce. Ireland.
All rights reserved.
--- a/components/perl_modules/DBI/DBI.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/DBI/DBI.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/perl-5/database@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Perl Database Independent Interface"
set name=pkg.description value="The DBI is the standard database interface module for Perl."
+set name=com.oracle.info.description value="the Perl Database Independent interface"
set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/DBI/DBI_512.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/DBI/DBI_512.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
set name=pkg.fmri value=pkg:/library/perl-5/database-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Perl Database Independent Interface"
set name=pkg.description value="The DBI is the standard database interface module for Perl."
+set name=com.oracle.info.description value="the Perl Database Independent interface"
set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/DBI/DBI_584.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/DBI/DBI_584.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
set name=pkg.fmri value=pkg:/library/perl-5/database-584@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Perl Database Independent Interface"
set name=pkg.description value="The DBI is the standard database interface module for Perl."
+set name=com.oracle.info.description value="the Perl Database Independent interface"
set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/net-ssleay/net-ssleay-512.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/net-ssleay/net-ssleay-512.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,13 +20,14 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri \
value=pkg:/library/perl-5/net-ssleay-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Net::SSLeay- Perl extension for using OpenSSL"
+set name=com.oracle.info.description value="the Net::SSLeay Perl extension for using OpenSSL"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Perl"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/net-ssleay/net-ssleay-584.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/net-ssleay/net-ssleay-584.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,13 +20,14 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri \
value=pkg:/library/perl-5/net-ssleay-584@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Net::SSLeay- Perl extension for using OpenSSL"
+set name=com.oracle.info.description value="the Net::SSLeay Perl extension for using OpenSSL"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Perl"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/net-ssleay/net-ssleay.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/net-ssleay/net-ssleay.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,13 +20,14 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri \
value=pkg:/library/perl-5/net-ssleay@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Net::SSLeay- Perl extension for using OpenSSL"
+set name=com.oracle.info.description value="the Net::SSLeay Perl extension for using OpenSSL"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Perl"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/pmtools/pmtools.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/pmtools/pmtools.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/perl_modules/pmtools/pmtools.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/pmtools/pmtools.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -26,6 +26,7 @@
set name=pkg.description \
value="Perl module tools is a suite of small tools that help manage and inspect perl modules, perl Plain Old Documentation files, and perl programs."
set name=pkg.summary value="Perl module tools."
+set name=com.oracle.info.description value="the Perl module tools"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Perl
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/pmtools/pmtools_512.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/pmtools/pmtools_512.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="Perl module tools is a suite of small tools that help manage and inspect perl modules, perl Plain Old Documentation files, and perl programs."
set name=pkg.summary value="Perl module tools."
+set name=com.oracle.info.description value="the Perl module tools"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Perl
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/pmtools/pmtools_584.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/pmtools/pmtools_584.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="Perl module tools is a suite of small tools that help manage and inspect perl modules, perl Plain Old Documentation files, and perl programs."
set name=pkg.summary value="Perl module tools."
+set name=com.oracle.info.description value="the Perl module tools"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Perl
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/xml-parser/xml-parser-512.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/xml-parser/xml-parser-512.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri value=pkg:/library/perl-5/xml-parser-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="XML::Parser - A perl module for parsing XML documents"
set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
+set name=com.oracle.info.description value="the XML::Parser Perl 5.12 module"
set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/xml-parser/xml-parser-584.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/xml-parser/xml-parser-584.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri value=pkg:/library/perl-5/xml-parser-584@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="XML::Parser - A perl module for parsing XML documents"
set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
+set name=com.oracle.info.description value="the XML::Parser Perl 5.8.4 module"
set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/xml-parser/xml-parser.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/xml-parser/xml-parser.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
# The version is specifically set to 5.8.4 until there is a version that it
@@ -27,6 +27,7 @@
set name=pkg.fmri value=pkg:/library/perl-5/[email protected],$(BUILD_VERSION)
set name=pkg.summary value="XML::Parser - A perl module for parsing XML documents"
set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
+set name=com.oracle.info.description value="the XML::Parser Perl module"
set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/xml-simple/xml-simple-512.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/xml-simple/xml-simple-512.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri value=pkg:/library/perl-5/xml-simple-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="XML::Simple - Easy API to maintain XML (esp config files)"
set name=pkg.description value="The XML::Simple module provides a simple API layer on top of an underlying XML parsing module (either XML::Parser or one of the SAX2 parser modules)."
+set name=com.oracle.info.description value="the XML::Simple Perl module"
set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/xml-simple/xml-simple-584.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/xml-simple/xml-simple-584.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri value=pkg:/library/perl-5/xml-simple-584@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="XML::Simple - Easy API to maintain XML (esp config files)"
set name=pkg.description value="The XML::Simple module provides a simple API layer on top of an underlying XML parsing module (either XML::Parser or one of the SAX2 parser modules)."
+set name=com.oracle.info.description value="the XML::Simple Perl module"
set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/perl_modules/xml-simple/xml-simple.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/perl_modules/xml-simple/xml-simple.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/perl-5/xml-simple@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="XML::Simple - Easy API to maintain XML (esp config files)"
set name=pkg.description value="The XML::Simple module provides a simple API layer on top of an underlying XML parsing module (either XML::Parser or one of the SAX2 parser modules)."
+set name=com.oracle.info.description value="the XML::Simple Perl module"
set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/php-5_2/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
include ../../make-rules/ips.mk
@@ -135,6 +135,11 @@
PKG_PROTO_DIRS += xdebug/build/prototype/$(MACH)
PKG_PROTO_DIRS += xdebug-zts/build/prototype/$(MACH)
+# Do not apply the standard license transforms for this component. The
+# license actions are already tagged with the attributes, in the various
+# .p5m files.
+LICENSE_TRANSFORMS =
+
# for now, everything with a Makefile should be built
SUBDIRS = $(shell echo */Makefile | sed -e 's;/Makefile;;g')
--- a/components/php-5_2/apache-php52.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/apache-php52.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
---------------
-- php 5.2.17 -
---------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_2/apache-php52.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/apache-php52.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -31,7 +31,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license apache-php52.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
+license apache-php52.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
+ com.oracle.info.description="the PHP 5.2 module for the Apache web server" \
+ com.oracle.info.name=apache-php52 \
+ com.oracle.info.version=5.2.17
dir path=etc
dir path=etc/apache2
--- a/components/php-5_2/php-52.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-52.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
---------------
-- php 5.2.17 -
---------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_2/php-52.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-52.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -39,7 +39,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-52.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
+license php-52.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
+ com.oracle.info.description="the PHP scripting language" \
+ com.oracle.info.name=php-52 \
+ com.oracle.info.version=5.2.17
dir path=etc
dir path=etc/php
--- a/components/php-5_2/php-apc.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-apc.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
---------------
-- APC 3.0.19 -
---------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_2/php-apc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-apc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-52/extension/[email protected],$(BUILD_VERSION)
@@ -33,7 +33,10 @@
value=LSARC/2008/538
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-apc.license license='PHP'
+license php-apc.license license='PHP' \
+ com.oracle.info.description="the APC extension module for PHP" \
+ com.oracle.info.name=php-apc \
+ com.oracle.info.version=3.0.19
dir path=etc
dir path=etc/apache2
--- a/components/php-5_2/php-doc.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-doc.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
---------------
-- php 5.2.17 -
---------------
-
--------------------------------------------------------------------
The PHP License, version 3.01
Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
--- a/components/php-5_2/php-doc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-doc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -32,7 +32,10 @@
value=LSARC/2008/538
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-doc.license license='PHP'
+license php-doc.license license='PHP' \
+ com.oracle.info.description="the PHP documentation" \
+ com.oracle.info.name=php-doc \
+ com.oracle.info.version=5.2.17
dir path=usr
dir path=usr/php
--- a/components/php-5_2/php-idn.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-idn.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
--------------
-- idn 0.2.0 -
--------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_2/php-idn.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-idn.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-52/extension/[email protected],$(BUILD_VERSION)
@@ -31,7 +31,10 @@
value=LSARC/2008/538
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-idn.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
+license php-idn.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
+ com.oracle.info.description="the IDN extension module for PHP" \
+ com.oracle.info.name=php-idn \
+ com.oracle.info.version=0.2.0
dir path=etc
dir path=etc/php
--- a/components/php-5_2/php-memcache.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-memcache.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
-------------------
-- memcache 2.2.5 -
-------------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_2/php-memcache.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-memcache.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-52/extension/[email protected],$(BUILD_VERSION)
@@ -32,7 +32,10 @@
value=LSARC/2008/538
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-memcache.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
+license php-memcache.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
+ com.oracle.info.description="the Memcache extension module for PHP" \
+ com.oracle.info.name=php-memcache \
+ com.oracle.info.version=2.2.5
dir path=etc
dir path=etc/apache2
--- a/components/php-5_2/php-mysql.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-mysql.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
---------------------
-- php-mysql 5.2.17 -
---------------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_2/php-mysql.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-mysql.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-52/extension/[email protected],$(BUILD_VERSION)
@@ -31,7 +31,10 @@
value=LSARC/2008/538
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-mysql.license license='PHP, LGPLv2'
+license php-mysql.license license='PHP, LGPLv2' \
+ com.oracle.info.description="the MySQL extension module for PHP" \
+ com.oracle.info.name=php-mysql \
+ com.oracle.info.version=5.2.17
dir path=etc
dir path=etc/php
--- a/components/php-5_2/php-pear.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-pear.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
--------------------
-- php-pear 5.2.17 -
--------------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_2/php-pear.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-pear.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
# All the files under /var/php are mode=0644
@@ -39,7 +39,10 @@
value=LSARC/2008/538
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-pear.license license='PHP, LGPLv2.1'
+license php-pear.license license='PHP, LGPLv2.1' \
+ com.oracle.info.description="the PEAR extension module for PHP" \
+ com.oracle.info.name=php-pear \
+ com.oracle.info.version=5.2.17
dir path=etc
dir path=etc/php
--- a/components/php-5_2/php-suhosin.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-suhosin.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
-------------------
-- suhosin 0.9.29 -
-------------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_2/php-suhosin.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-suhosin.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-52/extension/[email protected],$(BUILD_VERSION)
@@ -31,7 +31,10 @@
value=LSARC/2008/538
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-suhosin.license license='PHP, Apache v2.0'
+license php-suhosin.license license='PHP, Apache v2.0' \
+ com.oracle.info.description="the Suhosin extension module for PHP" \
+ com.oracle.info.name=php-suhosin \
+ com.oracle.info.version=0.9.29
dir path=etc
dir path=etc/php
--- a/components/php-5_2/php-tcpwrap.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-tcpwrap.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
------------------
-- tcpwrap 1.1.3 -
------------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_2/php-tcpwrap.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-tcpwrap.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-52/extension/[email protected],$(BUILD_VERSION)
@@ -31,7 +31,10 @@
value=LSARC/2008/538
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-tcpwrap.license license='PHP'
+license php-tcpwrap.license license='PHP' \
+ com.oracle.info.description="the Tcpwrap extension module for PHP" \
+ com.oracle.info.name=php-tcpwrap \
+ com.oracle.info.version=1.1.3
dir path=etc
dir path=etc/php
--- a/components/php-5_2/php-xdebug.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-xdebug.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
-----------------
-- xdebug 2.0.5 -
-----------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_2/php-xdebug.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_2/php-xdebug.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-52/extension/[email protected],$(BUILD_VERSION)
@@ -33,7 +33,10 @@
value=LSARC/2008/538
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-xdebug.license license='PHP, Xdebug'
+license php-xdebug.license license='PHP, Xdebug' \
+ com.oracle.info.description="the XDebug extension module for PHP" \
+ com.oracle.info.name=php-xdebug \
+ com.oracle.info.version=2.0.5
dir path=etc
dir path=etc/php
--- a/components/php-5_3/apache-php53.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/apache-php53.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
---------------
-- php 5.3.10 -
---------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_3/apache-php53.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/apache-php53.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/server/apache-22/module/[email protected],$(BUILD_VERSION)
@@ -29,7 +29,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license apache-php53.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
+license apache-php53.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
+ com.oracle.info.description="the PHP 5.3 module for the Apache web server" \
+ com.oracle.info.name=apache-php53 \
+ com.oracle.info.version=5.3.14
dir path=etc
dir path=etc/apache2
--- a/components/php-5_3/php-53.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-53.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
---------------
-- php 5.3.10 -
---------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_3/php-53.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-53.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -38,7 +38,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-53.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
+license php-53.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
+ com.oracle.info.description="the PHP scripting language" \
+ com.oracle.info.name=php-53 \
+ com.oracle.info.version=5.3.14
dir path=etc
dir path=etc/php
--- a/components/php-5_3/php-apc.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-apc.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
--------------
-- APC 3.1.9 -
--------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_3/php-apc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-apc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-53/extension/[email protected],$(BUILD_VERSION)
@@ -32,7 +32,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-apc.license license='PHP'
+license php-apc.license license='PHP' \
+ com.oracle.info.description="the APC extension module for PHP" \
+ com.oracle.info.name=php-apc \
+ com.oracle.info.version=3.1.9
dir path=etc
dir path=etc/apache2
--- a/components/php-5_3/php-doc.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-doc.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
---------------
-- php 5.3.10 -
---------------
-
--------------------------------------------------------------------
The PHP License, version 3.01
Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
--- a/components/php-5_3/php-doc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-doc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-53/[email protected],$(BUILD_VERSION)
@@ -30,7 +30,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-doc.license license='PHP'
+license php-doc.license license='PHP' \
+ com.oracle.info.description="the PHP documentation" \
+ com.oracle.info.name=php-doc \
+ com.oracle.info.version=5.3.14
dir path=usr
dir path=usr/php
--- a/components/php-5_3/php-idn.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-idn.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
--------------
-- idn 0.2.0 -
--------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_3/php-idn.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-idn.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-53/extension/[email protected],$(BUILD_VERSION)
@@ -30,7 +30,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-idn.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
+license php-idn.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
+ com.oracle.info.description="the IDN extension module for PHP" \
+ com.oracle.info.name=php-idn \
+ com.oracle.info.version=0.2.0
dir path=etc
dir path=etc/php
--- a/components/php-5_3/php-memcache.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-memcache.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
-------------------
-- memcache 3.0.6 -
-------------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_3/php-memcache.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-memcache.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-53/extension/[email protected],$(BUILD_VERSION)
@@ -31,7 +31,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-memcache.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
+license php-memcache.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
+ com.oracle.info.description="the Memcache extension module for PHP" \
+ com.oracle.info.name=php-memcache \
+ com.oracle.info.version=3.0.6
dir path=etc
dir path=etc/apache2
--- a/components/php-5_3/php-mysql.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-mysql.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
---------------------
-- php-mysql 5.3.10 -
---------------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_3/php-mysql.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-mysql.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-53/extension/[email protected],$(BUILD_VERSION)
@@ -30,7 +30,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-mysql.license license='PHP, LGPLv2'
+license php-mysql.license license='PHP, LGPLv2' \
+ com.oracle.info.description="the MySQL extension module for PHP" \
+ com.oracle.info.name=php-mysql \
+ com.oracle.info.version=5.3.14
dir path=etc
dir path=etc/php
--- a/components/php-5_3/php-pear.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-pear.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
--------------------
-- php-pear 5.3.10 -
--------------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_3/php-pear.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-pear.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
# All the files under /var/php are mode=0644
@@ -37,7 +37,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-pear.license license='PHP, LGPLv2.1'
+license php-pear.license license='PHP, LGPLv2.1' \
+ com.oracle.info.description="the PEAR extension module for PHP" \
+ com.oracle.info.name=php-pear \
+ com.oracle.info.version=5.3.14
dir path=etc
dir path=etc/php
--- a/components/php-5_3/php-suhosin.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-suhosin.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
-------------------
-- suhosin 0.9.33 -
-------------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_3/php-suhosin.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-suhosin.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-53/extension/[email protected],$(BUILD_VERSION)
@@ -30,7 +30,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-suhosin.license license='PHP, Apache v2.0'
+license php-suhosin.license license='PHP, Apache v2.0' \
+ com.oracle.info.description="the Suhosin extension module for PHP" \
+ com.oracle.info.name=php-suhosin \
+ com.oracle.info.version=0.9.33
dir path=etc
dir path=etc/php
--- a/components/php-5_3/php-tcpwrap.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-tcpwrap.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
------------------
-- tcpwrap 1.1.3 -
------------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_3/php-tcpwrap.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-tcpwrap.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-53/extension/[email protected],$(BUILD_VERSION)
@@ -30,7 +30,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-tcpwrap.license license='PHP'
+license php-tcpwrap.license license='PHP' \
+ com.oracle.info.description="the Tcpwrap extension module for PHP" \
+ com.oracle.info.name=php-tcpwrap \
+ com.oracle.info.version=1.1.3
dir path=etc
dir path=etc/php
--- a/components/php-5_3/php-xdebug.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-xdebug.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
-----------------
-- xdebug 2.1.3 -
-----------------
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/php-5_3/php-xdebug.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-5_3/php-xdebug.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/web/php-53/extension/[email protected],$(BUILD_VERSION)
@@ -32,7 +32,10 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license php-xdebug.license license='PHP, Xdebug'
+license php-xdebug.license license='PHP, Xdebug' \
+ com.oracle.info.description="the XDebug extension module for PHP" \
+ com.oracle.info.name=php-xdebug \
+ com.oracle.info.version=2.2.0
dir path=etc
dir path=etc/php
--- a/components/php-common/php-common.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-common/php-common.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
# Bypassing the mangler because the ATTRIBUTES section shouldn't include
@@ -31,6 +31,7 @@
set name=pkg.description \
value="A general-purpose scripting language originally designed for web development to produce dynamic web pages."
set name=pkg.summary value="PHP Server"
+set name=com.oracle.info.description value="the PHP scripting language"
set name=info.classification \
value="org.opensolaris.category.2008:Development/PHP"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/php-common/php.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/php-common/php.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
---------------
-- php 5.3.10 -
---------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
-
/*
* --------------------------------------------------------------------
* The PHP License, version 3.01
--- a/components/pinentry/pinentry.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pinentry/pinentry.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------------
-- pinentry v0.7.6 -
----------------------
-Oracle Internal Tracking Number 8850
-------------------------------------------------------------------------------
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/pinentry/pinentry.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pinentry/pinentry.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/security/pinentry@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A small utility for entering passwords."
set name=pkg.description value="A small collection of dialog programs that allow GnuPG to read passphrases and PIN numbers in a secure manner."
+set name=com.oracle.info.description value="the pinentry utility"
+set name=com.oracle.info.tpno value=8850
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/privoxy/privoxy.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/privoxy/privoxy.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/privoxy/privoxy.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/privoxy/privoxy.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -37,6 +37,7 @@
value=pkg:/web/proxy/privoxy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="Privoxy is a non-caching web proxy with advanced filtering capabilities for enhancing privacy, modifying web page data and HTTP headers, controlling access, and removing ads and other obnoxious Internet junk"
set name=pkg.summary value="Privacy-enhancing, ad-removing web proxy"
+set name=com.oracle.info.description value="the privoxy web proxy"
set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/proftpd/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/proftpd/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -92,6 +92,11 @@
# proftpd configure and build is not ready for run out of the source tree
CONFIGURE_SCRIPT = $(@D)/configure
+# Do not apply the standard license transforms for this component. The
+# license actions in the proftpd.p5m file are already tagged with the
+# attributes.
+LICENSE_TRANSFORMS =
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/proftpd/proftpd.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/proftpd/proftpd.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,15 +1,3 @@
-Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
-
-This package may include technology which may be subject to one or more
-of the following additional notices:
-
-------------------
-- ProFTPD 1.3.3g -
-------------------
-
-Oracle Internal Tracking Number: 6824
-
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/proftpd/proftpd.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/proftpd/proftpd.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
# PSARC/2011/088
@@ -200,6 +200,15 @@
name="FTP Server, (Usr)" \
desc="FTP Server and Utilities"
-license proftpd.license license="GPLv2"
+license proftpd.license license="GPLv2 (mod_gss)" \
+ com.oracle.info.description="the ProFPTD GSS Engine" \
+ com.oracle.info.name=mod_gss \
+ com.oracle.info.tpno=4477 \
+ com.oracle.info.version=1.3.3
+license proftpd.license license="GPLv2 (proftpd)" \
+ com.oracle.info.description="the ProFTPD server and utilities" \
+ com.oracle.info.name=proftpd \
+ com.oracle.info.tpno=6824 \
+ com.oracle.info.version=1.3.3g
user ftpuser=false gcos-field="FTPD Reserved UID" username="ftp" uid=21 group="ftp"
--- a/components/psutils/psutils.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/psutils/psutils.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
----------------
-- psutils p17 -
----------------
-
-Oracle Internal Tracking Number 9004
-
-v.08302010
-
They may be copied and used for any purpose (including distribution as part of
a for-profit product), provided:
--- a/components/psutils/psutils.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/psutils/psutils.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -28,6 +28,8 @@
set name=pkg.description \
value="Collection of utilities for manipulating PostScript documents"
set name=pkg.summary value="PostScript utilities"
+set name=com.oracle.info.description value="the psutils PostScript Utilities"
+set name=com.oracle.info.tpno value=9004
set name=info.classification \
value=org.opensolaris.category.2008:System/Printing
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/pv/pv.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pv/pv.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/shell/pipe-viewer@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Pipe Viewer"
+set name=com.oracle.info.description value="the pv utility"
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/pwgen/pwgen.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pwgen/pwgen.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
---------------
-- pwgen 2.06 -
---------------
-
-Oracle Internal Tracking Number 9020
-
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/pwgen/pwgen.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pwgen/pwgen.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -28,6 +28,8 @@
set name=pkg.description \
value="pwgen is a password generator for creating passwords which can be easily memorized by a human."
set name=pkg.summary value="Easy to memorize password generator"
+set name=com.oracle.info.description value="the pwgen password generator"
+set name=com.oracle.info.tpno value=9020
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/pylint/pylint-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pylint/pylint-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
set name=pkg.fmri value=pkg:/developer/python/pylint-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="pylint - python code static checker"
set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
+set name=com.oracle.info.description value="the pylint Python code static checker for Python 2.6"
+set name=com.oracle.info.tpno value=9026
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/pylint/pylint-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pylint/pylint-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
set name=pkg.fmri value=pkg:/developer/python/pylint-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="pylint - python code static checker"
set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
+set name=com.oracle.info.description value="the pylint Python code static checker for Python 2.7"
+set name=com.oracle.info.tpno value=9026
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/pylint/pylint.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pylint/pylint.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,23 +1,3 @@
------------------
-- pylint 0.25.2 -
------------------
-Oracle Internal Tracking Number 9026
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-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 the GNU General Public License for more details
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/pylint/pylint.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/pylint/pylint.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
set name=pkg.fmri value=pkg:/developer/python/pylint@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="pylint - python code static checker"
set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
+set name=com.oracle.info.description value="the pylint code static checker for Python"
+set name=com.oracle.info.tpno value=9026
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/cherrypy/cherrypy-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/cherrypy/cherrypy-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/cherrypy-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
set name=pkg.description value="CherryPy is a Pythonic, object-oriented HTTP framework"
+set name=com.oracle.info.description value="the CherryPy object-oriented HTTP framework for Python 2.6"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="CherryPy Team <[email protected]>"
--- a/components/python/cherrypy/cherrypy-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/cherrypy/cherrypy-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/cherrypy-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
set name=pkg.description value="CherryPy is a Pythonic, object-oriented HTTP framework"
+set name=com.oracle.info.description value="the CherryPy object-oriented HTTP framework for Python 2.7"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="CherryPy Team <[email protected]>"
--- a/components/python/cherrypy/cherrypy.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/cherrypy/cherrypy.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/cherrypy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
set name=pkg.description value="CherryPy is a Pythonic, object-oriented HTTP framework"
+set name=com.oracle.info.description value="the CherryPy object-oriented HTTP framework"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="CherryPy Team <[email protected]>"
--- a/components/python/coverage/coverage-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/coverage/coverage-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/coverage-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The coverage.py Python code coverage tool"
set name=pkg.description value="Coverage measures Python code coverage, typically during test execution."
+set name=com.oracle.info.description value="coverage, the code coverage tool for Python 2.6"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Ned Batchelder <[email protected]>"
--- a/components/python/coverage/coverage-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/coverage/coverage-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/coverage-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The coverage.py Python code coverage tool"
set name=pkg.description value="Coverage measures Python code coverage, typically during test execution."
+set name=com.oracle.info.description value="coverage, the code coverage tool for Python 2.7"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Ned Batchelder <[email protected]>"
--- a/components/python/coverage/coverage.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/coverage/coverage.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/coverage@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The coverage.py Python code coverage tool"
set name=pkg.description value="Coverage measures Python code coverage, typically during test execution."
+set name=com.oracle.info.description value="coverage, the code coverage tool for Python"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Ned Batchelder <[email protected]>"
--- a/components/python/jsonrpclib/jsonrpclib-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/jsonrpclib/jsonrpclib-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/jsonrpclib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
+set name=com.oracle.info.description value="the Python 2.6 implementation of JSON-RPC v2.0"
+set name=com.oracle.info.tpno value=8061
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Josh Marshall <[email protected]>"
--- a/components/python/jsonrpclib/jsonrpclib-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/jsonrpclib/jsonrpclib-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/jsonrpclib-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
+set name=com.oracle.info.description value="the Python 2.7 implementation of JSON-RPC v2.0"
+set name=com.oracle.info.tpno value=8061
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Josh Marshall <[email protected]>"
--- a/components/python/jsonrpclib/jsonrpclib.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/jsonrpclib/jsonrpclib.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------------
-- jsonrpclib e3a3cde -
-----------------------
-
-Oracle Internal Tracking Number 8061
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
--- a/components/python/jsonrpclib/jsonrpclib.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/jsonrpclib/jsonrpclib.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
+set name=com.oracle.info.description value="the Python implementation of JSON-RPC v2.0"
+set name=com.oracle.info.tpno value=8061
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Josh Marshall <[email protected]>"
--- a/components/python/ldtp/ldtp-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/ldtp/ldtp-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/system/desktop/ldtp-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Linux Desktop Testing Project"
set name=pkg.description value="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications."
+set name=com.oracle.info.description value="ldtp, the Linux Desktop Testing Project for Python 2.6"
set name=info.classification value="org.opensolaris.category.2008:Development/Distribution Tools"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/ldtp/ldtp-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/ldtp/ldtp-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
#<transform file path=usr/lib/python2.7/vendor-packages/.*\.py$ -> \
@@ -27,6 +27,7 @@
set name=pkg.fmri value=pkg:/system/desktop/ldtp-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Linux Desktop Testing Project"
set name=pkg.description value="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications."
+set name=com.oracle.info.description value="ldtp, the Linux Desktop Testing Project for Python 2.7"
set name=info.classification value="org.opensolaris.category.2008:Development/Distribution Tools"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/ldtp/ldtp.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/ldtp/ldtp.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/python/ldtp/ldtp.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/ldtp/ldtp.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/system/desktop/ldtp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Linux Desktop Testing Project"
set name=pkg.description value="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications."
+set name=com.oracle.info.description value="ldtp, the Linux Desktop Testing Project"
set name=info.classification value="org.opensolaris.category.2008:Development/Distribution Tools"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/m2crypto/m2crypto-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/m2crypto/m2crypto-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/m2crypto-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python interface for openssl"
+set name=com.oracle.info.description value="Python 2.6 bindings for M2Crypto"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Heikki Toivonen <[email protected]>"
--- a/components/python/m2crypto/m2crypto-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/m2crypto/m2crypto-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/m2crypto-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python interface for openssl"
+set name=com.oracle.info.description value="Python 2.7 bindings for M2Crypto"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Heikki Toivonen <[email protected]>"
--- a/components/python/m2crypto/m2crypto.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/m2crypto/m2crypto.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/m2crypto@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python interface for openssl"
+set name=com.oracle.info.description value="Python bindings for M2Crypto"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Heikki Toivonen <[email protected]>"
--- a/components/python/mako/mako-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/mako/mako-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/mako-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Template library written in Python"
set name=pkg.description value="Mako is an embedded Python (i.e., Python Server Page) templating language."
+set name=com.oracle.info.description value="the Mako Python template library"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Mike Bayer <[email protected]>"
--- a/components/python/mako/mako-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/mako/mako-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/mako-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Template library written in Python"
set name=pkg.description value="Mako is an embedded Python (i.e., Python Server Page) templating language."
+set name=com.oracle.info.description value="the Mako Python template library"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Mike Bayer <[email protected]>"
--- a/components/python/mako/mako.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/mako/mako.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/mako@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Template library written in Python"
set name=pkg.description value="Mako is an embedded Python (i.e., Python Server Page) templating language."
+set name=com.oracle.info.description value="the Mako Python template library"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Mike Bayer <[email protected]>"
--- a/components/python/nose/nose-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/nose/nose-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/nose-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A unittest-based testing framework for python that makes writing and running tests easier"
+set name=com.oracle.info.description value="the nose unit test framework for Python 2.6"
+set name=com.oracle.info.tpno value=6585
set name=info.classification value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/python/nose/nose-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/nose/nose-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/nose-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A unittest-based testing framework for python that makes writing and running tests easier"
+set name=com.oracle.info.description value="the nose unit test framework for Python 2.7"
+set name=com.oracle.info.tpno value=6585
set name=info.classification value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/python/nose/nose.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/nose/nose.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------
-- nose 1.1.2 -
---------------
-
-Oracle Internal Tracking Number 6585
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/python/nose/nose.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/nose/nose.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/python-2/nose@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A unittest-based testing framework for python that makes writing and running tests easier"
+set name=com.oracle.info.description value="the nose unit test framework for Python"
+set name=com.oracle.info.tpno value=6585
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/ply/ply-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/ply/ply-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/ply-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Lex and yacc parsing tools for Python"
set name=pkg.description value="PLY is an implementation of lex and yacc parsing tools for Python"
+set name=com.oracle.info.description value="the lex and yacc parsing tools for Python 2.6"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="David Beazley <[email protected]>"
--- a/components/python/ply/ply-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/ply/ply-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/ply-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Lex and yacc parsing tools for Python"
set name=pkg.description value="PLY is an implementation of lex and yacc parsing tools for Python"
+set name=com.oracle.info.description value="the lex and yacc parsing tools for Python 2.7"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="David Beazley <[email protected]>"
--- a/components/python/ply/ply.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/ply/ply.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/python/ply/ply.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/ply/ply.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/ply@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Lex and yacc parsing tools for Python"
set name=pkg.description value="PLY is an implementation of lex and yacc parsing tools for Python"
+set name=com.oracle.info.description value="the lex and yacc parsing tools for Python"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="David Beazley <[email protected]>"
--- a/components/python/pybonjour/pybonjour-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pybonjour/pybonjour-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/pybonjour-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python bindings for bonjour / dns-sd"
-set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
+set name=pkg.summary value="Python bindings for Bonjour / DNS-SD"
+set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of Bonjour."
+set name=com.oracle.info.description value="Python 2.6 bindings for Bonjour / DNS-SD"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Christopher Stawarz <[email protected]>"
--- a/components/python/pybonjour/pybonjour-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pybonjour/pybonjour-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/pybonjour-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python bindings for bonjour / dns-sd"
-set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
+set name=pkg.summary value="Python bindings for Bonjour / DNS-SD"
+set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of Bonjour."
+set name=com.oracle.info.description value="Python 2.7 bindings for Bonjour / DNS-SD"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Christopher Stawarz <[email protected]>"
--- a/components/python/pybonjour/pybonjour.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pybonjour/pybonjour.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/pybonjour@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python bindings for bonjour / dns-sd"
-set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
+set name=pkg.summary value="Python bindings for Bonjour / DNS-SD"
+set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of Bonjour."
+set name=com.oracle.info.description value="Python bindings for Bonjour / DNS-SD"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.upstream value="Christopher Stawarz <[email protected]>"
--- a/components/python/pycups/pycups-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pycups/pycups-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/pycups-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python language bindings for CUPS"
+set name=com.oracle.info.description value="Python 2.6 bindings for CUPS"
+set name=com.oracle.info.tpno value=9025
set name=info.classification value=org.opensolaris.category.2008:System/Printing
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/python/pycups/pycups-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pycups/pycups-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/pycups-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python language bindings for CUPS"
+set name=com.oracle.info.description value="Python 2.7 bindings for CUPS"
+set name=com.oracle.info.tpno value=9025
set name=info.classification value=org.opensolaris.category.2008:System/Printing
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/python/pycups/pycups.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pycups/pycups.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
------------------
-- pycups 1.9.46 -
------------------
-
-Oracle Internal Tracking Number 9025
-
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/python/pycups/pycups.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pycups/pycups.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python language bindings for CUPS"
+set name=pkg.summary value="Python bindings for CUPS"
+set name=com.oracle.info.description value="the Python language bindings for CUPS"
+set name=com.oracle.info.tpno value=9025
set name=info.classification value=org.opensolaris.category.2008:System/Printing
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/python/pycurl/pycurl-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pycurl/pycurl-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/pycurl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for libcurl"
set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
+set name=com.oracle.info.description value="Python 2.6 bindings for libcurl"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pycurl/pycurl-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pycurl/pycurl-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/pycurl-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for libcurl"
set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
+set name=com.oracle.info.description value="Python 2.7 bindings for libcurl"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pycurl/pycurl.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pycurl/pycurl.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/pycurl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for libcurl"
set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
+set name=com.oracle.info.description value="Python bindings for libcurl"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pylxml/pylxml-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pylxml/pylxml-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/lxml-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
+set name=com.oracle.info.description value="Python 2.6 bindings for the libxml2 and libxslt libraries"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pylxml/pylxml-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pylxml/pylxml-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/lxml-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Pythonic 2.7 binding for the libxml2 and libxslt libraries"
+set name=com.oracle.info.description value="Python 2.7 bindings for the libxml2 and libxslt libraries"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pylxml/pylxml.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pylxml/pylxml.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
+set name=com.oracle.info.description value="Python bindings for the libxml2 and libxslt libraries"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pyopenssl/pyopenssl-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pyopenssl/pyopenssl-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/pyopenssl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python interface to the OpenSSL library"
+set name=com.oracle.info.description value="Python 2.6 bindings for OpenSSL"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pyopenssl/pyopenssl-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pyopenssl/pyopenssl-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/pyopenssl-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python interface to the OpenSSL library"
+set name=com.oracle.info.description value="Python 2.7 bindings for OpenSSL"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pyopenssl/pyopenssl.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pyopenssl/pyopenssl.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/python/pyopenssl/pyopenssl.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/pyopenssl/pyopenssl.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/pyopenssl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python interface to the OpenSSL library"
+set name=com.oracle.info.description value="Python bindings for OpenSSL"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/python26/python-26-tests.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/python26/python-26-tests.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/runtime/python-26/tests@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Tests for the Python interpreter, libraries and utilities"
+set name=com.oracle.info.description value="test cases for Python 2.6"
+set name=com.oracle.info.tpno value=9104
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/python26/python-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/python26/python-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/runtime/python-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Python interpreter, libraries and utilities"
+set name=com.oracle.info.description value="Python 2.6"
+set name=com.oracle.info.tpno value=9104
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/python26/python26.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/python26/python26.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-----------------
-- Python 2.6.8 -
-----------------
-
-Oracle Internal Tracking Number 9104
-
-
Terms and conditions for accessing or otherwise using Python
============================================================
--- a/components/python/python26/tkinter-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/python26/tkinter-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/library/python-2/tkinter-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings to tcl/tk"
+set name=com.oracle.info.description value="Python 2.6 bindings for Tcl/Tk"
+set name=com.oracle.info.tpno value=9104
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/python27/python-27-tests.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/python27/python-27-tests.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
# python doesn't generate .pyc version of these test files.
@@ -29,6 +29,8 @@
set name=pkg.fmri \
value=pkg:/runtime/python-27/tests@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Python tests"
+set name=com.oracle.info.description value="test cases for Python 2.7"
+set name=com.oracle.info.tpno value=9104
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/python27/python-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/python27/python-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/runtime/python-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Python interpreter, libraries and utilities"
+set name=com.oracle.info.description value="Python 2.7"
+set name=com.oracle.info.tpno value=9104
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/python27/python27.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/python27/python27.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------
-- Python 2.7.3 -
-----------------
-
-Oracle Internal Tracking Number 9104
-
Terms and conditions for accessing or otherwise using Python
============================================================
--- a/components/python/python27/tkinter-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/python27/tkinter-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/library/python-2/tkinter-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python 2.7 bindings to tcl/tk"
+set name=com.oracle.info.description value="Python 2.7 bindings for Tcl/Tk"
+set name=com.oracle.info.tpno value=9104
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/setuptools/setuptools-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/setuptools/setuptools-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/setuptools-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
+set name=com.oracle.info.description value="Python 2.6 setup tools"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/setuptools/setuptools-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/setuptools/setuptools-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/setuptools-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
+set name=com.oracle.info.description value="Python 2.7 setup tools"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/setuptools/setuptools.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/python/setuptools/setuptools.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/setuptools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
+set name=com.oracle.info.description value="Python setup tools"
set name=info.classification value="org.opensolaris.category.2008:Development/Python"
set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/quagga/quagga.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/quagga/quagga.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-------------------
-- quagga 0.99.19 -
-------------------
-
-Oracle Internal Tracking Number 9106
-
-
- v.08302010
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/quagga/quagga.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/quagga/quagga.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=(.+)/man/man1m/(.+).1m$ -> set action.hash %<\1>/man/man8/%<\2>.8 >
@@ -29,6 +29,8 @@
set name=pkg.description \
value="Quagga is a routing software suite, providing implementations of OSPFv2, OSPFv3, RIP v1 and v2, RIPng, ISIS and BGP-4"
set name=pkg.summary value="Quagga - Quagga Routing Software"
+set name=com.oracle.info.description value="the Quagga routing software"
+set name=com.oracle.info.tpno value=9106
set name=info.classification \
value="org.opensolaris.category.2008:System/Administration and Configuration"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/quilt/quilt.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/quilt/quilt.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,16 +1,3 @@
---------------
-- quilt 0.60 -
---------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=======================================================================
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/quilt/quilt.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/quilt/quilt.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
set name=pkg.fmri value=pkg:/developer/quilt@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Quilt - tool to manage series of patches"
+set name=com.oracle.info.description value="the quilt patch utility"
set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/rdiff-backup/rdiff-backup-26.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rdiff-backup/rdiff-backup-26.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/backup/rdiff-backup-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Local/remote mirror and incremental backup utility"
+set name=com.oracle.info.description value="Python 2.6 bindings for rdiff-backup"
+set name=com.oracle.info.tpno value=9055
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/rdiff-backup/rdiff-backup-27.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rdiff-backup/rdiff-backup-27.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/backup/rdiff-backup-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Local/remote mirror and incremental backup utility"
+set name=com.oracle.info.description value="Python 2.7 bindings for rdiff-backup"
+set name=com.oracle.info.tpno value=9055
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/rdiff-backup/rdiff-backup.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rdiff-backup/rdiff-backup.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------------
-- rdiff-backup 1.3.3 -
-----------------------
-
-Oracle Internal Tracking Number 9055
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/rdiff-backup/rdiff-backup.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rdiff-backup/rdiff-backup.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Local/remote mirror and incremental backup utility"
+set name=com.oracle.info.description value="the rdiff-backup file utility"
+set name=com.oracle.info.tpno value=9055
set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/readline/readline.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/readline/readline.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
Copyright 1987-2006 Free Software Foundation, Inc.
Copyright 1987 Oliver Laumann
Copyright 2003-2004 Harold Levy
--- a/components/readline/readline.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/readline/readline.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -29,6 +29,7 @@
set name=pkg.description \
value="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
set name=pkg.summary value="GNU readline provides interactive line-editing and history"
+set name=com.oracle.info.description value="GNU readline"
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/rpm2cpio/rpm2cpio.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rpm2cpio/rpm2cpio.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/package/rpm@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Utilities for processing RPM archives"
+set name=com.oracle.info.description value="the rpm2cpio archive utility"
set name=info.classification \
value="org.opensolaris.category.2008:System/Packaging"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/rsync/rsync.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rsync/rsync.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-====================================================================
-
Routines common to more than one of the rsync processes.
Copyright (C) 1996 Andrew Tridgell
--- a/components/rsync/rsync.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rsync/rsync.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="rsync - A utility that provides fast incremental file transfer and copy."
set name=pkg.summary value="rsync - faster, flexible replacement for rcp"
+set name=com.oracle.info.description value="the rsync file transfer utility"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/rsyslog/rsyslog.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rsyslog/rsyslog.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- rsyslog 6.2.0 -
------------------
-
-Oracle Internal Tracking Number 7585
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/rsyslog/rsyslog.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rsyslog/rsyslog.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability Uncommitted>
@@ -29,6 +29,8 @@
set name=pkg.description \
value="Rsyslog is a reliable and extended syslog daemon implementation with a modular design, supporting many features (e.g., filtering, TCP, encryption, high-precision time-stamps, output control)."
set name=pkg.summary value="reliable and extended syslogd"
+set name=com.oracle.info.description value="rsyslog, a reliable and extended syslogd"
+set name=com.oracle.info.tpno value=7585
set name=info.classification \
value="org.opensolaris.category.2008:System/Administration and Configuration"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/rtorrent/rtorrent.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rtorrent/rtorrent.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
Copyright (C) 2005-2007, Jari Sundell <jaris (a] ifi.uio.no>
GNU GENERAL PUBLIC LICENSE
--- a/components/rtorrent/rtorrent.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/rtorrent/rtorrent.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/network/rtorrent@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="rtorrent - a BitTorrent client for ncurses"
+set name=com.oracle.info.description value="the rtorrent BitTorrent client"
set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ruby/ruby-18.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ruby/ruby-18.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/runtime/ruby-18@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Ruby & RubyGems"
+set name=com.oracle.info.description value="Ruby & RubyGems"
set name=info.classification value="org.opensolaris.category.2008:Development/Ruby"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/samba/samba/samba-license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/samba/samba/samba-license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-
-This package may include technology which may be subject to one or more
-of the following additional notices:
-
-Samba 3.6.12
-Oracle Internal Tracking Number 12677
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/samba/samba/samba.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/samba/samba/samba.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -23,6 +23,8 @@
set name=pkg.fmri value=pkg:/service/network/samba@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="samba - A Windows SMB/CIFS fileserver for UNIX"
+set name=com.oracle.info.description value="Samba, a SMB/CIFS fileserver"
+set name=com.oracle.info.tpno value=12677
set name=info.classification value="org.opensolaris.category.2008:System/File System"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/samba/samba30/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/samba/samba30/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -130,6 +130,11 @@
COMPONENT_BUILD_TARGETS = libsmbclient
COMPONENT_INSTALL_TARGETS = installclientlib
+# Do not apply the standard license transforms for this component. The
+# license actions in the samba.p5m file are already tagged with the
+# attributes.
+LICENSE_TRANSFORMS =
+
# common targets
build: $(BUILD_32)
--- a/components/samba/samba30/libsmbclient.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/samba/samba30/libsmbclient.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
# Correct version of this pkg is $(IPS_COMPONENT_VERSION) -> 3.0.37
@@ -41,7 +41,15 @@
value=PSARC/2000/488
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license mozldap.license license="LGPLv2.1 GPLv2"
+license mozldap.license license="LGPLv2.1 GPLv2 (libsmbclient)" \
+ com.oracle.info.description="the libsmbclient libraries" \
+ com.oracle.info.name=libsmbclient \
+ com.oracle.info.version=3.5.8
+
+license mozldap.license license="LGPLv2.1 GPLv2 (mozldap)" \
+ com.oracle.info.description="mozldap, the Mozilla LDAP SDK" \
+ com.oracle.info.name=mozldap \
+ com.oracle.info.version=6.0.7
dir path=etc group=sys
dir path=etc/sfw
--- a/components/samba/samba30/mozldap.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/samba/samba30/mozldap.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-Oracle elects to have Mozilla LDAP C SDK available under and governed by the
-LGPLv2.1 (see below for full license text). However, the following notice
-accompanied the original version of the related files:
-
-=============================================================================
-
Version: MPL 1.1/GPL 2.0/LGPL 2.1
--- a/components/sane-backends/sane-backends.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/sane-backends/sane-backends.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------
-
Copyright (C) 1998 David Huggins-Daines, heavily based on the Apple
Copyright (C) 1998 Milon Firikis
Copyright (C) 1998-2000 Chris Pinkham
--- a/components/sane-backends/sane-backends.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/sane-backends/sane-backends.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/image/scanner/xsane/sane-backends@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="SANE library and backends"
+set name=com.oracle.info.description value="the SANE library and backends"
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/sane-frontends/sane-frontend.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/sane-frontends/sane-frontend.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------
Copyright (C) 1997 David Mosberger and Tristan Tarrant
Copyright (C) 1995 Spencer Kimball and Peter Mattis
Copyright (C) 1999 Tom Martone
--- a/components/sane-frontends/sane-frontends.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/sane-frontends/sane-frontends.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/image/scanner/xsane/sane-frontend@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="SANE frontends"
+set name=com.oracle.info.description value="the SANE frontends"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/Graphics and Imaging"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/screen/screen.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/screen/screen.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/screen/screen.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/screen/screen.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
value=pkg:/terminal/screen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="GNU Screen terminal multiplexer"
set name=pkg.summary value="GNU Screen"
+set name=com.oracle.info.description value="GNU screen"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/sed/sed.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/sed/sed.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-----------------
-- sed 4.2.1 -
-----------------
-
-Oracle Internal Tracking Number 8711
-
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/sed/sed.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/sed/sed.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -30,6 +30,8 @@
value="sed takes text input and performs some operation (or set of operations) on it and outputs the modified text."
set name=pkg.summary \
value="gsed - GNU implementation of sed, the Unix stream editor"
+set name=com.oracle.info.description value="GNU sed"
+set name=com.oracle.info.tpno value=8711
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/slang/slang.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/slang/slang.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/slang/slang.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/slang/slang.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -30,6 +30,7 @@
set name=pkg.fmri value=pkg:/library/slang@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Library designed to allow a developer to create robust multi-platform software"
set name=pkg.description value="S-Lang is a multi-platform programmer's library designed to allow a developer to create robust multi-platform software."
+set name=com.oracle.info.description value="the S-Lang library"
set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/slib/slib.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/slib/slib.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary \
value="GNU slib - a portable library for the programming language Scheme"
+set name=com.oracle.info.description value="GNU slib"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/slrn/slrn.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/slrn/slrn.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
Copyright (c) 1994, 1999, 2007-2008 John E. Davis <[email protected]>
For parts of it:
--- a/components/slrn/slrn.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/slrn/slrn.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -29,6 +29,7 @@
value="slrn - S-Lang read news"
set name=pkg.description \
value="slrn is an text-based news client, i.e. a program that accesses a newsserver to read messages from the Internet News service (also known as 'Usenet')."
+set name=com.oracle.info.description value="the slrn news reader"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/Internet"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/snort/snort.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/snort/snort.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
Copyright (C) 2002-2008 Sourcefire, Inc.
Copyright (C) 1998-2002 Martin Roesch <[email protected]>
--- a/components/snort/snort.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/snort/snort.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/diagnostic/snort@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="snort - Network Intrusion and Protection Detector"
+set name=com.oracle.info.description value="snort, the network intrusion and protection detector"
set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid \
--- a/components/sox/sox.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/sox/sox.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/sox/sox.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/sox/sox.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,7 @@
value="SoX is a cross-platform command line utility that can convert various formats of computer audio files into other formats."
set name=pkg.summary \
value="Sound eXchange, the Swiss Army knife of audio manipulation."
+set name=com.oracle.info.description value="the sox audio conversion utility"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/Sound and Video"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/spawn-fcgi/spawn-fcgi.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/spawn-fcgi/spawn-fcgi.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="spawn-fcgi is a little helper program to spawn fastcgi processes."
set name=pkg.summary value="Spawn-Fcgi utility"
+set name=com.oracle.info.description value="the spawn-fcgi utility"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/squid/squid.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/squid/squid.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-----------------
-- squid 3.1.18 -
-----------------
-
-
-Oracle Internal Tracking Number: 9044
-
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/squid/squid.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/squid/squid.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,8 @@
set name=pkg.description \
value="Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more."
set name=pkg.summary value="Squid Web Proxy Cache"
+set name=com.oracle.info.description value="the Squid Web Proxy Cache"
+set name=com.oracle.info.tpno value=9044
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/stdcxx/stdcxx.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/stdcxx/stdcxx.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------------
-- stdcxx v4.2.1 -
-------------------
-Oracle Internal Tracking Number 9048
-------------------------------------------------------------------------------
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
--- a/components/stdcxx/stdcxx.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/stdcxx/stdcxx.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
<transform dir file link hardlink path=usr/share/stdcxx4/.* -> \
@@ -29,6 +29,8 @@
set name=pkg.fmri value=pkg:/library/c++/stdcxx@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Apache C++ Standard Library"
set name=pkg.description value="An Open Source ISO/IEC:14882:2003 Compliant Implementation of the C++ Standard Library"
+set name=com.oracle.info.description value="the Apache C++ Standard Library"
+set name=com.oracle.info.tpno value=9048
set name=info.classification value="org.opensolaris.category.2008:Development/C++"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/subversion/subversion-java.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/subversion/subversion-java.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,10 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/java/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Java bindings for the Subversion SCM"
+set name=com.oracle.info.description value="Java bindings for the Subversion SCM"
+set name=com.oracle.info.tpno value=9086
set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/subversion/subversion-perl.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/subversion/subversion-perl.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/perl5/$(PERL_VERSION)/man.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.fmri value=pkg:/library/perl-5/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Perl bindings for the Subversion SCM"
+set name=com.oracle.info.description value="Perl bindings for the Subversion SCM"
+set name=com.oracle.info.tpno value=9086
set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/subversion/subversion-python.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/subversion/subversion-python.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,10 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/library/python-2/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for the Subversion SCM"
+set name=com.oracle.info.description value="Python bindings for the Subversion SCM"
+set name=com.oracle.info.tpno value=9086
set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/subversion/subversion.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/subversion/subversion.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
----------------------
-- subversion v1.7.5 -
----------------------
-Oracle Internal Tracking Number 9086
-------------------------------------------------------------------------------
-
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
--- a/components/subversion/subversion.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/subversion/subversion.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
<transform file path=usr/include/svn/(.+)$ -> \
@@ -27,6 +27,8 @@
set name=pkg.fmri value=pkg:/developer/versioning/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Subversion source code management system"
set name=pkg.description value="A full-featured version control and source code management system designed to be a better CVS"
+set name=com.oracle.info.description value="the Subversion source code management system"
+set name=com.oracle.info.tpno value=9086
set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/sudo/sudo.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/sudo/sudo.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------
-- sudo 1.8.4p5 -
-----------------
-
-Oracle Internal Tracking Number: 5104
-
Copyright (c) 2009 Christian S.J. Peron
Copyright (c) 2008 Dan Walsh <[email protected]>
--- a/components/sudo/sudo.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/sudo/sudo.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/security/sudo@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="sudo - tool to allow certain tasks to be run as root by ordinary users"
+set name=com.oracle.info.description value="the sudo utility"
+set name=com.oracle.info.tpno value=5104
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/swig/swig.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/swig/swig.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------
-- swig 1.3.35 -
----------------
-
-Oracle Internal Tracking Number 5686
-
SWIG is distributed under the following terms:
I.
--- a/components/swig/swig.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/swig/swig.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri \
value=pkg:/developer/swig@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="The Simplified and Interface Generator (swig)"
+set name=pkg.summary value="Simplified Wrapper and Interface Generator"
+set name=com.oracle.info.description value="SWIG, the Simplified Wrapper and Interface Generator"
+set name=com.oracle.info.tpno value=5686
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/tcl/expect/expect.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcl/expect/expect.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
The software part of the installable package are
Written by: Don Libes, NIST, 3/23/93
--- a/components/tcl/expect/expect.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcl/expect/expect.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
<transform file path=usr/demo/expect/.+ ->default mode 0555>
@@ -30,6 +30,7 @@
value="Expect is a tool for automating interactive applications, such as telnet, ftp, passwd, fsck, rlogin, tip, etc."
set name=pkg.summary \
value="expect - Programmed dialogue with other interactive programs"
+set name=com.oracle.info.description value="the Expect tool"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/tcl/tcl/tcl.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcl/tcl/tcl.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,8 +1,3 @@
---------------
-- TCL v8.5.12 -
---------------
-Oracle Internal Tracking Number 9083
-
This software is copyrighted by the Regents of the University of
California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
Corporation and other parties. The following terms apply to all files
--- a/components/tcl/tcl/tcl.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcl/tcl/tcl.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
@@ -26,6 +26,8 @@
set name=pkg.description \
value="Tcl is a dynamic programming language used in web and desktop applications, networking, administration, testing and many more applications"
set name=pkg.summary value="Tcl - portable scripting environment"
+set name=com.oracle.info.description value="the Tcl programming language"
+set name=com.oracle.info.tpno value=9083
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/tcl/tk/tk.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcl/tk/tk.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
---------------
-- TK v8.5.12 -
---------------
-
This software is copyrighted by the Regents of the University of
California, Sun Microsystems, Inc., and other parties. The following
terms apply to all files associated with the software unless explicitly
--- a/components/tcl/tk/tk.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcl/tk/tk.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
@@ -26,6 +26,7 @@
set name=pkg.description \
value="Tk is an open source, cross-platform widget toolkit that provides a library of basic elements for building a graphical user interface"
set name=pkg.summary value="Tk - TCL GUI Toolkit"
+set name=com.oracle.info.description value="Tk, the Tcl GUI toolkit"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/tcltls/tcltls.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcltls/tcltls.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/runtime/tcl-8/tcl-openssl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Tcl binding to openssl toolkit"
+set name=pkg.summary value="TCL bindings for OpenSSL"
+set name=com.oracle.info.description value="TCL bindings for OpenSSL"
set name=info.classification \
value="org.opensolaris.category.2008:Development/Other Languages"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/tcpdump/tcpdump.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcpdump/tcpdump.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-
------------------
-- tcpdump 4.3.0 -
------------------
-
-Oracle Internal Tracking Number 5687
-
Copyright (C) 1982,1986,1988-2002 The Regents of the University of California
Copyright (C) 1998-2007 The TCPDUMP project
Copyright (C) 1995-1999,2001 WIDE Project
--- a/components/tcpdump/tcpdump.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcpdump/tcpdump.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="A tool for network monitoring and data acquisition"
set name=pkg.summary value="network traffic sniffer"
+set name=com.oracle.info.description value="tcpdump, a network traffic sniffer"
+set name=com.oracle.info.tpno value=5687
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Internet
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/tcsh/tcsh.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcsh/tcsh.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------
-- tcsh 6.18.01 -
-----------------
-
-Oracle Internal Tracking Number 5688
-
/*-
* Copyright (c) 1980, 1991 The Regents of the University of California.
* All rights reserved.
--- a/components/tcsh/tcsh.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tcsh/tcsh.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="C shell with file name completion and command line editing"
set name=pkg.summary value="Tenex C-shell (tcsh)"
+set name=com.oracle.info.description value="tcsh, the Tenex C-shell"
+set name=com.oracle.info.tpno value=5688
set name=info.classification value=org.opensolaris.category.2008:System/Shells
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/texinfo/texinfo.copyright Fri Apr 05 07:47:58 2013 -0700
+++ b/components/texinfo/texinfo.copyright Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
------------------
-- texinfo 4.7 -
------------------
-
-Oracle Internal Tracking Number 9093
-
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/texinfo/texinfo.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/texinfo/texinfo.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+$ -> default mangler.man.stability volatile>
@@ -26,6 +26,8 @@
set name=pkg.fmri value=pkg:/text/texinfo@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Documentation system for on-line information and printed output"
set name=pkg.description value="Texinfo is a documentation system that uses a single source file to produce both on-line information and printed output."
+set name=com.oracle.info.description value="Texinfo, the GNU documentation system"
+set name=com.oracle.info.tpno value=9093
set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/tidy/tidy.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tidy/tidy.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------
-- Tidy v1.0.0 -
----------------
-Oracle Internal Tracking Number 9098
-------------------------------------------------------------------------------
-
HTML Tidy
HTML parser and pretty printer
--- a/components/tidy/tidy.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tidy/tidy.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
set name=pkg.description \
value="HTML Tidy is an open source program and library for checking and generating clean XHTML/HTML."
set name=pkg.summary value="The HTML Tidy Library."
+set name=com.oracle.info.description value="the HTML Tidy utility"
+set name=com.oracle.info.tpno value=9098
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/timezone/system-data-timezone-message-files.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/timezone/system-data-timezone-message-files.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -19,12 +19,13 @@
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
set name=pkg.fmri \
value=pkg://$(PUBLISHER_LOCALIZABLE)/system/data/[email protected],$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="Translatable content for Timezone Definition"
+set name=com.oracle.info.description value="the translatable content for Timezone Definition"
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
# since this package is internal, we do not need some metadata
set name=pkg.linted.pkglint.manifest010.2 value=true
--- a/components/timezone/system-data-timezone.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/timezone/system-data-timezone.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -28,6 +28,7 @@
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="Timezone Definition"
set name=pkg.description value="Timezone definition files"
+set name=com.oracle.info.description value="the timezone definition files"
set name=info.classification \
value=org.opensolaris.category.2008:System/Core
set name=org.opensolaris.arc-caseid \
--- a/components/tomcat/tomcat-examples.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tomcat/tomcat-examples.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=var/tomcat6/(.+)$ -> \
@@ -34,6 +34,7 @@
value=pkg:/web/java-servlet/tomcat/tomcat-examples@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Tomcat Servlet/JSP Container - example applications"
+set name=com.oracle.info.description value="the Tomcat example applications"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/tomcat/tomcat.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/tomcat/tomcat.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -39,6 +39,7 @@
set name=pkg.fmri \
value=pkg:/web/java-servlet/tomcat@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Tomcat Servlet/JSP Container"
+set name=com.oracle.info.description value="the Tomcat Servlet/JSP Container"
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/top/top.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/top/top.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
set name=pkg.human-version value=$(COMPONENT_VERSION)
set name=pkg.summary \
value="provides a rolling display of top cpu using processes"
+set name=com.oracle.info.description value="the top utility"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/trousers/trousers.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/trousers/trousers.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,7 @@
value="TrouSerS TCG software to access a TPM device"
set name=pkg.description \
value="The TrouSerS library provides a software stack from the Trusted Computer Group (TCG) that accesses a Trusted Platform Module (TPM) hardware device."
+set name=com.oracle.info.description value="the TrouSerS library"
set name=info.classification \
value=org.opensolaris.category.2008:System/Security
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/unixodbc/unixodbc.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/unixodbc/unixodbc.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------------
-
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
--- a/components/unixodbc/unixodbc.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/unixodbc/unixodbc.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/library/unixodbc@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The UnixODBC Subsystem and SDK"
set name=pkg.description value="An Open Source implementation of the ODBC Standard providing a Library Framework for Software Development"
+set name=com.oracle.info.description value="the UnixODBC Subsystem and SDK"
set name=info.classification value="org.opensolaris.category.2008:Development/Databases"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/unrar/unrar.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/unrar/unrar.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
----------------
-- unrar 4.2.4 -
----------------
-
-Oracle Internal Tracking Number 4581
-
-Oracle elects to license the Gladman component under the BSD license
-(see below for details).
-
------------------------------------------------------------------------------
-
****** ***** ****** UnRAR - free utility for RAR archives
** ** ** ** ** ** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
****** ******* ****** License for use and distribution of
--- a/components/unrar/unrar.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/unrar/unrar.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,13 +20,15 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/archiver/unrar@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Rar archives extractor utility"
+set name=com.oracle.info.description value="unrar, the rar archives extractor utility"
+set name=com.oracle.info.tpno value=4581
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/unzip/unzip.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/unzip/unzip.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
value=pkg:/compress/unzip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="The Info-Zip (unzip) decompression utility"
set name=pkg.summary value="Info-Zip (unzip)"
+set name=com.oracle.info.description value="the unzip decompression utility"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities "
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/vim/gvim.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/vim/gvim.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,12 +20,13 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri value=pkg:/editor/gvim@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Vi IMproved (GUI)"
set name=pkg.description value="GVim is the graphical interface to vim, found in editor/vim."
+set name=com.oracle.info.description value="the Vi IMproved text editor (GUI)"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Editors \
value="org.opensolaris.category.2008:System/Text Tools"
--- a/components/vim/vim-core.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/vim/vim-core.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,7 @@
set name=pkg.fmri value=pkg:/editor/vim/vim-core@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Vi IMproved (core executables)"
set name=pkg.description value="This package delivers the core executables and man pages for vim (pkg:/editor/vim), and will generally only be installed independently on a minimized system."
+set name=com.oracle.info.description value="the Vi IMproved text editor"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Editors \
value="org.opensolaris.category.2008:System/Text Tools"
--- a/components/vim/vim.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/vim/vim.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,7 @@
set name=pkg.fmri value=pkg:/editor/vim@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Vi IMproved"
set name=pkg.description value="Vim is a clone of the Unix editor 'vi'. It is a modal text editor with support for syntax highlighting, context-sensitive indentation, and extension scripting in numerous languages."
+set name=com.oracle.info.description value="the Vi IMproved text editor"
set name=info.classification \
value=org.opensolaris.category.2008:Development/Editors \
value="org.opensolaris.category.2008:System/Text Tools"
--- a/components/visual-panels/apache/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/visual-panels/apache/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -49,6 +49,9 @@
COMPONENT_TEST_TARGETS = test
COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
$(SOURCE_DIR)/.prep:
$(TOUCH) $@
--- a/components/visual-panels/core/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/visual-panels/core/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -47,6 +47,9 @@
COMPONENT_TEST_TARGETS = test
COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
$(SOURCE_DIR)/.prep:
$(TOUCH) $@
--- a/components/visual-panels/coreadm/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/visual-panels/coreadm/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -50,6 +50,9 @@
COMPONENT_TEST_TARGETS = test
COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
$(SOURCE_DIR)/.prep:
$(TOUCH) $@
--- a/components/visual-panels/examples/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/visual-panels/examples/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -49,6 +49,9 @@
COMPONENT_TEST_TARGETS = test
COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
$(SOURCE_DIR)/.prep:
$(TOUCH) $@
--- a/components/visual-panels/firewall/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/visual-panels/firewall/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -50,6 +50,9 @@
COMPONENT_TEST_TARGETS = test
COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
$(SOURCE_DIR)/.prep:
$(TOUCH) $@
--- a/components/visual-panels/smf/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/visual-panels/smf/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -50,6 +50,9 @@
COMPONENT_TEST_TARGETS = test
COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
$(SOURCE_DIR)/.prep:
$(TOUCH) $@
--- a/components/visual-panels/sysmon/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/visual-panels/sysmon/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -50,6 +50,9 @@
COMPONENT_TEST_TARGETS = test
COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
$(SOURCE_DIR)/.prep:
$(TOUCH) $@
--- a/components/visual-panels/time/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/visual-panels/time/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -50,6 +50,9 @@
COMPONENT_TEST_TARGETS = test
COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
$(SOURCE_DIR)/.prep:
$(TOUCH) $@
--- a/components/visual-panels/usermgr/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/visual-panels/usermgr/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -50,6 +50,9 @@
COMPONENT_TEST_TARGETS = test
COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
$(SOURCE_DIR)/.prep:
$(TOUCH) $@
--- a/components/visual-panels/zconsole/Makefile Fri Apr 05 07:47:58 2013 -0700
+++ b/components/visual-panels/zconsole/Makefile Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -49,6 +49,9 @@
COMPONENT_TEST_TARGETS = test
COMPONENT_TEST_ENV = $(COMPONENT_BUILD_ENV)
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
# common targets
$(SOURCE_DIR)/.prep:
$(TOUCH) $@
--- a/components/wget/wget.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/wget/wget.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-=============================================================================
-
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
--- a/components/wget/wget.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/wget/wget.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
set name=pkg.description \
value="GNU wget - a utility to retrieve files from the World Wide Web"
set name=pkg.summary value="wget - GNU wget"
+set name=com.oracle.info.description value="GNU wget"
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Internet
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/which/which.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/which/which.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------
-- which 2.16 -
---------------
-
-Oracle Internal Tracking Number 9202
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/which/which.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/which/which.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
# PSARC/2007/049
@@ -27,6 +27,8 @@
value=pkg:/shell/which@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="Utility to show the full path of (shell) commands"
set name=pkg.summary value="GNU which"
+set name=com.oracle.info.description value="GNU which"
+set name=com.oracle.info.tpno value=9202
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/wireshark/tshark.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/wireshark/tshark.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/diagnostic/wireshark/tshark@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Command-line network protocol analyzer"
+set name=com.oracle.info.description value="TShark, the Wireshark command line network protocol analyzer"
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Internet
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/wireshark/wireshark-common.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/wireshark/wireshark-common.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -25,6 +25,7 @@
set name=pkg.fmri \
value=pkg:/diagnostic/wireshark/wireshark-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Libraries and Tools used by Wireshark and TShark Network protocol analyzers"
+set name=com.oracle.info.description value="the Wireshark and TShark common libraries and tools"
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Internet
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/wireshark/wireshark.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/wireshark/wireshark.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version 2.1
-(LGPL)/GNU General Public License version 2 (GPL) for any software where a
-choice of LGPL/GPL license versions are made available with the language
-indicating that LGPLv2.1/GPLv2 or any later version may be used, or where a
-choice of which version of the LGPL/GPL is applied is unspecified. Unless
-specifically stated otherwise, where a choice exists between another license
-and either the GPL or the LGPL, Oracle chooses the other license.
-
-------------------------------------------------------------------------
-Wireshark:
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--- a/components/wireshark/wireshark.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/wireshark/wireshark.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/diagnostic/wireshark@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Graphical network protocol analyzer"
+set name=com.oracle.info.description value="the Wireshark graphical network protocol analyzer"
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Internet
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/wxwidgets/wxwidgets.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/wxwidgets/wxwidgets.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified. Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
wxWindows Library Licence, Version 3.1
======================================
--- a/components/wxwidgets/wxwidgets.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/wxwidgets/wxwidgets.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri value=pkg:/library/graphics/wxwidgets@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="wxWidgets A cross-platform GUI toolkit"
+set name=com.oracle.info.description value="wxWidgets, cross-platform GUI toolkit"
set name=info.classification value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/xorriso/xorriso.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/xorriso/xorriso.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
-# PSARC/2011/046
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri value=pkg:/media/xorriso@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="GNU xorriso"
+set name=com.oracle.info.description value="GNU xorriso"
set name=info.classification value="org.opensolaris.category.2008:System/Media"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid \
--- a/components/xz/xz.license Fri Apr 05 07:47:58 2013 -0700
+++ b/components/xz/xz.license Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------
-- XZ Utils v5.0.1 -
--------------------
-Oracle Internal Tracking Number 4463
-
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
--- a/components/xz/xz.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/xz/xz.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
value=pkg:/compress/xz@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="XZ Utils - loss-less file compression application and library."
+set name=com.oracle.info.description value="the xz file compression application and library"
+set name=com.oracle.info.tpno value=4463
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/zip/zip.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/zip/zip.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -26,6 +26,7 @@
value=pkg:/compress/zip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="The Info-Zip (zip) compression utility"
set name=pkg.summary value="Info-Zip (zip)"
+set name=com.oracle.info.description value="the Info-Zip compression utility"
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/zlib/zlib.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/zlib/zlib.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
set name=pkg.fmri \
value=pkg:/library/zlib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Zip compression library"
+set name=com.oracle.info.description value="the zip compression library"
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/zsh/zsh.p5m Fri Apr 05 07:47:58 2013 -0700
+++ b/components/zsh/zsh.p5m Sat Apr 06 08:18:24 2013 -0700
@@ -19,7 +19,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -28,6 +28,7 @@
set name=pkg.description \
value="The Z Shell (zsh) is a Bourne-like shell designed for interactive use, although it is also a powerful scripting language. Many of the useful features of bash, ksh, and tcsh were incorporated into zsh, but many original features were added."
set name=pkg.summary value="Z Shell (zsh)"
+set name=com.oracle.info.description value="zsh, the Z Shell"
set name=info.classification value=org.opensolaris.category.2008:System/Shells
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream value="Zsh Development Group <[email protected]>"
--- a/make-rules/ips.mk Fri Apr 05 07:47:58 2013 -0700
+++ b/make-rules/ips.mk Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -54,7 +54,10 @@
COMPARISON_TRANSFORMS += $(WS_TOP)/transforms/comparison-cleanup
COMPARISON_TRANSFORMS += $(PKGMOGRIFY_TRANSFORMS)
+LICENSE_TRANSFORMS = $(WS_TOP)/transforms/license-changes
+
# order is important
+PUBLISH_TRANSFORMS += $(LICENSE_TRANSFORMS)
PUBLISH_TRANSFORMS += $(WS_TOP)/transforms/variant-cleanup
PUBLISH_TRANSFORMS += $(WS_TOP)/transforms/autopyc
PUBLISH_TRANSFORMS += $(WS_TOP)/transforms/defaults
@@ -81,6 +84,8 @@
PKG_MACROS += COMPONENT_ARCHIVE_URL=$(COMPONENT_ARCHIVE_URL)
PKG_MACROS += COMPONENT_HG_URL=$(COMPONENT_HG_URL)
PKG_MACROS += COMPONENT_HG_REV=$(COMPONENT_HG_REV)
+PKG_MACROS += COMPONENT_NAME=$(COMPONENT_NAME)
+PKG_MACROS += TPNO=$(TPNO)
PKG_OPTIONS += $(PKG_MACROS:%=-D %)
--- a/tools/gen-components Fri Apr 05 07:47:58 2013 -0700
+++ b/tools/gen-components Sat Apr 06 08:18:24 2013 -0700
@@ -33,6 +33,9 @@
debug = False
+# TPNO string to search for in each .p5m file.
+TPNO_str = "com.oracle.info.tpno"
+
# Hashtable of components with TPNOs keyed by component name.
comp_TPNOs = {}
@@ -129,7 +132,7 @@
comp_TPNOs = {}
for directory, _, files in os.walk(workspace + "/components"):
for filename in files:
- if filename.endswith(".license") or filename.endswith(".copyright"):
+ if filename.endswith(".p5m"):
pathname = os.path.join(directory, filename)
fin = open(pathname, 'r')
lines = fin.readlines()
@@ -137,8 +140,9 @@
for line in lines:
line = line.replace("\n", "")
- if line.startswith("Oracle Internal Tracking Number"):
- tpno_str = line.split()[-1]
+ n = line.find(TPNO_str)
+ if n != -1:
+ tpno_str = line[n:].split("=")[1]
try:
# Check that the TPNO is a valid number.
tpno = int(tpno_str)
@@ -147,8 +151,28 @@
(directory, tpno_str)
comp_TPNOs[directory] = tpno_str
except:
- print >> sys.stderr, "Unable to read TPNO: %s" % \
- pathname
+ # Check to see if line end in a "\" character in
+ # which case, it's an attribute rather than an
+ # set name action, so extract it a different way.
+ try:
+ n += len(TPNO_str)+1
+ tpno_str = line[n:].split()[0]
+ # Check that the TPNO is a valid number.
+ tpno = int(tpno_str)
+ if debug:
+ print >> sys.stderr, "TPNO: %s: %s" % \
+ (directory, tpno_str)
+
+ # If it's an attribute, there might be more
+ # than one TPNO for this component.
+ if directory in comp_TPNOs:
+ entry = comp_TPNOs[directory]
+ tpno_str = "%s,%s" % (entry, tpno_str)
+
+ comp_TPNOs[directory] = tpno_str
+ except:
+ print >> sys.stderr, \
+ "Unable to read TPNO: %s" % pathname
return(comp_TPNOs)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/transforms/license-changes Sat Apr 06 08:18:24 2013 -0700
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+# Create 'set name=com.oracle.info.name=NAME'
+# Get NAME from COMPONENT_NAME in the Makefile.
+<transform set name=pkg.fmri -> emit \
+ set name=com.oracle.info.name value=$(COMPONENT_NAME) >
+
+# Create 'set name=com.oracle.info.version=VERSION'
+# Get VERSION from pkg.human-version in the package manifest (if present)
+# or from $(IPS_COMPONENT_VERSION) in the Makefile.
+#
+# Note that this uses the synthetic action 'pkg', which fires after
+# the entire manifest has been read vs. as the actions are seen .
+<transform pkg pkg.fmri=.+@(.+),.+$ -> \
+ emit set name=com.oracle.info.version \
+ value=%{pkg.human-version;notfound='%<1>'} >