From d6753accc31fe5715597ee81543b58e244a7c3ee Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sun, 5 May 2013 19:49:04 +0200
Subject: [PATCH] - updated to 3.3.1 - build with apache 2.4

---
 apache-mod_authnz_external.spec    | 10 ++++++----
 mod_authnz_external-apache24.patch | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 mod_authnz_external-apache24.patch

diff --git a/apache-mod_authnz_external.spec b/apache-mod_authnz_external.spec
index 1843d80..edf86b3 100644
--- a/apache-mod_authnz_external.spec
+++ b/apache-mod_authnz_external.spec
@@ -12,12 +12,13 @@ Summary(pt.UTF-8):	Um módulo de autenticação de LDAP para o servidor Web Apac
 Summary(sl.UTF-8):	Osnovna avtentikacija za spletni strežnik Apache, z uporabo poljubnih lupinskih ukazov
 Summary(sv.UTF-8):	Grundläggande autentisering för webbservern Apache med valfria skalkommandon
 Name:		apache-mod_%{mod_name}
-Version:	3.2.5
-Release:	2
+Version:	3.3.1
+Release:	1
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://mod-auth-external.googlecode.com/files/mod_%{mod_name}-%{version}.tar.gz
-# Source0-md5:	ff1e12ac8b5fc72296334865e74805e0
+# Source0-md5:	4cb3f16ff85b62fbc2cc73bac406bb67
+Patch0:		mod_authnz_external-apache24.patch
 URL:		http://code.google.com/p/mod-auth-external/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.2
@@ -73,6 +74,7 @@ från ett godtyckligt angivet kommando.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
+%patch0 -p1
 
 %build
 %{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.la
@@ -98,6 +100,6 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc TODO AUTHENTICATORS CHANGES README INSTALL test mysql
+%doc TODO AUTHENTICATORS CHANGES README INSTALL test
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
diff --git a/mod_authnz_external-apache24.patch b/mod_authnz_external-apache24.patch
new file mode 100644
index 0000000..821a057
--- /dev/null
+++ b/mod_authnz_external-apache24.patch
@@ -0,0 +1,20 @@
+--- mod_authnz_external-3.3.1/mod_authnz_external.c.orig	2011-10-07 12:43:34.000000000 -0600
++++ mod_authnz_external-3.3.1/mod_authnz_external.c	2012-05-06 23:24:41.774553228 -0600
+@@ -443,8 +443,17 @@ static int exec_external(const char *ext
+ 	if (remote_host != NULL)
+ 	    child_env[i++]= apr_pstrcat(p, ENV_HOST"=", remote_host,NULL);
+ 
++#if ((AP_SERVER_MAJORVERSION_NUMBER == 2) \
++  && (AP_SERVER_MINORVERSION_NUMBER == 2))
+ 	if (c->remote_ip)
+ 	    child_env[i++]= apr_pstrcat(p, ENV_IP"=", c->remote_ip, NULL);
++#elif ((AP_SERVER_MAJORVERSION_NUMBER == 2) \
++  &&   (AP_SERVER_MINORVERSION_NUMBER == 4))
++	if (c->client_ip)
++	    child_env[i++]= apr_pstrcat(p, ENV_IP"=", c->client_ip, NULL);
++#else
++#error buildable only under APR 2.2 or 2.4
++#endif
+ 
+ 	if (r->uri)
+ 	    child_env[i++]= apr_pstrcat(p, ENV_URI"=", r->uri, NULL);
-- 
2.43.0