Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7183571 OpenSCAP packaging needs work
authorRich Burridge <rich.burridge@oracle.com>
Tue, 17 Jul 2012 09:36:52 -0700
changeset 922 f0a67cc3878c
parent 921 51de4fd31316
child 923 79e84368f624
7183571 OpenSCAP packaging needs work
components/meta-packages/history/security%2Fopenscap-perl-512.p5m file | annotate | diff | comparison | revisions
components/meta-packages/history/security%2Fopenscap-python-26.p5m file | annotate | diff | comparison | revisions
components/meta-packages/history/security%2Fopenscap.p5m file | annotate | diff | comparison | revisions
components/openscap/openscap-perl-512.p5m file | annotate | diff | comparison | revisions
components/openscap/openscap-python-26.p5m file | annotate | diff | comparison | revisions
components/openscap/openscap.p5m file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/security%2Fopenscap-perl-512.p5m	Tue Jul 17 09:36:52 2012 -0700
@@ -0,0 +1,29 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/security/[email protected],5.11-0.175.1.0.0.21.0
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/perl-5/[email protected],5.11-0.175.1.0.0.21.0 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/security%2Fopenscap-python-26.p5m	Tue Jul 17 09:36:52 2012 -0700
@@ -0,0 +1,29 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/security/[email protected],5.11-0.175.1.0.0.21.0
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/python-2/[email protected],5.11-0.175.1.0.0.21.0 type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/security%2Fopenscap.p5m	Tue Jul 17 09:36:52 2012 -0700
@@ -0,0 +1,29 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/security/[email protected],5.11-0.175.1.0.0.21.0
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=security/compliance/[email protected],5.11-0.175.1.0.0.21.0 type=require
--- a/components/openscap/openscap-perl-512.p5m	Tue Jul 17 00:50:52 2012 -0700
+++ b/components/openscap/openscap-perl-512.p5m	Tue Jul 17 09:36:52 2012 -0700
@@ -21,7 +21,7 @@
 # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/security/openscap-perl-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+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=info.classification value="org.opensolaris.category.2008:System/Security"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -29,6 +29,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2012/152
+set pkg.linted=true
 
 license openscap.license license=LGPLv2.1
 
--- a/components/openscap/openscap-python-26.p5m	Tue Jul 17 00:50:52 2012 -0700
+++ b/components/openscap/openscap-python-26.p5m	Tue Jul 17 09:36:52 2012 -0700
@@ -21,7 +21,7 @@
 # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/security/openscap-python-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+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=info.classification value="org.opensolaris.category.2008:System/Security"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -29,6 +29,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2012/152
+set pkg.linted=true
 
 license openscap.license license=LGPLv2.1
 
--- a/components/openscap/openscap.p5m	Tue Jul 17 00:50:52 2012 -0700
+++ b/components/openscap/openscap.p5m	Tue Jul 17 09:36:52 2012 -0700
@@ -24,7 +24,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/lib/openscap/.+ ->default mode 0555>
 
-set name=pkg.fmri value=pkg:/security/openscap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+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=info.classification value="org.opensolaris.category.2008:System/Security"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -32,6 +32,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2012/152
+set pkg.linted=true
 
 license openscap.license license=LGPLv2.1
upstream/oracle/userland-gate