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-implicit-pointer-decl.patch

@@ -1,5 +1,5 @@
---- httpd-2.4.4.orig/server/request.c
+--- httpd-2.4.6.orig/server/request.c
-+++ httpd-2.4.4/server/request.c
++++ httpd-2.4.6/server/request.c
 @@ -46,10 +46,13 @@
  #include "util_script.h"
  #include "ap_expr.h"
@@ -15,8 +15,8 @@
  #if APR_HAVE_STDARG_H
  #include <stdarg.h>
  #endif
---- httpd-2.4.4.orig/server/config.c
+--- httpd-2.4.6.orig/server/config.c
-+++ httpd-2.4.4/server/config.c
++++ httpd-2.4.6/server/config.c
 @@ -48,10 +48,14 @@
  #include "http_request.h"  /* for default_handler (see invoke_handler) */
  #include "http_main.h"

apache2.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Jul 22 16:44:22 UTC 2013 - crrodriguez@opensuse.org
+
+- 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.
+
 -------------------------------------------------------------------
 Tue Jun 18 07:41:36 UTC 2013 - crrodriguez@opensuse.org
 

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
+%define realver 2.4.6
-Version:        2.4.4
+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
 #

httpd-2.0.54-envvars.dif

@@ -1,5 +1,5 @@
---- support/envvars-std.in.orig
+--- httpd-2.4.6.orig/support/envvars-std.in
-+++ support/envvars-std.in
++++ httpd-2.4.6/support/envvars-std.in
 @@ -18,11 +18,9 @@
  #
  # This file is generated from envvars-std.in

httpd-2.1.3alpha-layout.dif

@@ -1,6 +1,6 @@
---- httpd-2.1.3-alpha.orig/config.layout
+--- httpd-2.4.6.orig/config.layout
-+++ httpd-2.1.3-alpha/config.layout
++++ httpd-2.4.6/config.layout
-@@ -202,6 +202,54 @@
+@@ -178,6 +178,54 @@
      proxycachedir: /var/cache/httpd
  </Layout>
  

httpd-2.1.9-apachectl.dif

@@ -1,5 +1,5 @@
---- support/apachectl.in.orig
+--- httpd-2.4.6.orig/support/apachectl.in
-+++ support/apachectl.in
++++ httpd-2.4.6/support/apachectl.in
 @@ -42,17 +42,32 @@ ARGV="$@"
  # --------------------                              --------------------
  # 

httpd-2.2.0-apxs-a2enmod.dif

@@ -1,8 +1,6 @@
-Index: httpd-2.2.16/support/apxs.in
+--- httpd-2.4.6.orig/support/apxs.in
-===================================================================
++++ httpd-2.4.6/support/apxs.in
---- httpd-2.2.16.orig/support/apxs.in
+@@ -550,108 +550,14 @@ if ($opt_i or $opt_e) {
-+++ httpd-2.2.16/support/apxs.in
-@@ -526,108 +526,14 @@ if ($opt_i or $opt_e) {
  
      #   activate module via LoadModule/AddModule directive
      if ($opt_a or $opt_A) {

httpd-2.2.19-linux3.patch

@@ -1,17 +0,0 @@
---- configure.in.orig
-+++ configure.in
-@@ -274,13 +274,7 @@ case $host in
-       APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
-       ;;
-   *-linux-*)
--      case `uname -r` in
--        2.[[2-9]]* ) 
--            APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
--            ;;
--        * )
--            ;;
--      esac
-+			APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
-       ;;
-   *486-*-bsdi* | *-netbsd* | *-freebsd* | *-apple-darwin* | *-dec-osf* | *-qnx)
-       APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])

httpd-2.4.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c
-size 4780289

httpd-2.4.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea
+size 4949897

httpd-2.x.x-logresolve.patch

@@ -1,7 +1,6 @@
-diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl.in
+--- httpd-2.4.6.orig/support/logresolve.pl.in
---- ../httpd-2.2.4.orig/support/logresolve.pl.in	2006-07-12 05:38:44.000000000 +0200
++++ httpd-2.4.6/support/logresolve.pl.in
-+++ ./support/logresolve.pl.in	2007-10-23 13:59:27.000000000 +0200
+@@ -57,6 +57,7 @@ $|=1;
-@@ -57,6 +57,7 @@
  
  use FileHandle;
  use Socket;
@@ -9,7 +8,7 @@ diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl.
  
  use strict;
  no strict 'refs';
-@@ -71,11 +72,13 @@
+@@ -71,11 +72,13 @@ my $filename;
  my %hash = ();
  my $parent = $$;
  
@@ -24,7 +23,7 @@ diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl.
  		if (-e $filename) { unlink($filename) || warn "$filename .. $!\n";}
  		&child($child);
  		exit(0);
-@@ -91,9 +94,9 @@
+@@ -91,9 +94,9 @@ sub cleanup {
  	 # die kiddies, die
  	kill(15, @children);
  	for (my $child = 1; $child <=$CHILDREN; $child++) {
@@ -37,7 +36,7 @@ diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl.
  		}
  	}
  }
-@@ -113,7 +116,7 @@
+@@ -113,7 +116,7 @@ sub parent {
  		if (!socket($CHILDSOCK{$child}, AF_UNIX, SOCK_STREAM, $PROTOCOL)) {
  			warn "parent socket to child failed $!";
  		}
@@ -46,7 +45,7 @@ diff -Naur ../httpd-2.2.4.orig/support/logresolve.pl.in ./support/logresolve.pl.
  		my $response;
  		do {
  			$response = connect($CHILDSOCK{$child}, sockaddr_un($filename));
-@@ -176,7 +179,7 @@
+@@ -176,7 +179,7 @@ sub child {
  	 # create a socket to communicate with parent
  	socket(INBOUND, AF_UNIX, SOCK_STREAM, $PROTOCOL)
  		|| die "Error with Socket: !$\n";