diff --git a/apache2.changes b/apache2.changes index dc39dba..a05f913 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 25 13:53:16 UTC 2015 - tchvatal@suse.com + +- Deprecate realver define as it is equal to version. +- Explicitely state MPM mods to ensure we don't lose some bnc#444878 + ------------------------------------------------------------------- Wed Feb 25 13:23:40 UTC 2015 - tchvatal@suse.com diff --git a/apache2.spec b/apache2.spec index 0f6c6f8..ca797a4 100644 --- a/apache2.spec +++ b/apache2.spec @@ -43,7 +43,6 @@ %define suexec_safepath %{_prefix}/local/bin:%{_prefix}/bin:/bin %define VENDOR SUSE %define platform_string Linux/%{VENDOR} -%define realver 2.4.11 %define httpduser wwwrun %define httpdgroup www %if 0%{?suse_version} >= 1220 @@ -60,7 +59,7 @@ Summary: The Apache Web Server Version 2.4 License: Apache-2.0 Group: Productivity/Networking/Web/Servers Url: http://httpd.apache.org/ -Source0: http://www.apache.org/dist/httpd-%{realver}.tar.bz2 +Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 # Add file to take mtime from it in prep section Source1: apache2.changes Source6: 60C5442D.key @@ -290,7 +289,7 @@ Utilities provided by the Apache 2 Web Server project which are useful to administrators of web servers in general. %prep -%setup -q -n httpd-%{realver} +%setup -q -n httpd-%{version} %patch2 -p1 %patch23 -p1 #%patch65 -p1 @@ -811,7 +810,117 @@ mv %{buildroot}/%{sysconfdir}/original . %defattr(-,root,root) %{_sbindir}/%{httpd}-prefork %dir %{_libdir}/%{pname}-prefork -%{_libdir}/%{pname}-prefork/mod_*.so +# hardcoded list so we do not lose mods by accident +%{_libdir}/%{pname}-prefork/mod_actions.so +%{_libdir}/%{pname}-prefork/mod_alias.so +%{_libdir}/%{pname}-prefork/mod_allowmethods.so +%{_libdir}/%{pname}-prefork/mod_asis.so +%{_libdir}/%{pname}-prefork/mod_auth_basic.so +%{_libdir}/%{pname}-prefork/mod_auth_digest.so +%{_libdir}/%{pname}-prefork/mod_auth_form.so +%{_libdir}/%{pname}-prefork/mod_authn_anon.so +%{_libdir}/%{pname}-prefork/mod_authn_core.so +%{_libdir}/%{pname}-prefork/mod_authn_dbd.so +%{_libdir}/%{pname}-prefork/mod_authn_dbm.so +%{_libdir}/%{pname}-prefork/mod_authn_file.so +%{_libdir}/%{pname}-prefork/mod_authn_socache.so +%{_libdir}/%{pname}-prefork/mod_authnz_ldap.so +%{_libdir}/%{pname}-prefork/mod_authz_core.so +%{_libdir}/%{pname}-prefork/mod_authz_dbd.so +%{_libdir}/%{pname}-prefork/mod_authz_dbm.so +%{_libdir}/%{pname}-prefork/mod_authz_groupfile.so +%{_libdir}/%{pname}-prefork/mod_authz_host.so +%{_libdir}/%{pname}-prefork/mod_authz_owner.so +%{_libdir}/%{pname}-prefork/mod_authz_user.so +%{_libdir}/%{pname}-prefork/mod_autoindex.so +%{_libdir}/%{pname}-prefork/mod_bucketeer.so +%{_libdir}/%{pname}-prefork/mod_buffer.so +%{_libdir}/%{pname}-prefork/mod_cache.so +%{_libdir}/%{pname}-prefork/mod_cache_disk.so +%{_libdir}/%{pname}-prefork/mod_cache_socache.so +%{_libdir}/%{pname}-prefork/mod_case_filter.so +%{_libdir}/%{pname}-prefork/mod_case_filter_in.so +%{_libdir}/%{pname}-prefork/mod_cgi.so +%{_libdir}/%{pname}-prefork/mod_charset_lite.so +%{_libdir}/%{pname}-prefork/mod_data.so +%{_libdir}/%{pname}-prefork/mod_dav.so +%{_libdir}/%{pname}-prefork/mod_dav_fs.so +%{_libdir}/%{pname}-prefork/mod_dav_lock.so +%{_libdir}/%{pname}-prefork/mod_dbd.so +%{_libdir}/%{pname}-prefork/mod_deflate.so +%{_libdir}/%{pname}-prefork/mod_dialup.so +%{_libdir}/%{pname}-prefork/mod_dir.so +%{_libdir}/%{pname}-prefork/mod_dumpio.so +%{_libdir}/%{pname}-prefork/mod_echo.so +%{_libdir}/%{pname}-prefork/mod_env.so +%{_libdir}/%{pname}-prefork/mod_expires.so +%{_libdir}/%{pname}-prefork/mod_ext_filter.so +%{_libdir}/%{pname}-prefork/mod_file_cache.so +%{_libdir}/%{pname}-prefork/mod_filter.so +%{_libdir}/%{pname}-prefork/mod_headers.so +%{_libdir}/%{pname}-prefork/mod_heartmonitor.so +%{_libdir}/%{pname}-prefork/mod_imagemap.so +%{_libdir}/%{pname}-prefork/mod_include.so +%{_libdir}/%{pname}-prefork/mod_info.so +%{_libdir}/%{pname}-prefork/mod_lbmethod_bybusyness.so +%{_libdir}/%{pname}-prefork/mod_lbmethod_byrequests.so +%{_libdir}/%{pname}-prefork/mod_lbmethod_bytraffic.so +%{_libdir}/%{pname}-prefork/mod_lbmethod_heartbeat.so +%{_libdir}/%{pname}-prefork/mod_ldap.so +%{_libdir}/%{pname}-prefork/mod_log_config.so +%{_libdir}/%{pname}-prefork/mod_log_debug.so +%{_libdir}/%{pname}-prefork/mod_log_forensic.so +%{_libdir}/%{pname}-prefork/mod_logio.so +%{_libdir}/%{pname}-prefork/mod_lua.so +%{_libdir}/%{pname}-prefork/mod_macro.so +%{_libdir}/%{pname}-prefork/mod_mime.so +%{_libdir}/%{pname}-prefork/mod_mime_magic.so +%{_libdir}/%{pname}-prefork/mod_negotiation.so +%{_libdir}/%{pname}-prefork/mod_optional_fn_export.so +%{_libdir}/%{pname}-prefork/mod_optional_fn_import.so +%{_libdir}/%{pname}-prefork/mod_optional_hook_export.so +%{_libdir}/%{pname}-prefork/mod_optional_hook_import.so +%{_libdir}/%{pname}-prefork/mod_proxy.so +%{_libdir}/%{pname}-prefork/mod_proxy_ajp.so +%{_libdir}/%{pname}-prefork/mod_proxy_balancer.so +%{_libdir}/%{pname}-prefork/mod_proxy_connect.so +%{_libdir}/%{pname}-prefork/mod_proxy_express.so +%{_libdir}/%{pname}-prefork/mod_proxy_fcgi.so +%{_libdir}/%{pname}-prefork/mod_proxy_fdpass.so +%{_libdir}/%{pname}-prefork/mod_proxy_ftp.so +%{_libdir}/%{pname}-prefork/mod_proxy_html.so +%{_libdir}/%{pname}-prefork/mod_proxy_http.so +%{_libdir}/%{pname}-prefork/mod_proxy_scgi.so +%{_libdir}/%{pname}-prefork/mod_proxy_wstunnel.so +%{_libdir}/%{pname}-prefork/mod_ratelimit.so +%{_libdir}/%{pname}-prefork/mod_reflector.so +%{_libdir}/%{pname}-prefork/mod_remoteip.so +%{_libdir}/%{pname}-prefork/mod_reqtimeout.so +%{_libdir}/%{pname}-prefork/mod_request.so +%{_libdir}/%{pname}-prefork/mod_rewrite.so +%{_libdir}/%{pname}-prefork/mod_sed.so +%{_libdir}/%{pname}-prefork/mod_session.so +%{_libdir}/%{pname}-prefork/mod_session_cookie.so +%{_libdir}/%{pname}-prefork/mod_session_crypto.so +%{_libdir}/%{pname}-prefork/mod_session_dbd.so +%{_libdir}/%{pname}-prefork/mod_setenvif.so +%{_libdir}/%{pname}-prefork/mod_slotmem_plain.so +%{_libdir}/%{pname}-prefork/mod_slotmem_shm.so +%{_libdir}/%{pname}-prefork/mod_socache_dbm.so +%{_libdir}/%{pname}-prefork/mod_socache_memcache.so +%{_libdir}/%{pname}-prefork/mod_socache_shmcb.so +%{_libdir}/%{pname}-prefork/mod_speling.so +%{_libdir}/%{pname}-prefork/mod_ssl.so +%{_libdir}/%{pname}-prefork/mod_status.so +%{_libdir}/%{pname}-prefork/mod_substitute.so +%{_libdir}/%{pname}-prefork/mod_suexec.so +%{_libdir}/%{pname}-prefork/mod_unique_id.so +%{_libdir}/%{pname}-prefork/mod_userdir.so +%{_libdir}/%{pname}-prefork/mod_usertrack.so +%{_libdir}/%{pname}-prefork/mod_version.so +%{_libdir}/%{pname}-prefork/mod_vhost_alias.so +%{_libdir}/%{pname}-prefork/mod_watchdog.so +%{_libdir}/%{pname}-prefork/mod_xml2enc.so %endif %if %{worker} @@ -819,7 +928,117 @@ mv %{buildroot}/%{sysconfdir}/original . %defattr(-,root,root) %{_sbindir}/%{httpd}-worker %dir %{_libdir}/%{pname}-worker -%{_libdir}/%{pname}-worker/mod_*.so +# hardcoded list so we do not lose mods by accident +%{_libdir}/%{pname}-worker/mod_actions.so +%{_libdir}/%{pname}-worker/mod_alias.so +%{_libdir}/%{pname}-worker/mod_allowmethods.so +%{_libdir}/%{pname}-worker/mod_asis.so +%{_libdir}/%{pname}-worker/mod_auth_basic.so +%{_libdir}/%{pname}-worker/mod_auth_digest.so +%{_libdir}/%{pname}-worker/mod_auth_form.so +%{_libdir}/%{pname}-worker/mod_authn_anon.so +%{_libdir}/%{pname}-worker/mod_authn_core.so +%{_libdir}/%{pname}-worker/mod_authn_dbd.so +%{_libdir}/%{pname}-worker/mod_authn_dbm.so +%{_libdir}/%{pname}-worker/mod_authn_file.so +%{_libdir}/%{pname}-worker/mod_authn_socache.so +%{_libdir}/%{pname}-worker/mod_authnz_ldap.so +%{_libdir}/%{pname}-worker/mod_authz_core.so +%{_libdir}/%{pname}-worker/mod_authz_dbd.so +%{_libdir}/%{pname}-worker/mod_authz_dbm.so +%{_libdir}/%{pname}-worker/mod_authz_groupfile.so +%{_libdir}/%{pname}-worker/mod_authz_host.so +%{_libdir}/%{pname}-worker/mod_authz_owner.so +%{_libdir}/%{pname}-worker/mod_authz_user.so +%{_libdir}/%{pname}-worker/mod_autoindex.so +%{_libdir}/%{pname}-worker/mod_bucketeer.so +%{_libdir}/%{pname}-worker/mod_buffer.so +%{_libdir}/%{pname}-worker/mod_cache.so +%{_libdir}/%{pname}-worker/mod_cache_disk.so +%{_libdir}/%{pname}-worker/mod_cache_socache.so +%{_libdir}/%{pname}-worker/mod_case_filter.so +%{_libdir}/%{pname}-worker/mod_case_filter_in.so +%{_libdir}/%{pname}-worker/mod_cgid.so +%{_libdir}/%{pname}-worker/mod_charset_lite.so +%{_libdir}/%{pname}-worker/mod_data.so +%{_libdir}/%{pname}-worker/mod_dav.so +%{_libdir}/%{pname}-worker/mod_dav_fs.so +%{_libdir}/%{pname}-worker/mod_dav_lock.so +%{_libdir}/%{pname}-worker/mod_dbd.so +%{_libdir}/%{pname}-worker/mod_deflate.so +%{_libdir}/%{pname}-worker/mod_dialup.so +%{_libdir}/%{pname}-worker/mod_dir.so +%{_libdir}/%{pname}-worker/mod_dumpio.so +%{_libdir}/%{pname}-worker/mod_echo.so +%{_libdir}/%{pname}-worker/mod_env.so +%{_libdir}/%{pname}-worker/mod_expires.so +%{_libdir}/%{pname}-worker/mod_ext_filter.so +%{_libdir}/%{pname}-worker/mod_file_cache.so +%{_libdir}/%{pname}-worker/mod_filter.so +%{_libdir}/%{pname}-worker/mod_headers.so +%{_libdir}/%{pname}-worker/mod_heartmonitor.so +%{_libdir}/%{pname}-worker/mod_imagemap.so +%{_libdir}/%{pname}-worker/mod_include.so +%{_libdir}/%{pname}-worker/mod_info.so +%{_libdir}/%{pname}-worker/mod_lbmethod_bybusyness.so +%{_libdir}/%{pname}-worker/mod_lbmethod_byrequests.so +%{_libdir}/%{pname}-worker/mod_lbmethod_bytraffic.so +%{_libdir}/%{pname}-worker/mod_lbmethod_heartbeat.so +%{_libdir}/%{pname}-worker/mod_ldap.so +%{_libdir}/%{pname}-worker/mod_log_config.so +%{_libdir}/%{pname}-worker/mod_log_debug.so +%{_libdir}/%{pname}-worker/mod_log_forensic.so +%{_libdir}/%{pname}-worker/mod_logio.so +%{_libdir}/%{pname}-worker/mod_lua.so +%{_libdir}/%{pname}-worker/mod_macro.so +%{_libdir}/%{pname}-worker/mod_mime.so +%{_libdir}/%{pname}-worker/mod_mime_magic.so +%{_libdir}/%{pname}-worker/mod_negotiation.so +%{_libdir}/%{pname}-worker/mod_optional_fn_export.so +%{_libdir}/%{pname}-worker/mod_optional_fn_import.so +%{_libdir}/%{pname}-worker/mod_optional_hook_export.so +%{_libdir}/%{pname}-worker/mod_optional_hook_import.so +%{_libdir}/%{pname}-worker/mod_proxy.so +%{_libdir}/%{pname}-worker/mod_proxy_ajp.so +%{_libdir}/%{pname}-worker/mod_proxy_balancer.so +%{_libdir}/%{pname}-worker/mod_proxy_connect.so +%{_libdir}/%{pname}-worker/mod_proxy_express.so +%{_libdir}/%{pname}-worker/mod_proxy_fcgi.so +%{_libdir}/%{pname}-worker/mod_proxy_fdpass.so +%{_libdir}/%{pname}-worker/mod_proxy_ftp.so +%{_libdir}/%{pname}-worker/mod_proxy_html.so +%{_libdir}/%{pname}-worker/mod_proxy_http.so +%{_libdir}/%{pname}-worker/mod_proxy_scgi.so +%{_libdir}/%{pname}-worker/mod_proxy_wstunnel.so +%{_libdir}/%{pname}-worker/mod_ratelimit.so +%{_libdir}/%{pname}-worker/mod_reflector.so +%{_libdir}/%{pname}-worker/mod_remoteip.so +%{_libdir}/%{pname}-worker/mod_reqtimeout.so +%{_libdir}/%{pname}-worker/mod_request.so +%{_libdir}/%{pname}-worker/mod_rewrite.so +%{_libdir}/%{pname}-worker/mod_sed.so +%{_libdir}/%{pname}-worker/mod_session.so +%{_libdir}/%{pname}-worker/mod_session_cookie.so +%{_libdir}/%{pname}-worker/mod_session_crypto.so +%{_libdir}/%{pname}-worker/mod_session_dbd.so +%{_libdir}/%{pname}-worker/mod_setenvif.so +%{_libdir}/%{pname}-worker/mod_slotmem_plain.so +%{_libdir}/%{pname}-worker/mod_slotmem_shm.so +%{_libdir}/%{pname}-worker/mod_socache_dbm.so +%{_libdir}/%{pname}-worker/mod_socache_memcache.so +%{_libdir}/%{pname}-worker/mod_socache_shmcb.so +%{_libdir}/%{pname}-worker/mod_speling.so +%{_libdir}/%{pname}-worker/mod_ssl.so +%{_libdir}/%{pname}-worker/mod_status.so +%{_libdir}/%{pname}-worker/mod_substitute.so +%{_libdir}/%{pname}-worker/mod_suexec.so +%{_libdir}/%{pname}-worker/mod_unique_id.so +%{_libdir}/%{pname}-worker/mod_userdir.so +%{_libdir}/%{pname}-worker/mod_usertrack.so +%{_libdir}/%{pname}-worker/mod_version.so +%{_libdir}/%{pname}-worker/mod_vhost_alias.so +%{_libdir}/%{pname}-worker/mod_watchdog.so +%{_libdir}/%{pname}-worker/mod_xml2enc.so %endif %if %{event} @@ -827,7 +1046,117 @@ mv %{buildroot}/%{sysconfdir}/original . %defattr(-,root,root) %{_sbindir}/%{httpd}-event %dir %{_libdir}/%{pname}-event -%{_libdir}/%{pname}-event/mod_*.so +# hardcoded list so we do not lose mods by accident +%{_libdir}/%{pname}-event/mod_actions.so +%{_libdir}/%{pname}-event/mod_alias.so +%{_libdir}/%{pname}-event/mod_allowmethods.so +%{_libdir}/%{pname}-event/mod_asis.so +%{_libdir}/%{pname}-event/mod_auth_basic.so +%{_libdir}/%{pname}-event/mod_auth_digest.so +%{_libdir}/%{pname}-event/mod_auth_form.so +%{_libdir}/%{pname}-event/mod_authn_anon.so +%{_libdir}/%{pname}-event/mod_authn_core.so +%{_libdir}/%{pname}-event/mod_authn_dbd.so +%{_libdir}/%{pname}-event/mod_authn_dbm.so +%{_libdir}/%{pname}-event/mod_authn_file.so +%{_libdir}/%{pname}-event/mod_authn_socache.so +%{_libdir}/%{pname}-event/mod_authnz_ldap.so +%{_libdir}/%{pname}-event/mod_authz_core.so +%{_libdir}/%{pname}-event/mod_authz_dbd.so +%{_libdir}/%{pname}-event/mod_authz_dbm.so +%{_libdir}/%{pname}-event/mod_authz_groupfile.so +%{_libdir}/%{pname}-event/mod_authz_host.so +%{_libdir}/%{pname}-event/mod_authz_owner.so +%{_libdir}/%{pname}-event/mod_authz_user.so +%{_libdir}/%{pname}-event/mod_autoindex.so +%{_libdir}/%{pname}-event/mod_bucketeer.so +%{_libdir}/%{pname}-event/mod_buffer.so +%{_libdir}/%{pname}-event/mod_cache.so +%{_libdir}/%{pname}-event/mod_cache_disk.so +%{_libdir}/%{pname}-event/mod_cache_socache.so +%{_libdir}/%{pname}-event/mod_case_filter.so +%{_libdir}/%{pname}-event/mod_case_filter_in.so +%{_libdir}/%{pname}-event/mod_cgid.so +%{_libdir}/%{pname}-event/mod_charset_lite.so +%{_libdir}/%{pname}-event/mod_data.so +%{_libdir}/%{pname}-event/mod_dav.so +%{_libdir}/%{pname}-event/mod_dav_fs.so +%{_libdir}/%{pname}-event/mod_dav_lock.so +%{_libdir}/%{pname}-event/mod_dbd.so +%{_libdir}/%{pname}-event/mod_deflate.so +%{_libdir}/%{pname}-event/mod_dialup.so +%{_libdir}/%{pname}-event/mod_dir.so +%{_libdir}/%{pname}-event/mod_dumpio.so +%{_libdir}/%{pname}-event/mod_echo.so +%{_libdir}/%{pname}-event/mod_env.so +%{_libdir}/%{pname}-event/mod_expires.so +%{_libdir}/%{pname}-event/mod_ext_filter.so +%{_libdir}/%{pname}-event/mod_file_cache.so +%{_libdir}/%{pname}-event/mod_filter.so +%{_libdir}/%{pname}-event/mod_headers.so +%{_libdir}/%{pname}-event/mod_heartmonitor.so +%{_libdir}/%{pname}-event/mod_imagemap.so +%{_libdir}/%{pname}-event/mod_include.so +%{_libdir}/%{pname}-event/mod_info.so +%{_libdir}/%{pname}-event/mod_lbmethod_bybusyness.so +%{_libdir}/%{pname}-event/mod_lbmethod_byrequests.so +%{_libdir}/%{pname}-event/mod_lbmethod_bytraffic.so +%{_libdir}/%{pname}-event/mod_lbmethod_heartbeat.so +%{_libdir}/%{pname}-event/mod_ldap.so +%{_libdir}/%{pname}-event/mod_log_config.so +%{_libdir}/%{pname}-event/mod_log_debug.so +%{_libdir}/%{pname}-event/mod_log_forensic.so +%{_libdir}/%{pname}-event/mod_logio.so +%{_libdir}/%{pname}-event/mod_lua.so +%{_libdir}/%{pname}-event/mod_macro.so +%{_libdir}/%{pname}-event/mod_mime.so +%{_libdir}/%{pname}-event/mod_mime_magic.so +%{_libdir}/%{pname}-event/mod_negotiation.so +%{_libdir}/%{pname}-event/mod_optional_fn_export.so +%{_libdir}/%{pname}-event/mod_optional_fn_import.so +%{_libdir}/%{pname}-event/mod_optional_hook_export.so +%{_libdir}/%{pname}-event/mod_optional_hook_import.so +%{_libdir}/%{pname}-event/mod_proxy.so +%{_libdir}/%{pname}-event/mod_proxy_ajp.so +%{_libdir}/%{pname}-event/mod_proxy_balancer.so +%{_libdir}/%{pname}-event/mod_proxy_connect.so +%{_libdir}/%{pname}-event/mod_proxy_express.so +%{_libdir}/%{pname}-event/mod_proxy_fcgi.so +%{_libdir}/%{pname}-event/mod_proxy_fdpass.so +%{_libdir}/%{pname}-event/mod_proxy_ftp.so +%{_libdir}/%{pname}-event/mod_proxy_html.so +%{_libdir}/%{pname}-event/mod_proxy_http.so +%{_libdir}/%{pname}-event/mod_proxy_scgi.so +%{_libdir}/%{pname}-event/mod_proxy_wstunnel.so +%{_libdir}/%{pname}-event/mod_ratelimit.so +%{_libdir}/%{pname}-event/mod_reflector.so +%{_libdir}/%{pname}-event/mod_remoteip.so +%{_libdir}/%{pname}-event/mod_reqtimeout.so +%{_libdir}/%{pname}-event/mod_request.so +%{_libdir}/%{pname}-event/mod_rewrite.so +%{_libdir}/%{pname}-event/mod_sed.so +%{_libdir}/%{pname}-event/mod_session.so +%{_libdir}/%{pname}-event/mod_session_cookie.so +%{_libdir}/%{pname}-event/mod_session_crypto.so +%{_libdir}/%{pname}-event/mod_session_dbd.so +%{_libdir}/%{pname}-event/mod_setenvif.so +%{_libdir}/%{pname}-event/mod_slotmem_plain.so +%{_libdir}/%{pname}-event/mod_slotmem_shm.so +%{_libdir}/%{pname}-event/mod_socache_dbm.so +%{_libdir}/%{pname}-event/mod_socache_memcache.so +%{_libdir}/%{pname}-event/mod_socache_shmcb.so +%{_libdir}/%{pname}-event/mod_speling.so +%{_libdir}/%{pname}-event/mod_ssl.so +%{_libdir}/%{pname}-event/mod_status.so +%{_libdir}/%{pname}-event/mod_substitute.so +%{_libdir}/%{pname}-event/mod_suexec.so +%{_libdir}/%{pname}-event/mod_unique_id.so +%{_libdir}/%{pname}-event/mod_userdir.so +%{_libdir}/%{pname}-event/mod_usertrack.so +%{_libdir}/%{pname}-event/mod_version.so +%{_libdir}/%{pname}-event/mod_vhost_alias.so +%{_libdir}/%{pname}-event/mod_watchdog.so +%{_libdir}/%{pname}-event/mod_xml2enc.so %endif %files devel -f filelist-devel