From 57af9d9ff7d68107c5319ce867272a23efb2ef4ef58288fd04c8f3c5db5c0f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Mon, 11 Jul 2016 05:47:27 +0000
Subject: [PATCH] Accepting request 406993 from home:elvigia:branches:Apache

- version 2.4.23
*  Fixes CVE-2016-4979 [bsc#987365]
* mod_proxy_hcheck was missing due to upstream bug.
* mod_proxy_fdpass needs explicit configure line now.
* Full list of changes:
  http://www-eu.apache.org/dist//httpd/CHANGES_2.4.23

OBS-URL: https://build.opensuse.org/request/show/406993
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=481
---
 apache2.changes      | 10 ++++++++++
 apache2.spec         |  6 +++++-
 httpd-2.4.20.tar.bz2 |  3 ---
 httpd-2.4.23.tar.bz2 |  3 +++
 4 files changed, 18 insertions(+), 4 deletions(-)
 delete mode 100644 httpd-2.4.20.tar.bz2
 create mode 100644 httpd-2.4.23.tar.bz2

diff --git a/apache2.changes b/apache2.changes
index 8781acf..26de242 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jul  6 16:16:57 UTC 2016 - crrodriguez@opensuse.org
+
+- version 2.4.23 
+*  Fixes CVE-2016-4979 [bsc#987365]
+* mod_proxy_hcheck was missing due to upstream bug.
+* mod_proxy_fdpass needs explicit configure line now.
+* Full list of changes:
+  http://www-eu.apache.org/dist//httpd/CHANGES_2.4.23
+
 -------------------------------------------------------------------
 Thu May 26 08:13:16 UTC 2016 - pgajdos@suse.com
 
diff --git a/apache2.spec b/apache2.spec
index d39a19a..d39f8dc 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -51,7 +51,7 @@
 %endif
 
 Name:           apache2
-Version:        2.4.20
+Version:        2.4.23
 Release:        0
 Summary:        The Apache Web Server Version 2.4
 License:        Apache-2.0
@@ -379,6 +379,7 @@ function configure {
 		--enable-proxy-connect \
 		--enable-proxy-ftp \
 		--enable-proxy-http \
+		--enable-proxy-fdpass \
 		--enable-cache \
 		--enable-disk-cache \
 		--enable-mem-cache \
@@ -916,6 +917,7 @@ mv %{buildroot}/%{sysconfdir}/original .
 %{_libdir}/%{name}-prefork/mod_proxy_fcgi.so
 %{_libdir}/%{name}-prefork/mod_proxy_fdpass.so
 %{_libdir}/%{name}-prefork/mod_proxy_ftp.so
+%{_libdir}/%{name}-prefork/mod_proxy_hcheck.so
 %{_libdir}/%{name}-prefork/mod_proxy_html.so
 %{_libdir}/%{name}-prefork/mod_proxy_http.so
 %{_libdir}/%{name}-prefork/mod_proxy_scgi.so
@@ -1040,6 +1042,7 @@ mv %{buildroot}/%{sysconfdir}/original .
 %{_libdir}/%{name}-worker/mod_proxy_fcgi.so
 %{_libdir}/%{name}-worker/mod_proxy_fdpass.so
 %{_libdir}/%{name}-worker/mod_proxy_ftp.so
+%{_libdir}/%{name}-worker/mod_proxy_hcheck.so
 %{_libdir}/%{name}-worker/mod_proxy_html.so
 %{_libdir}/%{name}-worker/mod_proxy_http.so
 %{_libdir}/%{name}-worker/mod_proxy_scgi.so
@@ -1164,6 +1167,7 @@ mv %{buildroot}/%{sysconfdir}/original .
 %{_libdir}/%{name}-event/mod_proxy_fcgi.so
 %{_libdir}/%{name}-event/mod_proxy_fdpass.so
 %{_libdir}/%{name}-event/mod_proxy_ftp.so
+%{_libdir}/%{name}-event/mod_proxy_hcheck.so
 %{_libdir}/%{name}-event/mod_proxy_html.so
 %{_libdir}/%{name}-event/mod_proxy_http.so
 %{_libdir}/%{name}-event/mod_proxy_scgi.so
diff --git a/httpd-2.4.20.tar.bz2 b/httpd-2.4.20.tar.bz2
deleted file mode 100644
index 9699f6b..0000000
--- a/httpd-2.4.20.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da
-size 6331344
diff --git a/httpd-2.4.23.tar.bz2 b/httpd-2.4.23.tar.bz2
new file mode 100644
index 0000000..bc4062c
--- /dev/null
+++ b/httpd-2.4.23.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58
+size 6351875