network/mod_geoip2: Updated for version 1.2.7.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Robby Workman 2012-09-18 17:52:55 -05:00
parent af4613b39d
commit fb4c28efe5
3 changed files with 43 additions and 5 deletions

View file

@ -0,0 +1,35 @@
--- mod_geoip.c.geoip
+++ 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,11 @@
return DECLINED;
if (!cfg->scanProxyHeaders) {
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+ ipaddr = r->useragent_ip;
+#else
ipaddr = r->connection->remote_ip;
+#endif
}
else {
ap_add_common_vars(r);
@@ -338,7 +343,11 @@
}
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;
+#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
+ ipaddr = r->useragent_ip;
+#else
+ ipaddr = r->connection->remote_ip;
+#endif
}
else {
ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, "[mod_geoip]: IPADDR_PTR: %s", ipaddr_ptr);

View file

@ -5,8 +5,8 @@
# Template written by Menno E. Duursma
PRGNAM=mod_geoip2
VERSION=1.2.5
BUILD=${BUILD:-3}
VERSION=${VERSION:-1.2.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@ -49,6 +49,9 @@ cd ${PRGNAM}_${VERSION}
chown -R root:root .
chmod -R a-s,u+w,go+r-w .
# http://pkgs.fedoraproject.org/cgit/mod_geoip.git/tree/mod_geoip-httpd24.patch
patch -p0 < $CWD/mod_geoip-httpd24.patch
# Create target dir
mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/httpd/modules

View file

@ -1,8 +1,8 @@
PRGNAM="mod_geoip2"
VERSION="1.2.5"
VERSION="1.2.7"
HOMEPAGE="http://www.maxmind.com/app/mod_geoip"
DOWNLOAD="http://geolite.maxmind.com/download/geoip/api/mod_geoip2/mod_geoip2_1.2.5.tar.gz"
MD5SUM="5d35c9a9cbf47c2cb636bed26cd5fa19"
DOWNLOAD="http://geolite.maxmind.com/download/geoip/api/mod_geoip2/mod_geoip2_1.2.7.tar.gz"
MD5SUM="76514ad0e8adb8cd8231c5e3646d03fd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="GeoIP"