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/apache2/apache-22.p5m
branchs11-update
changeset 3734 24181f5eb463
parent 3661 47545fb8aed4
child 3877 d7cb5bc8ee50 
--- a/components/apache2/apache-22.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/apache2/apache-22.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,69 +18,69 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file link hardlink path=usr/apache2/2.2/build/.* -> \
     default facet.devel all>
-
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
-    value="Apache Web Server V2.2"
-set name=pkg.description \
-    value="The Apache HTTP Server Version 2.2"
+set name=pkg.summary 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=com.oracle.info.tpno value=$(TPNO_APACHE)
 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)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2009/565
+set name=org.opensolaris.arc-caseid value=LSARC/2009/565
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-
-license apache.license license="Apache v2.0"
-
-dir path=var/apache2/2.2/libexec/$(MACH64)
-dir path=var/apache2/2.2/logs mode=0700
-dir path=var/apache2/2.2/proxy group=webservd owner=webservd
-file path=etc/apache2/2.2/conf.d/modules-32.load mode=0644 preserve=renamenew \
-    original_name=SUNWapch22:etc/apache2/2.2/conf.d/modules-32.load
-file path=etc/apache2/2.2/conf.d/modules-64.load mode=0644 preserve=renamenew \
-    original_name=SUNWapch22:etc/apache2/2.2/conf.d/modules-64.load
-file path=etc/apache2/2.2/envvars mode=0644 preserve=renamenew \
-    original_name=SUNWapch22:etc/apache2/2.2/envvars
-file etc/apache2/2.2/original/httpd.conf path=etc/apache2/2.2/httpd.conf mode=0644 preserve=renamenew \
-    original_name=SUNWapch22:etc/apache2/2.2/httpd.conf
-file path=etc/apache2/2.2/magic mode=0644 preserve=renamenew \
-    original_name=SUNWapch22:etc/apache2/2.2/magic
-file path=etc/apache2/2.2/mime.types mode=0644 preserve=renamenew \
-    original_name=SUNWapch22:etc/apache2/2.2/mime.types
+file path=etc/apache2/2.2/conf.d/modules-32.load mode=0644 \
+    original_name=SUNWapch22:etc/apache2/2.2/conf.d/modules-32.load \
+    preserve=renamenew
+file path=etc/apache2/2.2/conf.d/modules-64.load mode=0644 \
+    original_name=SUNWapch22:etc/apache2/2.2/conf.d/modules-64.load \
+    preserve=renamenew
+file path=etc/apache2/2.2/envvars mode=0644 \
+    original_name=SUNWapch22:etc/apache2/2.2/envvars preserve=renamenew
+file etc/apache2/2.2/original/httpd.conf path=etc/apache2/2.2/httpd.conf \
+    mode=0644 original_name=SUNWapch22:etc/apache2/2.2/httpd.conf \
+    preserve=renamenew
+file path=etc/apache2/2.2/magic mode=0644 \
+    original_name=SUNWapch22:etc/apache2/2.2/magic preserve=renamenew
+file path=etc/apache2/2.2/mime.types mode=0644 \
+    original_name=SUNWapch22:etc/apache2/2.2/mime.types preserve=renamenew
 file etc/apache2/2.2/httpd.conf path=etc/apache2/2.2/original/httpd.conf
-file etc/apache2/2.2/extra/httpd-autoindex.conf path=etc/apache2/2.2/samples-conf.d/autoindex.conf
-file etc/apache2/2.2/extra/httpd-dav.conf path=etc/apache2/2.2/samples-conf.d/dav.conf
-file etc/apache2/2.2/extra/httpd-default.conf path=etc/apache2/2.2/samples-conf.d/default.conf
-file etc/apache2/2.2/extra/httpd-info.conf path=etc/apache2/2.2/samples-conf.d/info.conf
-file etc/apache2/2.2/extra/httpd-languages.conf path=etc/apache2/2.2/samples-conf.d/languages.conf
-file etc/apache2/2.2/extra/httpd-manual.conf path=etc/apache2/2.2/samples-conf.d/manual.conf
-file etc/apache2/2.2/extra/httpd-mpm.conf path=etc/apache2/2.2/samples-conf.d/mpm.conf
-file etc/apache2/2.2/extra/httpd-multilang-errordoc.conf path=etc/apache2/2.2/samples-conf.d/multilang-errordoc.conf
+file etc/apache2/2.2/extra/httpd-autoindex.conf \
+    path=etc/apache2/2.2/samples-conf.d/autoindex.conf
+file etc/apache2/2.2/extra/httpd-dav.conf \
+    path=etc/apache2/2.2/samples-conf.d/dav.conf
+file etc/apache2/2.2/extra/httpd-default.conf \
+    path=etc/apache2/2.2/samples-conf.d/default.conf
+file etc/apache2/2.2/extra/httpd-info.conf \
+    path=etc/apache2/2.2/samples-conf.d/info.conf
+file etc/apache2/2.2/extra/httpd-languages.conf \
+    path=etc/apache2/2.2/samples-conf.d/languages.conf
+file etc/apache2/2.2/extra/httpd-manual.conf \
+    path=etc/apache2/2.2/samples-conf.d/manual.conf
+file etc/apache2/2.2/extra/httpd-mpm.conf \
+    path=etc/apache2/2.2/samples-conf.d/mpm.conf
+file etc/apache2/2.2/extra/httpd-multilang-errordoc.conf \
+    path=etc/apache2/2.2/samples-conf.d/multilang-errordoc.conf
 file path=etc/apache2/2.2/samples-conf.d/proxy_scgi.conf
 file path=etc/apache2/2.2/samples-conf.d/reqtimeout.conf
-file etc/apache2/2.2/extra/httpd-ssl.conf path=etc/apache2/2.2/samples-conf.d/ssl.conf
-file etc/apache2/2.2/extra/httpd-userdir.conf path=etc/apache2/2.2/samples-conf.d/userdir.conf
-file etc/apache2/2.2/extra/httpd-vhosts.conf path=etc/apache2/2.2/samples-conf.d/vhosts.conf
-dir path=etc/security/auth_attr.d owner=root group=sys mode=755
+file etc/apache2/2.2/extra/httpd-ssl.conf \
+    path=etc/apache2/2.2/samples-conf.d/ssl.conf
+file etc/apache2/2.2/extra/httpd-userdir.conf \
+    path=etc/apache2/2.2/samples-conf.d/userdir.conf
+file etc/apache2/2.2/extra/httpd-vhosts.conf \
+    path=etc/apache2/2.2/samples-conf.d/vhosts.conf
+dir  path=etc/security/auth_attr.d owner=root group=sys mode=755
 file Solaris/auth_attr path=etc/security/auth_attr.d/web:server:apache-22 \
     owner=root group=sys mode=644 preserve=true
-dir path=etc/security/prof_attr.d owner=root group=sys mode=755
+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-22 \
     owner=root group=sys mode=644 preserve=true
-file Solaris/RtApacheSrvcMngmnt.html path=usr/lib/help/profiles/locale/C/RtApacheSrvcMngmnt.html
-file Solaris/SmfApacheStates.html path=usr/lib/help/auths/locale/C/SmfApacheStates.html
-file Solaris/SmfValueApache.html path=usr/lib/help/auths/locale/C/SmfValueApache.html
 file Solaris/http-apache22.xml path=lib/svc/manifest/network/http-apache22.xml
 file path=lib/svc/method/http-apache22
 file path=usr/apache2/2.2/bin/$(MACH64)/ab
@@ -95,11 +95,14 @@
 file path=usr/apache2/2.2/bin/$(MACH64)/htdigest
 file path=usr/apache2/2.2/bin/$(MACH64)/htpasswd
 file path=usr/apache2/2.2/bin/$(MACH64)/httpd
-file build/worker/$(MACH64)/httpd path=usr/apache2/2.2/bin/$(MACH64)/httpd.worker
+file build/worker/$(MACH64)/httpd \
+    path=usr/apache2/2.2/bin/$(MACH64)/httpd.worker
 file path=usr/apache2/2.2/bin/$(MACH64)/httxt2dbm
 file path=usr/apache2/2.2/bin/$(MACH64)/logresolve
 file path=usr/apache2/2.2/bin/$(MACH64)/rotatelogs
-file usr/apache2/2.2/bin/$(MACH64)/suexec path=usr/apache2/2.2/bin/$(MACH64)/suexec.disabled mode=0500
+file usr/apache2/2.2/bin/$(MACH64)/suexec \
+    path=usr/apache2/2.2/bin/$(MACH64)/suexec.disabled mode=0500
+link path=usr/apache2/2.2/bin/64 target=$(MACH64)
 file path=usr/apache2/2.2/bin/ab
 file path=usr/apache2/2.2/bin/apachectl
 file path=usr/apache2/2.2/bin/apxs facet.devel=true
@@ -116,7 +119,8 @@
 file path=usr/apache2/2.2/bin/httxt2dbm
 file path=usr/apache2/2.2/bin/logresolve
 file path=usr/apache2/2.2/bin/rotatelogs
-file usr/apache2/2.2/bin/suexec path=usr/apache2/2.2/bin/suexec.disabled mode=0500
+file usr/apache2/2.2/bin/suexec path=usr/apache2/2.2/bin/suexec.disabled \
+    mode=0500
 file path=usr/apache2/2.2/build/$(MACH64)/config.nice mode=0555
 file path=usr/apache2/2.2/build/$(MACH64)/config_vars.mk
 file path=usr/apache2/2.2/build/$(MACH64)/instdso.sh mode=0555
@@ -126,6 +130,7 @@
 file path=usr/apache2/2.2/build/$(MACH64)/program.mk
 file path=usr/apache2/2.2/build/$(MACH64)/rules.mk
 file path=usr/apache2/2.2/build/$(MACH64)/special.mk
+link path=usr/apache2/2.2/build/64 target=$(MACH64)
 file path=usr/apache2/2.2/build/config.nice mode=0555
 file path=usr/apache2/2.2/build/config_vars.mk
 file path=usr/apache2/2.2/build/instdso.sh mode=0555
@@ -252,6 +257,7 @@
 file path=usr/apache2/2.2/libexec/$(MACH64)/mod_usertrack.so
 file path=usr/apache2/2.2/libexec/$(MACH64)/mod_version.so
 file path=usr/apache2/2.2/libexec/$(MACH64)/mod_vhost_alias.so
+link path=usr/apache2/2.2/libexec/64 target=$(MACH64)
 file path=usr/apache2/2.2/libexec/httpd.exp
 file path=usr/apache2/2.2/libexec/mod_actions.so
 file path=usr/apache2/2.2/libexec/mod_alias.so
@@ -323,9 +329,9 @@
 file path=usr/apache2/2.2/libexec/mod_vhost_alias.so
 file path=usr/apache2/2.2/man/man1/dbmmanage.1
 file path=usr/apache2/2.2/man/man1/htdbm.1
-file path=usr/apache2/2.2/man/man1/httxt2dbm.1
 file path=usr/apache2/2.2/man/man1/htdigest.1
 file path=usr/apache2/2.2/man/man1/htpasswd.1
+file path=usr/apache2/2.2/man/man1/httxt2dbm.1
 file path=usr/apache2/2.2/man/man8/ab.8
 file path=usr/apache2/2.2/man/man8/apachectl.8
 file path=usr/apache2/2.2/man/man8/apxs.8 facet.devel=all
@@ -334,8 +340,67 @@
 file path=usr/apache2/2.2/man/man8/logresolve.8
 file path=usr/apache2/2.2/man/man8/rotatelogs.8
 file path=usr/apache2/2.2/man/man8/suexec.8
+link path=usr/bin/$(MACH64)/ab target=../../apache2/2.2/bin/$(MACH64)/ab
+link path=usr/bin/$(MACH64)/apxs target=../../apache2/2.2/bin/$(MACH64)/apxs \
+    facet.devel=all
+link path=usr/bin/$(MACH64)/dbmmanage \
+    target=../../apache2/2.2/bin/$(MACH64)/dbmmanage
+link path=usr/bin/$(MACH64)/htcacheclean \
+    target=../../apache2/2.2/bin/$(MACH64)/htcacheclean
+link path=usr/bin/$(MACH64)/htdbm target=../../apache2/2.2/bin/$(MACH64)/htdbm
+link path=usr/bin/$(MACH64)/htdigest \
+    target=../../apache2/2.2/bin/$(MACH64)/htdigest
+link path=usr/bin/$(MACH64)/htpasswd \
+    target=../../apache2/2.2/bin/$(MACH64)/htpasswd
+link path=usr/bin/$(MACH64)/httxt2dbm \
+    target=../../apache2/2.2/bin/$(MACH64)/httxt2dbm
+link path=usr/bin/$(MACH64)/logresolve \
+    target=../../apache2/2.2/bin/$(MACH64)/logresolve
+link path=usr/bin/$(MACH64)/rotatelogs \
+    target=../../apache2/2.2/bin/$(MACH64)/rotatelogs
+link path=usr/bin/ab target=../apache2/2.2/bin/ab
+link path=usr/bin/apxs target=../apache2/2.2/bin/apxs
+link path=usr/bin/dbmmanage target=../apache2/2.2/bin/dbmmanage
+link path=usr/bin/htcacheclean target=../apache2/2.2/bin/htcacheclean
+link path=usr/bin/htdbm target=../apache2/2.2/bin/htdbm
+link path=usr/bin/htdigest target=../apache2/2.2/bin/htdigest
+link path=usr/bin/htpasswd target=../apache2/2.2/bin/htpasswd
+link path=usr/bin/httxt2dbm target=../apache2/2.2/bin/httxt2dbm
+link path=usr/bin/logresolve target=../apache2/2.2/bin/logresolve
+link path=usr/bin/rotatelogs target=../apache2/2.2/bin/rotatelogs
+file Solaris/SmfApacheStates.html \
+    path=usr/lib/help/auths/locale/C/SmfApacheStates.html
+file Solaris/SmfValueApache.html \
+    path=usr/lib/help/auths/locale/C/SmfValueApache.html
+file Solaris/RtApacheSrvcMngmnt.html \
+    path=usr/lib/help/profiles/locale/C/RtApacheSrvcMngmnt.html
+link path=usr/share/man/man1/dbmmanage.1 \
+    target=../../../apache2/2.2/man/man1/dbmmanage.1
+link path=usr/share/man/man1/htdbm.1 \
+    target=../../../apache2/2.2/man/man1/htdbm.1
+link path=usr/share/man/man1/htdigest.1 \
+    target=../../../apache2/2.2/man/man1/htdigest.1
+link path=usr/share/man/man1/htpasswd.1 \
+    target=../../../apache2/2.2/man/man1/htpasswd.1
+link path=usr/share/man/man1/httxt2dbm.1 \
+    target=../../../apache2/2.2/man/man1/httxt2dbm.1
 file Solaris/apache2.1m.sunman path=usr/share/man/man1m/apache2.1m
-file path=var/apache2/2.2/cgi-bin/printenv mode=0444 pkg.depend.bypass-generate=.*
+link path=usr/share/man/man8/ab.8 target=../../../apache2/2.2/man/man8/ab.8
+link path=usr/share/man/man8/apachectl.8 \
+    target=../../../apache2/2.2/man/man8/apachectl.8
+link path=usr/share/man/man8/apxs.8 target=../../../apache2/2.2/man/man8/apxs.8
+link path=usr/share/man/man8/htcacheclean.8 \
+    target=../../../apache2/2.2/man/man8/htcacheclean.8
+link path=usr/share/man/man8/httpd.8 \
+    target=../../../apache2/2.2/man/man8/httpd.8
+link path=usr/share/man/man8/logresolve.8 \
+    target=../../../apache2/2.2/man/man8/logresolve.8
+link path=usr/share/man/man8/rotatelogs.8 \
+    target=../../../apache2/2.2/man/man8/rotatelogs.8
+link path=usr/share/man/man8/suexec.8 \
+    target=../../../apache2/2.2/man/man8/suexec.8
+file path=var/apache2/2.2/cgi-bin/printenv mode=0444 \
+    pkg.depend.bypass-generate=.*
 file path=var/apache2/2.2/cgi-bin/test-cgi mode=0444
 file path=var/apache2/2.2/error/HTTP_BAD_GATEWAY.html.var
 file path=var/apache2/2.2/error/HTTP_BAD_REQUEST.html.var
@@ -581,57 +646,20 @@
 file path=var/apache2/2.2/icons/world1.png
 file path=var/apache2/2.2/icons/world2.gif
 file path=var/apache2/2.2/icons/world2.png
-link path=usr/apache2/2.2/bin/64 target=$(MACH64)
-link path=usr/apache2/2.2/build/64 target=$(MACH64)
-link path=usr/apache2/2.2/libexec/64 target=$(MACH64)
-link path=usr/bin/$(MACH64)/ab target=../../apache2/2.2/bin/$(MACH64)/ab
-link path=usr/bin/$(MACH64)/apxs target=../../apache2/2.2/bin/$(MACH64)/apxs facet.devel=all
-link path=usr/bin/$(MACH64)/dbmmanage target=../../apache2/2.2/bin/$(MACH64)/dbmmanage
-link path=usr/bin/$(MACH64)/htcacheclean target=../../apache2/2.2/bin/$(MACH64)/htcacheclean
-link path=usr/bin/$(MACH64)/htdbm target=../../apache2/2.2/bin/$(MACH64)/htdbm
-link path=usr/bin/$(MACH64)/htdigest target=../../apache2/2.2/bin/$(MACH64)/htdigest
-link path=usr/bin/$(MACH64)/htpasswd target=../../apache2/2.2/bin/$(MACH64)/htpasswd
-link path=usr/bin/$(MACH64)/httxt2dbm target=../../apache2/2.2/bin/$(MACH64)/httxt2dbm
-link path=usr/bin/$(MACH64)/logresolve target=../../apache2/2.2/bin/$(MACH64)/logresolve
-link path=usr/bin/$(MACH64)/rotatelogs target=../../apache2/2.2/bin/$(MACH64)/rotatelogs
-link path=usr/bin/ab target=../apache2/2.2/bin/ab
-link path=usr/bin/apxs target=../apache2/2.2/bin/apxs
-link path=usr/bin/dbmmanage target=../apache2/2.2/bin/dbmmanage
-link path=usr/bin/htcacheclean target=../apache2/2.2/bin/htcacheclean
-link path=usr/bin/htdbm target=../apache2/2.2/bin/htdbm
-link path=usr/bin/htdigest target=../apache2/2.2/bin/htdigest
-link path=usr/bin/htpasswd target=../apache2/2.2/bin/htpasswd
-link path=usr/bin/httxt2dbm target=../apache2/2.2/bin/httxt2dbm
-link path=usr/bin/logresolve target=../apache2/2.2/bin/logresolve
-link path=usr/bin/rotatelogs target=../apache2/2.2/bin/rotatelogs
-link path=usr/share/man/man1/dbmmanage.1 target=../../../apache2/2.2/man/man1/dbmmanage.1
-link path=usr/share/man/man1/htdbm.1 target=../../../apache2/2.2/man/man1/htdbm.1
-link path=usr/share/man/man1/httxt2dbm.1 target=../../../apache2/2.2/man/man1/httxt2dbm.1
-link path=usr/share/man/man1/htdigest.1 target=../../../apache2/2.2/man/man1/htdigest.1
-link path=usr/share/man/man1/htpasswd.1 target=../../../apache2/2.2/man/man1/htpasswd.1
-link path=usr/share/man/man8/ab.8 target=../../../apache2/2.2/man/man8/ab.8
-link path=usr/share/man/man8/apxs.8 target=../../../apache2/2.2/man/man8/apxs.8
-link path=usr/share/man/man8/apachectl.8 target=../../../apache2/2.2/man/man8/apachectl.8
-link path=usr/share/man/man8/htcacheclean.8 target=../../../apache2/2.2/man/man8/htcacheclean.8
-link path=usr/share/man/man8/httpd.8 target=../../../apache2/2.2/man/man8/httpd.8
-link path=usr/share/man/man8/logresolve.8 target=../../../apache2/2.2/man/man8/logresolve.8
-link path=usr/share/man/man8/rotatelogs.8 target=../../../apache2/2.2/man/man8/rotatelogs.8
-link path=usr/share/man/man8/suexec.8 target=../../../apache2/2.2/man/man8/suexec.8
+dir  path=var/apache2/2.2/libexec/$(MACH64)
 link path=var/apache2/2.2/libexec/64 target=$(MACH64)
+dir  path=var/apache2/2.2/logs mode=0700
+dir  path=var/apache2/2.2/proxy owner=webservd group=webservd
 
-depend fmri=__TBD \
-    pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_mysql.so \
-    type=require 
-depend fmri=__TBD \
-    pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_sqlite3.so \
-    type=require 
-depend fmri=__TBD \
-    pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_ldap-1.so \
-    type=require 
 
-depend type=conditional \
-       predicate=web/php-52 \
-       fmri=web/server/apache-22/module/[email protected]
-depend type=conditional \
-       predicate=web/php-53 \
-       fmri=web/server/apache-22/module/[email protected]
+license apache.license license="Apache v2.0"
+depend type=conditional fmri=web/server/apache-22/module/[email protected] \
+    predicate=web/php-52
+depend type=conditional fmri=web/server/apache-22/module/[email protected] \
+    predicate=web/php-53
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_mysql.so
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_sqlite3.so
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_ldap-1.so
upstream/oracle/userland-gate