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.
21025698 Apache clean up for S11.3 s11-update
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 17 Apr 2015 01:53:46 -0700
branchs11-update
changeset 4236 ca71d5a4e4e9
parent 4232 046fd454c101
child 4237 3517b6c3873e
21025698 Apache clean up for S11.3
components/apache2-modules/mod_perl/Makefile file | annotate | diff | comparison | revisions
components/apache2-modules/mod_security2/Makefile file | annotate | diff | comparison | revisions
components/apache24/apache-24.p5m file | annotate | diff | comparison | revisions
components/apr-1_5/Makefile file | annotate | diff | comparison | revisions
components/apr-util-1_5/Makefile file | annotate | diff | comparison | revisions
components/apr-util-1_5/apr-util-15.p5m file | annotate | diff | comparison | revisions
components/apr-util/Makefile file | annotate | diff | comparison | revisions
components/apr/Makefile file | annotate | diff | comparison | revisions 
--- a/components/apache2-modules/mod_perl/Makefile	Fri May 01 10:10:21 2015 -0700
+++ b/components/apache2-modules/mod_perl/Makefile	Fri Apr 17 01:53:46 2015 -0700
@@ -75,8 +75,6 @@
 test: $(TEST_32)
 
 
-REQUIRED_PACKAGES += library/apr-13
-REQUIRED_PACKAGES += library/apr-util-13
 REQUIRED_PACKAGES += library/apr-15
 REQUIRED_PACKAGES += library/apr-util-15
 REQUIRED_PACKAGES += runtime/perl-512
--- a/components/apache2-modules/mod_security2/Makefile	Fri May 01 10:10:21 2015 -0700
+++ b/components/apache2-modules/mod_security2/Makefile	Fri Apr 17 01:53:46 2015 -0700
@@ -62,8 +62,6 @@
 test: $(TEST_32_and_64)
 
 
-REQUIRED_PACKAGES += library/apr-13
-REQUIRED_PACKAGES += library/apr-util-13
 REQUIRED_PACKAGES += library/apr-15
 REQUIRED_PACKAGES += library/apr-util-15
 REQUIRED_PACKAGES += library/libxml2
--- a/components/apache24/apache-24.p5m	Fri May 01 10:10:21 2015 -0700
+++ b/components/apache24/apache-24.p5m	Fri Apr 17 01:53:46 2015 -0700
@@ -85,23 +85,22 @@
     owner=root group=sys mode=644 preserve=true
 file Solaris/http-apache24.xml path=lib/svc/manifest/network/http-apache24.xml
 file Solaris/http-apache24 path=lib/svc/method/http-apache24
-# Remove pkglint.action008 once apr-util-15 (S11.3b17) is released.
-file path=usr/apache2/2.4/bin/ab pkg.linted.userland.action001.3=true
+file path=usr/apache2/2.4/bin/ab
 file path=usr/apache2/2.4/bin/apachectl
 file path=usr/apache2/2.4/bin/apxs facet.devel=true
-file path=usr/apache2/2.4/bin/checkgid pkg.linted.userland.action001.3=true
+file path=usr/apache2/2.4/bin/checkgid
 file path=usr/apache2/2.4/bin/dbmmanage
 file path=usr/apache2/2.4/bin/envvars
 file path=usr/apache2/2.4/bin/envvars-std
-file path=usr/apache2/2.4/bin/fcgistarter pkg.linted.userland.action001.3=true
-file path=usr/apache2/2.4/bin/htcacheclean pkg.linted.userland.action001.3=true
-file path=usr/apache2/2.4/bin/htdbm pkg.linted.userland.action001.3=true
-file path=usr/apache2/2.4/bin/htdigest pkg.linted.userland.action001.3=true
-file path=usr/apache2/2.4/bin/htpasswd pkg.linted.userland.action001.3=true
-file path=usr/apache2/2.4/bin/httpd pkg.linted.userland.action001.3=true
-file path=usr/apache2/2.4/bin/httxt2dbm pkg.linted.userland.action001.3=true
-file path=usr/apache2/2.4/bin/logresolve pkg.linted.userland.action001.3=true
-file path=usr/apache2/2.4/bin/rotatelogs pkg.linted.userland.action001.3=true
+file path=usr/apache2/2.4/bin/fcgistarter
+file path=usr/apache2/2.4/bin/htcacheclean
+file path=usr/apache2/2.4/bin/htdbm
+file path=usr/apache2/2.4/bin/htdigest
+file path=usr/apache2/2.4/bin/htpasswd
+file path=usr/apache2/2.4/bin/httpd
+file path=usr/apache2/2.4/bin/httxt2dbm
+file path=usr/apache2/2.4/bin/logresolve
+file path=usr/apache2/2.4/bin/rotatelogs
 file usr/apache2/2.4/bin/suexec path=usr/apache2/2.4/bin/suexec.disabled \
     mode=0500
 file path=usr/apache2/2.4/build/config.nice mode=0555
--- a/components/apr-1_5/Makefile	Fri May 01 10:10:21 2015 -0700
+++ b/components/apr-1_5/Makefile	Fri Apr 17 01:53:46 2015 -0700
@@ -86,6 +86,7 @@
 test: $(TEST_32_and_64)
 
 
+REQUIRED_PACKAGES += developer/documentation-tool/doxygen
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
--- a/components/apr-util-1_5/Makefile	Fri May 01 10:10:21 2015 -0700
+++ b/components/apr-util-1_5/Makefile	Fri Apr 17 01:53:46 2015 -0700
@@ -87,6 +87,7 @@
 test: $(TEST_32_and_64)
 
 
+REQUIRED_PACKAGES += developer/documentation-tool/doxygen
 REQUIRED_PACKAGES += database/mysql-55/library
 REQUIRED_PACKAGES += database/sqlite-3
 REQUIRED_PACKAGES += library/apr-15
--- a/components/apr-util-1_5/apr-util-15.p5m	Fri May 01 10:10:21 2015 -0700
+++ b/components/apr-util-1_5/apr-util-15.p5m	Fri Apr 17 01:53:46 2015 -0700
@@ -74,18 +74,16 @@
     target=libaprutil-1.so.0.5.$(MICRO_VERSION) facet.devel=false
 link path=usr/apr-util/1.5/lib/$(MACH64)/libaprutil-1.so.0 \
     target=libaprutil-1.so.0.5.$(MICRO_VERSION) facet.devel=false
-# Remove pkglint.action008 once apr-15 (S11.3b16) is released.
-file path=usr/apr-util/1.5/lib/$(MACH64)/libaprutil-1.so.0.5.$(MICRO_VERSION) facet.devel=false \
-    pkg.linted.userland.action001.3=true
+file path=usr/apr-util/1.5/lib/$(MACH64)/libaprutil-1.so.0.5.$(MICRO_VERSION) \
+    facet.devel=false
 file path=usr/apr-util/1.5/lib/$(MACH64)/pkgconfig/apr-util-1.pc
 link path=usr/apr-util/1.5/lib/64 target=$(MACH64)
 link path=usr/apr-util/1.5/lib/libaprutil-1.so target=libaprutil-1.so.0.5.$(MICRO_VERSION) \
     facet.devel=false
 link path=usr/apr-util/1.5/lib/libaprutil-1.so.0 target=libaprutil-1.so.0.5.$(MICRO_VERSION) \
     facet.devel=false
-# Remove pkglint.action008 once apr-15 (S11.3b16) is released.
-file path=usr/apr-util/1.5/lib/libaprutil-1.so.0.5.$(MICRO_VERSION) facet.devel=false \
-    pkg.linted.userland.action001.3=true
+file path=usr/apr-util/1.5/lib/libaprutil-1.so.0.5.$(MICRO_VERSION) \
+    facet.devel=false
 file path=usr/apr-util/1.5/lib/pkgconfig/apr-util-1.pc
 file path=usr/apr-util/1.5/manual/abts_8h_source.html
 file path=usr/apr-util/1.5/manual/abts__tests_8h_source.html
--- a/components/apr-util/Makefile	Fri May 01 10:10:21 2015 -0700
+++ b/components/apr-util/Makefile	Fri Apr 17 01:53:46 2015 -0700
@@ -84,6 +84,7 @@
 test: $(TEST_32_and_64)
 
 
+REQUIRED_PACKAGES += developer/documentation-tool/doxygen
 REQUIRED_PACKAGES += database/mysql-55/library
 REQUIRED_PACKAGES += database/sqlite-3
 REQUIRED_PACKAGES += library/apr-13
--- a/components/apr/Makefile	Fri May 01 10:10:21 2015 -0700
+++ b/components/apr/Makefile	Fri Apr 17 01:53:46 2015 -0700
@@ -84,6 +84,7 @@
 test: $(TEST_32_and_64)
 
 
+REQUIRED_PACKAGES += developer/documentation-tool/doxygen
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
upstream/oracle/userland-gate