Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/apache24/apache-24.p5m
changeset 3732 0f62cc221c7e
parent 3648 29c40c98aad3
child 3737 a71f444ba849 
--- a/components/apache24/apache-24.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/apache24/apache-24.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -29,16 +29,15 @@
 # prevents "64bit file in 32bit path" errors
 <transform file path=usr/apache2/2.4/libexec/.*\.so -> \
     add pkg.linted.userland.action001.2 true>
+set name=pkg.fmri \
+    value=pkg:/web/server/apache-24@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Apache Web Server V2.4"
+set name=pkg.description value="The Apache HTTP Server Version 2.4"
 
 # temporary, until the mediated links are replaced in the reference repo
 set name=pkg.linted.pkglint.dupaction001.1 value=true
 set name=pkg.linted.pkglint.dupaction010.1 value=true
 set name=pkg.linted.pkglint.dupaction010.2 value=true
-
-set name=pkg.fmri \
-    value=pkg:/web/server/apache-24@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Apache Web Server V2.4"
-set name=pkg.description value="The Apache HTTP Server Version 2.4"
 set name=com.oracle.info.description value="the Apache Web Server V2.4"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
@@ -47,7 +46,6 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2014/253
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir  path=etc/apache2/2.4/conf.d
 file path=etc/apache2/2.4/envvars mode=0644 preserve=renamenew
 file etc/apache2/2.4/original/httpd.conf path=etc/apache2/2.4/httpd.conf \
@@ -85,9 +83,6 @@
 dir  path=etc/security/prof_attr.d owner=root group=sys mode=755
 file Solaris/prof_attr path=etc/security/prof_attr.d/web:server:apache-24 \
     owner=root group=sys mode=644 preserve=true
-file Solaris/RtApacheSrvcMngmnt.html path=usr/lib/help/profiles/locale/C/RtApache24SrvcMngmnt.html
-file Solaris/SmfApacheStates.html path=usr/lib/help/auths/locale/C/SmfApache24States.html
-file Solaris/SmfValueApache.html path=usr/lib/help/auths/locale/C/SmfValueApache24.html
 file Solaris/http-apache24.xml path=lib/svc/manifest/network/http-apache24.xml
 file Solaris/http-apache24 path=lib/svc/method/http-apache24
 file path=usr/apache2/2.4/bin/ab
@@ -1382,7 +1377,97 @@
 file path=usr/apache2/2.4/manual/vhosts/name-based.html.ja.utf8
 file path=usr/apache2/2.4/manual/vhosts/name-based.html.ko.euc-kr
 file path=usr/apache2/2.4/manual/vhosts/name-based.html.tr.utf8
+link path=usr/bin/$(MACH64)/ab target=../../apache2/2.4/bin/ab mediator=apache \
+    mediator-version=2.4
+link path=usr/bin/$(MACH64)/apxs target=../../apache2/2.4/bin/apxs \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/$(MACH64)/dbmmanage target=../../apache2/2.4/bin/dbmmanage \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/$(MACH64)/htcacheclean \
+    target=../../apache2/2.4/bin/htcacheclean mediator=apache \
+    mediator-version=2.4
+link path=usr/bin/$(MACH64)/htdbm target=../../apache2/2.4/bin/htdbm \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/$(MACH64)/htdigest target=../../apache2/2.4/bin/htdigest \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/$(MACH64)/htpasswd target=../../apache2/2.4/bin/htpasswd \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/$(MACH64)/httxt2dbm target=../../apache2/2.4/bin/httxt2dbm \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/$(MACH64)/logresolve target=../../apache2/2.4/bin/logresolve \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/$(MACH64)/rotatelogs target=../../apache2/2.4/bin/rotatelogs \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/ab target=../apache2/2.4/bin/ab mediator=apache \
+    mediator-version=2.4
+link path=usr/bin/apxs target=../apache2/2.4/bin/apxs mediator=apache \
+    mediator-version=2.4
+link path=usr/bin/dbmmanage target=../apache2/2.4/bin/dbmmanage \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/htcacheclean target=../apache2/2.4/bin/htcacheclean \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/htdbm target=../apache2/2.4/bin/htdbm mediator=apache \
+    mediator-version=2.4
+link path=usr/bin/htdigest target=../apache2/2.4/bin/htdigest mediator=apache \
+    mediator-version=2.4
+link path=usr/bin/htpasswd target=../apache2/2.4/bin/htpasswd mediator=apache \
+    mediator-version=2.4
+link path=usr/bin/httxt2dbm target=../apache2/2.4/bin/httxt2dbm \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/logresolve target=../apache2/2.4/bin/logresolve \
+    mediator=apache mediator-version=2.4
+link path=usr/bin/rotatelogs target=../apache2/2.4/bin/rotatelogs \
+    mediator=apache mediator-version=2.4
+file Solaris/SmfApacheStates.html \
+    path=usr/lib/help/auths/locale/C/SmfApache24States.html
+file Solaris/SmfValueApache.html \
+    path=usr/lib/help/auths/locale/C/SmfValueApache24.html
+file Solaris/RtApacheSrvcMngmnt.html \
+    path=usr/lib/help/profiles/locale/C/RtApache24SrvcMngmnt.html
+link path=usr/share/man/man1/ab.1 target=../../../apache2/2.4/man/man1/ab.1 \
+    mediator=apache mediator-version=2.4
+link path=usr/share/man/man1/apxs.1 \
+    target=../../../apache2/2.4/man/man1/apxs.1 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man1/dbmmanage.1 \
+    target=../../../apache2/2.4/man/man1/dbmmanage.1 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man1/htdbm.1 \
+    target=../../../apache2/2.4/man/man1/htdbm.1 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man1/htdigest.1 \
+    target=../../../apache2/2.4/man/man1/htdigest.1 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man1/htpasswd.1 \
+    target=../../../apache2/2.4/man/man1/htpasswd.1 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man1/httxt2dbm.1 \
+    target=../../../apache2/2.4/man/man1/httxt2dbm.1 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man1/logresolve.1 \
+    target=../../../apache2/2.4/man/man1/logresolve.1 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man1m/apache2.1m target=apache24.1m mediator=apache \
+    mediator-version=2.4
 file Solaris/apache24.1m.sunman path=usr/share/man/man1m/apache24.1m
+link path=usr/share/man/man8/apachectl.8 \
+    target=../../../apache2/2.4/man/man8/apachectl.8 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man8/fcgistarter.8 \
+    target=../../../apache2/2.4/man/man8/fcgistarter.8 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man8/htcacheclean.8 \
+    target=../../../apache2/2.4/man/man8/htcacheclean.8 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man8/httpd.8 \
+    target=../../../apache2/2.4/man/man8/httpd.8 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man8/rotatelogs.8 \
+    target=../../../apache2/2.4/man/man8/rotatelogs.8 mediator=apache \
+    mediator-version=2.4
+link path=usr/share/man/man8/suexec.8 \
+    target=../../../apache2/2.4/man/man8/suexec.8 mediator=apache \
+    mediator-version=2.4
 file path=var/apache2/2.4/cgi-bin/printenv mode=0444 \
     pkg.depend.bypass-generate=.*
 file path=var/apache2/2.4/cgi-bin/printenv.vbs mode=0444
@@ -1653,90 +1738,4 @@
 file path=var/apache2/2.4/icons/xml.png
 dir  path=var/apache2/2.4/logs owner=webservd group=webservd mode=0700
 dir  path=var/apache2/2.4/proxy owner=webservd group=webservd
-
-link path=usr/bin/$(MACH64)/ab target=../../apache2/2.4/bin/ab mediator=apache \
-    mediator-version=2.4
-link path=usr/bin/$(MACH64)/apxs target=../../apache2/2.4/bin/apxs \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/$(MACH64)/dbmmanage target=../../apache2/2.4/bin/dbmmanage \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/$(MACH64)/htcacheclean \
-    target=../../apache2/2.4/bin/htcacheclean mediator=apache \
-    mediator-version=2.4
-link path=usr/bin/$(MACH64)/htdbm target=../../apache2/2.4/bin/htdbm \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/$(MACH64)/htdigest target=../../apache2/2.4/bin/htdigest \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/$(MACH64)/htpasswd target=../../apache2/2.4/bin/htpasswd \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/$(MACH64)/httxt2dbm target=../../apache2/2.4/bin/httxt2dbm \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/$(MACH64)/logresolve target=../../apache2/2.4/bin/logresolve \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/$(MACH64)/rotatelogs target=../../apache2/2.4/bin/rotatelogs \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/ab target=../apache2/2.4/bin/ab mediator=apache \
-    mediator-version=2.4
-link path=usr/bin/apxs target=../apache2/2.4/bin/apxs mediator=apache \
-    mediator-version=2.4
-link path=usr/bin/dbmmanage target=../apache2/2.4/bin/dbmmanage \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/htcacheclean target=../apache2/2.4/bin/htcacheclean \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/htdbm target=../apache2/2.4/bin/htdbm mediator=apache \
-    mediator-version=2.4
-link path=usr/bin/htdigest target=../apache2/2.4/bin/htdigest mediator=apache \
-    mediator-version=2.4
-link path=usr/bin/htpasswd target=../apache2/2.4/bin/htpasswd mediator=apache \
-    mediator-version=2.4
-link path=usr/bin/httxt2dbm target=../apache2/2.4/bin/httxt2dbm \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/logresolve target=../apache2/2.4/bin/logresolve \
-    mediator=apache mediator-version=2.4
-link path=usr/bin/rotatelogs target=../apache2/2.4/bin/rotatelogs \
-    mediator=apache mediator-version=2.4
-link path=usr/share/man/man1/ab.1 target=../../../apache2/2.4/man/man1/ab.1 \
-    mediator=apache mediator-version=2.4
-link path=usr/share/man/man1/apxs.1 \
-    target=../../../apache2/2.4/man/man1/apxs.1 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man1/dbmmanage.1 \
-    target=../../../apache2/2.4/man/man1/dbmmanage.1 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man1/htdbm.1 \
-    target=../../../apache2/2.4/man/man1/htdbm.1 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man1/htdigest.1 \
-    target=../../../apache2/2.4/man/man1/htdigest.1 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man1/htpasswd.1 \
-    target=../../../apache2/2.4/man/man1/htpasswd.1 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man1/httxt2dbm.1 \
-    target=../../../apache2/2.4/man/man1/httxt2dbm.1 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man1/logresolve.1 \
-    target=../../../apache2/2.4/man/man1/logresolve.1 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man1m/apache2.1m target=apache24.1m mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man8/apachectl.8 \
-    target=../../../apache2/2.4/man/man8/apachectl.8 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man8/fcgistarter.8 \
-    target=../../../apache2/2.4/man/man8/fcgistarter.8 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man8/htcacheclean.8 \
-    target=../../../apache2/2.4/man/man8/htcacheclean.8 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man8/httpd.8 \
-    target=../../../apache2/2.4/man/man8/httpd.8 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man8/rotatelogs.8 \
-    target=../../../apache2/2.4/man/man8/rotatelogs.8 mediator=apache \
-    mediator-version=2.4
-link path=usr/share/man/man8/suexec.8 \
-    target=../../../apache2/2.4/man/man8/suexec.8 mediator=apache \
-    mediator-version=2.4
-
 license apache.license license="Apache v2.0"
upstream/oracle/userland-gate