Accepting request 316550 from home:pgajdos

- access_compat shared also for 11sp3

- apache2-implicit-pointer-decl.patch renamed to 
  httpd-implicit-pointer-decl.patch to align with other
  patches names

- apachectl is now wrapper to start_apache2; therefore, it honors 
  HTTPD_INSTANCE variable, see README-instances.txt for details 
  + httpd-apachectl.patch
  - httpd-2.4.10-apachectl.patch

- a2enmod/a2dismod and a2enflag/a2disflag now respect 
  HTTPD_INSTANCE=<instance_name> environment variable, which can be 
  used to specify apache instance name; sysconfig file is expected 
  at /etc/sysconfig/apache2@<instance_name> 
 (see README-instances.txt for details)

- provides suse_maintenance_mmn symbol [bnc#915666] (internal)

- credits to Roman Drahtmueller:
  * add reference to /etc/permissions.local to output of %post if
    setting the permissions of suexec2 fails
  * do not enable mod_php5 by default any longer
  * httpd-2.0.49-log_server_status.dif obsoleted
  * apache2-mod_ssl_npn.patch removed because not used
  * include mod_reqtimeout.conf in httpd.conf
  * added cgid-timeout.conf, include
    it in httpd.conf
- fix default value APACHE_MODULES in sysconfig file
- %service_* macros for apache2@.service

OBS-URL: https://build.opensuse.org/request/show/316550
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=453

apache2.spec

@@ -17,6 +17,7 @@
 
 
 %define apache_mmn	%(test -s %{SOURCE0} && { echo -n apache_mmn_; bzcat %{SOURCE0} | awk '/^#define MODULE_MAGIC_NUMBER_MAJOR/ {printf "%d", $3}'; })
+%define suse_maintenance_mmn  0
 %define	default_mpm	prefork
 %{!?prefork:%define prefork 1}
 %{!?worker:%define worker 1}
@@ -46,7 +47,7 @@
 %define mods_static unixd systemd
 %else
 %define runtimedir	%{_localstatedir}/run
-%define mods_static access_compat unixd
+%define mods_static unixd
 %endif
 Name:           apache2
 Version:        2.4.12
@@ -98,6 +99,7 @@ Source114:      apache2-mod_usertrack.conf
 Source115:      apache2-mod_reqtimeout.conf
 Source116:      apache2-loadmodule.conf
 Source117:      apache2-global.conf
+Source118:      apache2-mod_cgid-timeout.conf
 Source130:      apache2-vhost.template
 Source131:      apache2-vhost-ssl.template
 Source140:      apache2-check_forensic
@@ -109,16 +111,12 @@ Source145:      apache2-find-directives
 Source146:      apache2@.service
 Source147:      apache2-script-helpers
 Patch2:         httpd-2.1.3alpha-layout.dif
-Patch23:        httpd-2.4.10-apachectl.patch
-#Patch65:        httpd-2.0.49-log_server_status.dif
+Patch23:        httpd-apachectl.patch
 Patch66:        httpd-2.0.54-envvars.dif
 Patch67:        httpd-2.2.0-apxs-a2enmod.dif
 Patch68:        httpd-2.x.x-logresolve.patch
-Patch69:        httpd-2.2.x-bnc690734.patch
-Patch70:        apache2-implicit-pointer-decl.patch
-# PATCH-FEATURE-UPSTREAM apache2-mod_ssl_npn.patch dimstar@opensuse.org -- Add npn support to mod_ssl (needed for spdy)
-#Patch108:       apache2-mod_ssl_npn.patch
-#Provides:       apache2(mod_ssl+npn)
+Patch69:        httpd-2.4.9-bnc690734.patch
+Patch70:        httpd-implicit-pointer-decl.patch
 # PATCH-FEATURE-UPSTREAM httpd-2.4.3-mod_systemd.patch crrodriguez@opensuse.org simple module provides systemd integration.
 Patch109:       httpd-2.4.3-mod_systemd.patch
 Patch111:       httpd-visibility.patch
@@ -151,6 +149,7 @@ Requires(post): sed
 Requires(post): textutils
 Recommends:     apache2-%{default_mpm}
 Provides:       %{apache_mmn}
+Provides:       suse_maintenance_mmn = %{suse_maintenance_mmn}
 Provides:       http_daemon
 Provides:       httpd
 Provides:       suse_help_viewer
@@ -294,14 +293,12 @@ to administrators of web servers in general.
 %prep
 %setup -q -n httpd-%{version} -a30
 %patch2 -p1
-%patch23 -p1
-#%patch65 -p1
+%patch23
 %patch66 -p1
 %patch67 -p1
 %patch68 -p1
-#%patch69
+%patch69
 %patch70 -p1
-#%patch108 -p1
 # Systemd module enabling patch                                                
 %if 0%{?suse_version} >= 1210 
 %patch109 -p1
@@ -572,6 +569,8 @@ for i in default-server.conf \
 	 mod_userdir.conf \
 	 mod_usertrack.conf \
 	 server-tuning.conf \
+	 mod_reqtimeout.conf \
+         mod_cgid-timeout.conf \
 	 ssl-global.conf
 do
 	install -m 644 $RPM_SOURCE_DIR/apache2-$i %{buildroot}/%{sysconfdir}/$i
@@ -1273,11 +1272,13 @@ exit 0
 %pre
 %if 0%{?suse_version} >= 1210
 %service_add_pre apache2.service
+%service_add_pre apache2@.service
 %endif
 
 %preun
 %if 0%{?suse_version} >= 1210
 %service_del_preun apache2.service
+%service_del_preun apache2@.service
 %endif
 for i in %{_sbindir}/httpd \
 	 %{installbuilddir}/config_vars.mk
@@ -1289,6 +1290,7 @@ exit 0
 %postun
 %if 0%{?suse_version} >= 1210
 %service_del_postun apache2.service
+%service_del_postun apache2@.service
 %else
 %insserv_cleanup
 %endif
@@ -1297,7 +1299,7 @@ exit 0
 %if 0%{?suse_version} <= 1130
 %run_permissions
 %else
-%set_permissions %{_sbindir}/suexec
+%set_permissions %{_sbindir}/suexec || echo "Please check /etc/permissions.local for settings of /usr/sbin/suexec2 ."
 %endif
 # wwwadmin group existed in past remove after openSUSE-13.2 out of support scope
 if grep -q "^wwwadmin:" %{_sysconfdir}/group; then
@@ -1314,6 +1316,7 @@ fi
 %{fillup_only apache2}
 %if 0%{?suse_version} >= 1210
 %service_add_post apache2.service
+%service_add_post apache2@.service
 %else
 %{fillup_and_insserv apache2}
 %endif