[gentoo-commits] repo/gentoo:master commit in: dev-libs/geoip/files/, dev-libs/geoip/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/geoip/files/, dev-libs/geoip/

[Jeroen Roovers]

commit:     c2eb07e857fbd9518a700102af769933d1929dc9
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  8 08:49:58 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Apr  8 08:49:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2eb07e8

dev-libs/geoip: Old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/geoip/files/geoipupdate-r5.sh | 46 ------------------------------
 dev-libs/geoip/geoip-1.6.9.ebuild      | 51 ----------------------------------
 2 files changed, 97 deletions(-)

diff --git a/dev-libs/geoip/files/geoipupdate-r5.sh b/dev-libs/geoip/files/geoipupdate-r5.sh
deleted file mode 100644
index 484ff7e2227..00000000000
--- a/dev-libs/geoip/files/geoipupdate-r5.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-GEOIP_MIRROR="https://geolite.maxmind.com/download/geoip/database"
-GEOIPDIR=@PREFIX@/usr/share/GeoIP
-TMPDIR=
-
-DATABASES="
-	GeoIPv6
-	GeoLiteCity
-	GeoLiteCityv6-beta/GeoLiteCityv6
-	GeoLiteCountry/GeoIP
-	asnum/GeoIPASNum
-	asnum/GeoIPASNumv6
-"
-
-if [ "${1}" = -f ] || [ "${1}" = --force ]; then
-	force=true
-fi
-
-if [ -d "${GEOIPDIR}" ]; then
-	cd $GEOIPDIR
-	if [ -n "${DATABASES}" ]; then
-		TMPDIR=$(mktemp -d geoipupdate.XXXXXXXXXX)
-
-		echo "Updating GeoIP databases..."
-
-		for db in $DATABASES; do
-			fname=$(basename $db)
-
-			if [ -f "${GEOIPDIR}/${fname}.dat" ] || [ ${force} ]; then
-				wget --no-verbose -t 3 -T 60 \
-					"${GEOIP_MIRROR}/${db}.dat.gz" \
-					-O "${TMPDIR}/${fname}.dat.gz"
-				if [ $? -eq 0 ]; then
-					gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
-					mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
-					chmod 0644 "${GEOIPDIR}/${fname}.dat"
-					case ${fname} in
-						GeoLite*) ln -sf ${fname}.dat `echo ${fname} | sed 's/GeoLite/GeoIP/'`.dat ;;
-					esac
-				fi
-			fi
-		done
-		[ -d "${TMPDIR}" ] && rm -rf $TMPDIR
-	fi
-fi

diff --git a/dev-libs/geoip/geoip-1.6.9.ebuild b/dev-libs/geoip/geoip-1.6.9.ebuild
deleted file mode 100644
index bee59ac4f11..00000000000
--- a/dev-libs/geoip/geoip-1.6.9.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="GeoIP Legacy C API"
-HOMEPAGE="https://github.com/maxmind/geoip-api-c"
-SRC_URI="
-	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
-LICENSE="LGPL-2.1 GPL-2 MaxMind2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-RESTRICT="test"
-
-DEPEND="net-misc/wget"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-api-c-${PV}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-	sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r5.sh > geoipupdate.sh || die
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS.md README*
-
-	prune_libtool_files
-
-	keepdir /usr/share/GeoIP
-
-	dosbin geoipupdate.sh
-}
-
-pkg_postinst() {
-	ewarn "WARNING: Databases are no longer installed by this ebuild."
-	elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from"
-	elog "net-misc/geoipupdate) to populate ${ROOT}/usr/share/GeoIP/"
-	elog "with geo-located IP address databases."
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/geoip/files/, dev-libs/geoip/

[Sam James]

commit:     e257f3c300909b01309710582e8f09b3d638f864
Author:     Matt Smith <matt <AT> offtopica <DOT> uk>
AuthorDate: Tue May 18 13:55:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  8 02:03:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e257f3c3

dev-libs/geoip: Update geoipupdate.sh to use mirrors

The free databases provided by MaxMind are no longer available and so
the script doesn't work.  Switch to a different mirror.

Suggested-by: Alexander Berkes <office <AT> metasoft.at>
Closes: https://bugs.gentoo.org/674852
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Matt Smith <matt <AT> offtopica.uk>
Closes: https://github.com/gentoo/gentoo/pull/20869
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/geoip/files/geoipupdate-r7.sh | 46 +++++++++++++++++++++++++++++++
 dev-libs/geoip/geoip-1.6.12-r1.ebuild  | 50 ++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/dev-libs/geoip/files/geoipupdate-r7.sh b/dev-libs/geoip/files/geoipupdate-r7.sh
new file mode 100644
index 000000000000..67d26bdc2ed8
--- /dev/null
+++ b/dev-libs/geoip/files/geoipupdate-r7.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+GEOIP_MIRROR="https://mailfud.org/geoip-legacy/"
+GEOIPDIR=@PREFIX@/usr/share/GeoIP
+TMPDIR=
+
+DATABASES="
+        GeoIPv6
+        GeoIPCity
+        GeoIPCityv6
+        GeoIP
+        GeoIPASNum
+        GeoIPASNumv6
+"
+
+if [ "${1}" = -f ] || [ "${1}" = --force ]; then
+	force=true
+fi
+
+if [ -d "${GEOIPDIR}" ]; then
+	cd $GEOIPDIR
+	if [ -n "${DATABASES}" ]; then
+		TMPDIR=$(mktemp -d geoipupdate.XXXXXXXXXX)
+
+		echo "Updating GeoIP databases..."
+
+		for db in $DATABASES; do
+			fname=$(basename $db)
+
+			if [ -f "${GEOIPDIR}/${fname}.dat" ] || [ ${force} ]; then
+				wget --no-verbose -t 3 -T 60 \
+					"${GEOIP_MIRROR}/${db}.dat.gz" \
+					-O "${TMPDIR}/${fname}.dat.gz"
+				if [ $? -eq 0 ]; then
+					gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
+					mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
+					chmod 0644 "${GEOIPDIR}/${fname}.dat"
+					case ${fname} in
+						GeoLite*) ln -sf ${fname}.dat `echo ${fname} | sed 's/GeoLite/GeoIP/'`.dat ;;
+					esac
+				fi
+			fi
+		done
+		[ -d "${TMPDIR}" ] && rm -rf $TMPDIR
+	fi
+fi

diff --git a/dev-libs/geoip/geoip-1.6.12-r1.ebuild b/dev-libs/geoip/geoip-1.6.12-r1.ebuild
new file mode 100644
index 000000000000..fd7343e19b73
--- /dev/null
+++ b/dev-libs/geoip/geoip-1.6.12-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="GeoIP Legacy C API"
+HOMEPAGE="https://github.com/maxmind/geoip-api-c"
+SRC_URI="https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-api-c-${PV}"
+
+# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
+LICENSE="LGPL-2.1 GPL-2 MaxMind2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="net-misc/wget"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+	sed -e "s|@PREFIX@|${EPREFIX}|g" "${FILESDIR}"/geoipupdate-r7.sh > geoipupdate.sh || die
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS.md README*
+
+	find "${ED}" -name '*.la' -delete || die
+
+	keepdir /usr/share/GeoIP
+
+	dosbin geoipupdate.sh
+}
+
+pkg_postinst() {
+	ewarn "WARNING: Databases are no longer installed by this ebuild."
+	elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from"
+	elog "net-misc/geoipupdate) to populate ${EROOT}/usr/share/GeoIP/"
+	elog "with geo-located IP address databases."
+}