Attachment 575288 Details for Bug 809698 – better patch

[patch] better patch

0001-Fix-compilation-with-httpd-2.4.patch (text/plain), 3.87 KB, created by Jan Kaluža on 2012-04-05 06:08:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kaluža

Created: 2012-04-05 06:08:11 UTC

Size: 3.87 KB

patch

obsolete

>From d7165b5c6a20c04d3c69923d03a63ba47cc99d7c Mon Sep 17 00:00:00 2001
>From: Jan Kaluza <hanzz.k@gmail.com>
>Date: Thu, 5 Apr 2012 07:00:32 +0200
>Subject: [PATCH] Fix compilation with httpd-2.4
>
>---
> mod_geoip-httpd24.patch |   30 ++++++++++++++++++++++++++++++
> mod_geoip.spec          |   20 +++++++++++++++++---
> 2 files changed, 47 insertions(+), 3 deletions(-)
> create mode 100644 mod_geoip-httpd24.patch
>
>diff --git a/mod_geoip-httpd24.patch b/mod_geoip-httpd24.patch
>new file mode 100644
>index 0000000..5c88d3f
>--- /dev/null
>+++ b/mod_geoip-httpd24.patch
>@@ -0,0 +1,30 @@
>+diff --git a/mod_geoip.c b/mod_geoip.c
>+index f34a292..434e994 100644
>+--- a/mod_geoip.c
>++++ b/mod_geoip.c
>+@@ -66,6 +66,7 @@
>+ #include "http_config.h"
>+ #include "http_protocol.h"
>+ #include "http_log.h"
>++#include "util_script.h"
>+ #include "ap_config.h"
>+ #include "apr_strings.h"
>+ #include <GeoIP.h>
>+@@ -320,7 +321,7 @@ geoip_header_parser(request_rec * r)
>+ 		return DECLINED;
>+ 
>+ 	if (!cfg->scanProxyHeaders) {
>+-		ipaddr = r->connection->remote_ip;
>++		ipaddr = r->useragent_ip;
>+ 	}
>+ 	else {
>+ 		ap_add_common_vars(r);
>+@@ -338,7 +339,7 @@ geoip_header_parser(request_rec * r)
>+ 		}
>+ 		if (!ipaddr_ptr) {
>+ 			ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, "[mod_geoip]: Error while getting ipaddr from proxy headers. Using REMOTE_ADDR.");
>+-			ipaddr = r->connection->remote_ip;
>++			ipaddr = r->useragent_ip;
>+ 		}
>+ 		else {
>+ 			ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, "[mod_geoip]: IPADDR_PTR: %s", ipaddr_ptr);
>diff --git a/mod_geoip.spec b/mod_geoip.spec
>index e3ed349..f67af8c 100644
>--- a/mod_geoip.spec
>+++ b/mod_geoip.spec
>@@ -1,7 +1,10 @@
>+%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
>+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
>+
> Summary: GeoIP module for the Apache HTTP Server
> Name: mod_geoip
> Version: 1.2.5
>-Release: 6%{?dist}
>+Release: 7%{?dist}
> License: ASL 1.1
> Group: System Environment/Daemons
> URL: http://www.maxmind.com/app/mod_geoip
>@@ -9,6 +12,8 @@ Source: http://www.maxmind.com/download/geoip/api/mod_geoip2/mod_geoip2_%{versio
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> Requires: GeoIP httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
> BuildRequires: httpd-devel GeoIP-devel
>+# Not upstream
>+Patch0: mod_geoip-httpd24.patch
> 
> %description
> mod_geoip is an Apache module for finding the country that a web request
>@@ -18,17 +23,22 @@ the lookup.  It is free software, licensed under the Apache license.
> %prep
> 
> %setup -q -n mod_geoip2_%{version}
>+%patch0 -p1 -b .geoip
> 
> %build
>-/usr/sbin/apxs -Wc,"%{optflags}" -Wl,"-lGeoIP" -c mod_geoip.c
>+%{_httpd_apxs} -Wc,"%{optflags}" -Wl,"-lGeoIP" -c mod_geoip.c
> 
> %install
> mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
>+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.modules.d/
> install -Dp .libs/mod_geoip.so %{buildroot}%{_libdir}/httpd/modules/mod_geoip.so
> 
>-cat << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
>+cat << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.modules.d/02-mod_geoip.conf
> LoadModule geoip_module modules/mod_geoip.so
> 
>+EOF
>+
>+cat << EOF > %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_geoip.conf
> <IfModule mod_geoip.c>
>   GeoIPEnable On
>   GeoIPDBFile /usr/share/GeoIP/GeoIP.dat
>@@ -44,8 +54,12 @@ rm -rf %{buildroot}
> %doc INSTALL README* Changes
> %{_libdir}/httpd/modules/mod_geoip.so
> %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf
>+%config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/02-mod_geoip.conf
> 
> %changelog
>+* Wed Apr 04 2012 Jan Kaluza <jkaluza@redhat.com> - 1.2.5-7
>+- Fix compilation error with httpd-2.4
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.5-6
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 809698: 575038 | 575044 | 575288