[httpd/f17: 1/2] update to 2.2.23

[Jan Kaluža]

commit c8f9afe38da042ba968f1dae4c3e09b4747c13fe
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Tue Jan 29 13:01:44 2013 +0100

    update to 2.2.23

 .gitignore                 |    1 +
 httpd-2.1.10-pod.patch     |   18 ++++++++++--------
 httpd-2.2.22-pcre830.patch |   24 ------------------------
 httpd.spec                 |   12 ++++++++----
 sources                    |    2 +-
 5 files changed, 20 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c79cf2f..9cf92b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ x86_64
 /httpd-2.2.21.tar.bz2
 /clog
 /httpd-2.2.22.tar.bz2
+/httpd-2.2.23.tar.bz2
diff --git a/httpd-2.1.10-pod.patch b/httpd-2.1.10-pod.patch
index 8d522dc..0cddabc 100644
--- a/httpd-2.1.10-pod.patch
+++ b/httpd-2.1.10-pod.patch
@@ -9,9 +9,11 @@ Upstream-Status: not submitted, ugly hack which only makes a difference
 		to the default configuration used in Fedora.  Need to find
 		a way to do this properly.
 
---- httpd-2.1.10/server/mpm_common.c.pod
-+++ httpd-2.1.10/server/mpm_common.c
-@@ -583,6 +584,7 @@
+diff --git a/server/mpm_common.c b/server/mpm_common.c
+index eb59407..36e318e 100644
+--- a/server/mpm_common.c
++++ b/server/mpm_common.c
+@@ -648,6 +648,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
      apr_socket_t *sock;
      apr_pool_t *p;
      apr_size_t len;
@@ -19,7 +21,7 @@ Upstream-Status: not submitted, ugly hack which only makes a difference
  
      /* create a temporary pool for the socket.  pconf stays around too long */
      rv = apr_pool_create(&p, pod->p);
-@@ -590,8 +592,11 @@
+@@ -655,8 +656,11 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
          return rv;
      }
  
@@ -33,7 +35,7 @@ Upstream-Status: not submitted, ugly hack which only makes a difference
      if (rv != APR_SUCCESS) {
          ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
                       "get socket to connect to listener");
-@@ -614,7 +619,7 @@
+@@ -679,7 +683,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
          return rv;
      }
  
@@ -42,12 +44,12 @@ Upstream-Status: not submitted, ugly hack which only makes a difference
      if (rv != APR_SUCCESS) {
          int log_level = APLOG_WARNING;
  
-@@ -627,7 +632,7 @@
+@@ -692,7 +696,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
          }
  
          ap_log_error(APLOG_MARK, log_level, rv, ap_server_conf,
 -                     "connect to listener on %pI", ap_listeners->bind_addr);
 +                     "connect to listener on %pI", lr->bind_addr);
+         apr_pool_destroy(p);
+         return rv;
      }
- 
-     /* Create the request string. We include a User-Agent so that
diff --git a/httpd.spec b/httpd.spec
index 4c3a853..7fe19a4 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,8 +8,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.22
-Release: 2%{?dist}
+Version: 2.2.23
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -31,7 +31,6 @@ Patch2: httpd-2.1.10-apxs.patch
 Patch3: httpd-2.2.9-deplibs.patch
 Patch4: httpd-2.1.10-disablemods.patch
 Patch5: httpd-2.1.10-layout.patch
-Patch6: httpd-2.2.22-pcre830.patch
 # Features/functional changes
 Patch20: httpd-2.0.48-release.patch
 Patch22: httpd-2.1.10-pod.patch
@@ -120,7 +119,6 @@ Security (TLS) protocols.
 %patch3 -p1 -b .deplibs
 %patch4 -p1 -b .disablemods
 %patch5 -p1 -b .layout
-%patch6 -p1 -b .pcre830
 
 %patch22 -p1 -b .pod
 %patch23 -p1 -b .export
@@ -365,6 +363,9 @@ rm -rf $RPM_BUILD_ROOT/etc/httpd/conf/{original,extra}
 # Make suexec a+rw so it can be stripped.  %%files lists real permissions
 chmod 755 $RPM_BUILD_ROOT%{_sbindir}/suexec
 
+# rename apxs.8 to apxs.1
+mv $RPM_BUILD_ROOT%{_mandir}/man8/apxs.8 $RPM_BUILD_ROOT%{_mandir}/man1/apxs.1
+
 %pre
 # Add the "apache" user
 /usr/sbin/useradd -c "Apache" -u 48 \
@@ -536,6 +537,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Tue Jan 29 2013 Jan Kaluza <jkaluza at redhat.com> - 2.2.23-1
+- update to 2.2.23
+
 * Mon Feb 13 2012 Joe Orton <jorton at redhat.com> - 2.2.22-2
 - fix build against PCRE 8.30
 
diff --git a/sources b/sources
index c130096..c2a86e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fe3093194c8a57f085ff7c3fc43715f  httpd-2.2.22.tar.bz2
+ca133de0e4b4b15316990a97186b9993  httpd-2.2.23.tar.bz2