Accepting request 184014 from home:elvigia:branches:Apache

- Update to version 2.4.6
*  SECURITY: CVE-2013-1896 (cve.mitre.org)
*  SECURITY: CVE-2013-2249 (cve.mitre.org)
*  Major updates to mod_lua
*  Support for proxying websocket requests
*  Higher performant shm-based cache implementation
*  Addition of mod_macro for easier configuration management
*  As well as several exciting fixes, especially those related to RFC edge
 cases in mod_cache and mod_proxy.
- IMPORTANT : With the current packaging scheme, we can no longer
Include the ITK MPM, therefore it has been disabled. This is because
this MPM can now only be provided as a loadable module but we do
not currently build MPMs as shared modules but as independant
binaries and all helpers/startup scripts depend on that behaviour.
It will be fixed in the upcoming weeks/months.

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

apache2.spec

@@ -54,7 +54,7 @@ BuildRequires:  expat-devel
 %{!?prefork:%define prefork 1}
 %{!?worker:%define worker 1}
 %{!?event:%define event 1}
-%{!?itk:%define itk 1}
+%{!?itk:%define itk 0}
 %define mpms_to_build	%(test %prefork = 1 && printf prefork) %(test %worker = 1 && printf worker) %(test %event = 1 && printf event) %(test %itk = 1 && printf itk)
 # dir names
 %define datadir		/srv/www
@@ -81,8 +81,8 @@ BuildRequires:  expat-devel
 # "Server:" header
 %define VENDOR SUSE
 %define platform_string	Linux/%VENDOR
-%define realver 2.4.4
-Version:        2.4.4
+%define realver 2.4.6
+Version:        2.4.6
 Release:        0
 #Source0:      http://www.apache.org/dist/httpd-%{version}.tar.bz2
 Source0:        httpd-%{realver}.tar.bz2
@@ -146,8 +146,6 @@ 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
-Patch100:       apache2.4-mpm-itk-2.4.2-01.patch
-Patch101:       httpd-2.2.19-linux3.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)
@@ -365,15 +363,13 @@ to administrators of web servers in general.
 #  
 %setup -q -n httpd-%{realver}
 %patch2 -p1
-%patch23
+%patch23 -p1
 #%patch65 -p1
-%patch66
+%patch66 -p1
 %patch67 -p1
 %patch68 -p1
 #%patch69
 %patch70 -p1
-%patch100 -p1
-%patch101
 #%patch108 -p1
 %patch109 -p1
 #