[wso2-wsf-cpp/private-rawhide: 1/2] - Added patch for 2.4 httpd API change - Added httpd-mmn fixups

[Peter MacKinnon]

commit fabf7df89ffad92484d5fbbce687c6f1c9d58188
Author: Peter MacKinnon <pmackinn at redhat.com>
Date:   Tue Jul 10 14:16:06 2012 -0400

    - Added patch for 2.4 httpd API change
    - Added httpd-mmn fixups

 2.4_client_ip_API_change.patch |   16 ++++++++++++++++
 wso2-wsf-cpp.spec              |   13 ++++++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/2.4_client_ip_API_change.patch b/2.4_client_ip_API_change.patch
new file mode 100644
index 0000000..a6d0a6f
--- /dev/null
+++ b/2.4_client_ip_API_change.patch
@@ -0,0 +1,16 @@
+diff --git a/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c b/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c
+index dac9c4e..e92fca6 100644
+--- a/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c
++++ b/wsf_c/axis2c/src/core/transport/http/server/apache2/apache2_worker.c
+@@ -266,7 +266,11 @@ axis2_apache2_worker_process_request(
+     out_stream = axutil_stream_create_basic(env);
+     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Client HTTP version %s", http_version);
+ 
++    #if defined(AP_SERVER_MINORVERSION_NUMBER >= 2) && defined(AP_SERVER_MINORVERSION_NUMBER > 2)
++    peer_ip = request->connection->client_ip;
++    #else
+     peer_ip = request->connection->remote_ip;
++    #endif
+ 
+     if(peer_ip)
+     {
diff --git a/wso2-wsf-cpp.spec b/wso2-wsf-cpp.spec
index 0f435c7..67f2a80 100644
--- a/wso2-wsf-cpp.spec
+++ b/wso2-wsf-cpp.spec
@@ -1,3 +1,4 @@
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
 %global pkg_name wso2-wsf-cpp
 %global axis_name wso2-axis2
 %global pkg_ver 2.1.0
@@ -24,7 +25,7 @@
 Name: %{pkg_name}
 Summary: WSO2 Web Services Framework for C++
 Version: %{pkg_ver}
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: Development/Tools
 License: ASL 2.0
 URL: http://wso2.org/library/wsf/cpp
@@ -55,6 +56,9 @@ Patch4: prevent_free_of_static_chars.patch
 # Remove exit(0) calls in Environment.cpp for rpmlint
 # https://bugzilla.redhat.com/show_bug.cgi?id=741306
 Patch5: remove_exit0_calls_for_rpmlint.patch
+# 2.4 client_ip API change
+# https://bugzilla.redhat.com/show_bug.cgi?id=833173
+Patch6: 2.4_client_ip_API_change.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: openssl-devel
 BuildRequires: httpd-devel
@@ -165,6 +169,7 @@ A Web Services client
 %endif
 
 %if %{package_http_module}
+Requires: httpd-mmn = %{_httpd_mmn}
 %package -n mod_%{axis_name}
 Summary: An Apache HTTPD module which adds axis2 support
 Group: System Environment/Daemons
@@ -477,6 +482,8 @@ chmod a-x wsf_c/wsclient/LICENSE
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %if %{build_sandesha2}
@@ -621,6 +628,10 @@ mv -f %{buildroot}/%{_includedir}/*.h %{buildroot}/%{_includedir}/%{pkg_name}
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jul 10 2012  Pete MacKinnon <pmackinn at redhat> - 2.1.0-9
+- Added patch for 2.4 httpd API change
+- Added httpd-mmn fixups
+
 * Tue Jul 10 2012  Pete MacKinnon <pmackinn at redhat> - 2.1.0-8
 - Added FORTIFY_SOURCE flag
 - Added patch to remove exit(0) calls in wsf shared libs