commit: fa86d9cd1287fafdf6f69170b38cec62159ee6a2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Oct 17 12:22:10 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Oct 17 12:22:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa86d9cd
www-apache/mod_geoip2: Remove last-rited pkg Closes: https://bugs.gentoo.org/694608 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/package.mask | 1 - www-apache/mod_geoip2/Manifest | 1 - www-apache/mod_geoip2/files/30_mod_geoip2.conf | 5 --- .../files/mod_geoip2-1.2.7-httpd24.patch | 35 --------------------- www-apache/mod_geoip2/metadata.xml | 5 --- www-apache/mod_geoip2/mod_geoip2-1.2.7-r1.ebuild | 36 ---------------------- 6 files changed, 83 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index fa5b8e36aae..22124b1e93a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -453,7 +453,6 @@ sys-boot/systemrescuecd-x86-grub # Michał Górny <mgo...@gentoo.org> (2019-09-17) # Unmaintained EAPI 0 Apache modules + mod_access_dnsbl as a revdep. # Removal in 30 days. Bug #694608. -www-apache/mod_geoip2 www-apache/mod_macro www-apache/mod_umask diff --git a/www-apache/mod_geoip2/Manifest b/www-apache/mod_geoip2/Manifest deleted file mode 100644 index 1b9b24a2d8c..00000000000 --- a/www-apache/mod_geoip2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mod_geoip2_1.2.7.tar.gz 11983 BLAKE2B b7afdc5058b7771efb698519bff9cb432cb302a6ae51cf7ddb8fcd082fd3b292698100f27aab5ea21c06f151a894923c926cb638fd41821a686ef25c2bfc131e SHA512 0ce240c477115af08f7d6b41186c3ea1d29cf4c5c081eb6e55fff8d9b1fd3dcfefe95df544d30d3c2e6c941e72eb719a7d938cd9e3e55fad5a8722bfe112605e diff --git a/www-apache/mod_geoip2/files/30_mod_geoip2.conf b/www-apache/mod_geoip2/files/30_mod_geoip2.conf deleted file mode 100644 index 41206ad7ba0..00000000000 --- a/www-apache/mod_geoip2/files/30_mod_geoip2.conf +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index 563e35b1137..00000000000 --- a/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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 deleted file mode 100644 index 6f49eba8f49..00000000000 --- a/www-apache/mod_geoip2/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?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 deleted file mode 100644 index 52dc2b7ea04..00000000000 --- a/www-apache/mod_geoip2/mod_geoip2-1.2.7-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -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="~amd64 ~x86" -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" -}
