components/apache24/patches/Makefile.in.patch
author Shawn Ferry <shawn.ferry@oracle.com>
Mon, 28 Nov 2016 16:54:02 -0800
changeset 7565 48aa82a0931f
parent 4697 2be298b79293
permissions -rw-r--r--
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0 19429313 address_object type should support vrrp addresses 19888183 publisher provider is applied on each puppet run 22125767 nsswitch provider missing ipnodes, protocols, printers 22126108 add process scheduler administration provider 22960016 Puppet needs a native way to set ZFS ACLs 23107546 race condition with smf provider and manifest-import 23119445 Upgrade Ruby Hiera to 3.2.0 23547788 Add ILB type to Puppet 23593229 rspec tests need to be written for solaris_providers boot_environment 23593308 rspec tests need to be written for solaris_providers ipmp_interface 23593316 rspec tests need to be written for solaris_providers protocol_properties 23593225 rspec tests need to be written for solaris_providers etherstub 23593319 rspec tests need to be written for solaris_providers vnic 23593310 puppet module rspec tests and validation for nsswitch 24674283 current puppet.stencil implementation restricts some valid puppet use cases 24680838 puppet agent failures should be visible to administrator via SMF interfaces 24681179 puppet's logadm.conf is pointing at wrong location for master, ignoring agent 24696742 puppet svccfg doesn't work for some value types 24696809 Puppet link aggregation modules cascading errors 24825868 Update to Puppet 4, Puppet 3 is EOL 24836004 '-' is valid in pkg mediator implementation 24836209 nis provider needs to support multiple securenets entries 24928890 keystone and horizon modules patches create invalid metadata.json 25022632 puppet ipmp_interface type should not validate interface existence 25022714 Puppet SMF service should not refresh on every apply operation 25225039 puppet svccfg should not declare a property absent if it does not match desired 25060925 puppet resource address_object generates invalid puppet code for dhcp interfaces 25065015 update puppet oracle-solaris_providers 2.0.0 25071521 puppet svccfg type should return a clear error if value is not provided 25071681 puppet dns resource generates invalid manifest 25071686 puppet resource ldap; Error: Could not run: No ability to determine if ldap... 25071690 puppet resource nis; Error: Could not run: No ability to determine if nis exists 25092384 puppet module files should be owned by root 25093408 puppet-solaris should be part of puppet again 25106150 Nis provider is not idempotent 25106155 DNS provider is not idempotent 25163776 puppet link_aggregation misunderstands 'address' -u output 25163791 puppet link_aggregation should use resource values instead of property_hash 25163815 puppet address_object errors and validations could be better 25163840 puppet Puppet::Property::List types conflict with internally generated arrays 25163864 puppet link_aggregation type specs need to be written 25177901 puppet beadm should not use both -e and -p 25178928 puppet link_aggregation should try to copy existing values on change of mode 25179040 puppet link_aggregation should delete with -t for temporary 25192742 puppet svccfg shouldn't try to update properties for a non-existent fmri 25196056 puppet interface and address _properties namevars are problematic 25191982 puppet type 'dns' is not able to set 'options' property in resolv.conf 25211935 puppet link_aggregation needs to permanently delete before modifying temporary 25217063 puppet protocol_properties is not idempotent 25218036 puppet resource svccfg emits a warning for every property 25218053 puppet svccfg prefetch should match individually specified parameters 25218208 puppet svccfg should enforce well-formedness in fmri parameters 25224661 puppet resource address_properties shouldn't output read-only properties 25224777 puppet address_properties should not reset unchanged properties 25306835 puppet boot_environment needs to understand the new snapshot format 25306877 puppet svccfg should check for pg and allow nested property groups 25306904 puppet dns,nis,ldap,protocol_properties prefetch fails after input auto munge 25348321 puppet boot_environment needs to validate all properties and parameters 25354751 puppet vnic provider needs to support / and - as valid vnic name characters
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2079
46ce7840065c PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents: 716
diff changeset
     1
Patch origin: in-house
46ce7840065c PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents: 716
diff changeset
     2
Patch status: Solaris-specific; not suitable for upstream
46ce7840065c PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents: 716
diff changeset
     3
46ce7840065c PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents: 716
diff changeset
     4
--- Makefile.in
46ce7840065c PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents: 716
diff changeset
     5
+++ Makefile.in
46ce7840065c PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents: 716
diff changeset
     6
@@ -50,6 +50,9 @@
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
 	    				-e 's#@@Port@@#$(PORT)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
 	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
 	    				-e '/@@LoadModule@@/d' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
+	    				-e 's#@@SysconfDir@@#$(sysconfdir)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
+	    				-e 's#@@RuntimeDir@@#$(runtimedir)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
+	    				-e 's#@@DataDir@@#$(datadir)#g' \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
 	    				< $$i; \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
 	    		else \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
 	    			sed -n -e '/@@LoadModule@@/q' \
4697
2be298b79293 21485757 Upgrade Apache Web Server to version 2.4.16
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2079
diff changeset
    16
@@ -116,6 +119,19 @@
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
 	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
 	    fi ; \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
 	fi
716
2d2eb53223b2 7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents: 278
diff changeset
    20
+	@if ! grep "{APACHE_USER_ENVVARS}" $(DESTDIR)$(sbindir)/envvars > /dev/null; then \
2d2eb53223b2 7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents: 278
diff changeset
    21
+	    echo '# If you run apachectl with APACHE_USER_ENVVARS in its environment'\
2d2eb53223b2 7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents: 278
diff changeset
    22
+		>> $(DESTDIR)$(sbindir)/envvars ; \
2d2eb53223b2 7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents: 278
diff changeset
    23
+	    echo '# the specified file will be sourced here. The standard path is'\
2d2eb53223b2 7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents: 278
diff changeset
    24
+		>> $(DESTDIR)$(sbindir)/envvars ; \
2079
46ce7840065c PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents: 716
diff changeset
    25
+	    echo '# /etc/apache2/2.4/envvars.' >> $(DESTDIR)$(sbindir)/envvars ; \
716
2d2eb53223b2 7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents: 278
diff changeset
    26
+	    echo '' >> $(DESTDIR)$(sbindir)/envvars ; \
2d2eb53223b2 7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents: 278
diff changeset
    27
+	    echo 'if [ "x$${APACHE_USER_ENVVARS}" != "x" -a -f "$${APACHE_USER_ENVVARS}" ]; then'\
2d2eb53223b2 7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents: 278
diff changeset
    28
+		>> $(DESTDIR)$(sbindir)/envvars ; \
2d2eb53223b2 7143740 svc:/system/install/server:default can conflict with svc:/network/http:apache22
Tomas Dzik <Tomas.Dzik@oracle.com>
parents: 278
diff changeset
    29
+	    echo '. "$${APACHE_USER_ENVVARS}"' >> $(DESTDIR)$(sbindir)/envvars ; \
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    30
+	    echo 'fi' >> $(DESTDIR)$(sbindir)/envvars ; \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    31
+	fi
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
+	@grep "^#" $(top_builddir)/support/envvars-std > $(DESTDIR)$(sysconfdir)/envvars
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    33
 
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    34
 # Create a sanitized config_vars.mk
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    35
 build/config_vars.out: build/config_vars.mk
4697
2be298b79293 21485757 Upgrade Apache Web Server to version 2.4.16
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2079
diff changeset
    36
@@ -202,7 +218,6 @@
278
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    37
 
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    38
 install-other:
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    39
 	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    40
-	@test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    41
 	@for ext in dll x; do \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    42
 		file=apachecore.$$ext; \
77b380ba9d84 7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    43
 		if test -f $$file; then \