reinit the tree, so we can have metadata

5 files changed, 86 insertions, 0 deletions

diff --git a/www-apache/mod_geoip2/Manifest b/www-apache/mod_geoip2/Manifest
new file mode 100644
index 000000000000..2c68eb965356
--- /dev/null
+++ b/www-apache/mod_geoip2/Manifest
@@ -0,0 +1,7 @@
+AUX 30_mod_geoip2.conf 103 SHA256 d0932c23b2827d1600df6ddaf9729f36913497e47a7ba4ae545f910a07d89735 SHA512 64ca6e70fdcbcb30e85dc9c5b7f1561aa61b71e74afad2fd188cb52a5675a686bc7ec17dfd9c83fdd4830cd47752bf956234e6a0248aaa36ab2de530c3537e61 WHIRLPOOL cb7a222befb6a6ca20258a000029bd090fe6070d1eb41245b747fedc4ad6b5d6303c2bfdaf2903b13295e6ae000b00d11f2a07db620f4d2340a85f324282767f
+AUX mod_geoip2-1.2.7-httpd24.patch 980 SHA256 a4154641d7c4a364854d836d80ea77cd37fd272dd04a7041488643f255bcf01f SHA512 b4d9cdb333efa1ad57360fb02ba4537b63df0e93bea5517c4de956cad172eefd30ecb73e66cf35310181b8df4347e97f1939e24b9d9af236e8d87866718f3035 WHIRLPOOL d26f8e877771a0826676fc0b5e94a8227ef9298036d1c45fa1e401ebdd7136904aabf12d7233a76af2d1133bc3f493952f54026261d81a7e2184cb7736836a74
+DIST mod_geoip2_1.2.7.tar.gz 11983 SHA256 76e0512b282e6e2799f5d5616b9e26f448bee263f495ba31d1f72e3be9d0d5b6 SHA512 0ce240c477115af08f7d6b41186c3ea1d29cf4c5c081eb6e55fff8d9b1fd3dcfefe95df544d30d3c2e6c941e72eb719a7d938cd9e3e55fad5a8722bfe112605e WHIRLPOOL bc6466fe63e8e460a7b2a2806238ba3ab2379dce5451b88fea4fdd8fb121938d516ec4afc677e5784f0bc6572f292dfbc02e6410aa7ab4811d4ac4ce1d5d8be2
+EBUILD mod_geoip2-1.2.7-r1.ebuild 822 SHA256 484d3e7d044e44a0f5e3ce74150750ae246045dd356e51f4bd3d4013179dc43d SHA512 62b5b3f9dd82d9ef2b1dd04ea4b326670d76effebaa2cade94f53083f4b1b6eb5604d0c8cb439f10dc44e0b72bbb3337af1ae359dad2bb0ba7d5014c701f0ef5 WHIRLPOOL 12f402f64a90863148853274603a6cb04766e88e92f8e241e4591eba57ab0f6cddc8aef00677f8db7c78ff3f2b49705c4e041139552e242456c71552b76e3fb0
+MISC ChangeLog 2607 SHA256 0502c9389e51bc1e9070daed9e9992a67f54b3af17fe85bb85b1fda1417974e0 SHA512 a43b95a72d8a73acb031342f015dcb230492278d03e6d865179953de1b7efa99f3ab3f8e0d486981ad980168a1c0992ad1bbf648917a88a4790f9b38e27fbc9f WHIRLPOOL 8dcfcceb96834021787c257c406ea9bdf80c79023276b0fdf91e056b273f75f99e5bdd92744e860f8b084204b9da902e21ef6c07bdcbbf1a1d1a7ac9a83c040c
+MISC ChangeLog-2015 997 SHA256 93acdd0d5071d80a12761dbaa83e8167d0e139a28670d506420dba44b3bc9c8f SHA512 a2f58e17fa7ad75c0d3fff645c4547bab443f8f1ac521ac8819cc7ebe17f2f981d99e0edbbc223541c617bdf851c8eb06d998dfd48c49b477b305abe1fcf840d WHIRLPOOL e08f6ab893ed3cadf46d5a17422b397fbff67a3ef54720b030017ae1e9bc67a73e23dc3d79bf54e42ee3d525784db12c7b54aed8af4d6d3110fdb0fb6cf60228
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_geoip2/files/30_mod_geoip2.conf b/www-apache/mod_geoip2/files/30_mod_geoip2.conf
new file mode 100644
index 000000000000..41206ad7ba0a
--- /dev/null
+++ b/www-apache/mod_geoip2/files/30_mod_geoip2.conf
@@ -0,0 +1,5 @@
+<IfDefine GEOIP>
+LoadModule geoip_module modules/mod_geoip.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch b/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch
new file mode 100644
index 000000000000..563e35b1137e
--- /dev/null
+++ b/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch
@@ -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);
diff --git a/www-apache/mod_geoip2/metadata.xml b/www-apache/mod_geoip2/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_geoip2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_geoip2/mod_geoip2-1.2.7-r1.ebuild b/www-apache/mod_geoip2/mod_geoip2-1.2.7-r1.ebuild
new file mode 100644
index 000000000000..cde3422fef2e
--- /dev/null
+++ b/www-apache/mod_geoip2/mod_geoip2-1.2.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module eutils
+
+MY_P="${PN}_${PV}"
+MY_PN="${PN/2}"
+
+DESCRIPTION="geoip module gets the country and city a request originated from"
+HOMEPAGE="http://www.maxmind.com/app/mod_geoip"
+SRC_URI="http://geolite.maxmind.com/download/geoip/api/mod_geoip2/${MY_P}.tar.gz"
+LICENSE="Apache-1.1"
+
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+SLOT="0"
+
+DEPEND=">=dev-libs/geoip-1.4.8"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# See apache-module.eclass for more information.
+APACHE2_MOD_CONF="30_${PN}"
+APACHE2_MOD_FILE="${S}/.libs/${MY_PN}.so"
+APXS2_ARGS="-l GeoIP -c ${MY_PN}.c"
+DOCFILES="INSTALL README README.php Changes"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/${P}-httpd24.patch"
+}