Package: release.debian.org
Severity: normal
Tags: bookworm
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:geoip-database
User: [email protected]
Usertags: pu
* Revert to the last version before the license change.
(Closes: #1134158)
This is not only a DFSG issue:
https://www.maxmind.com/en/geolite/eula
Destructions of GeoLite Database and GeoLite Data. From time to time, MaxMind
will release an updated version of the GeoLite Databases, and you agree to
promptly use the updated version of the GeoLite Databases. You shall cease use
of and destroy (i) any old versions of the Services within thirty (30) days
following the release of the updated GeoLite Databases; and (ii) all Services
immediately upon termination of the license under this Agreement. Upon request,
you shall provide MaxMind with written confirmation of such destruction.
debdiffs attached:
- debian/ diff against the version in trixie
- full diff against the version in bullseye (20191224-3)
diff -Nru geoip-database-20230203/debian/changelog
geoip-database-20230203+really20191224/debian/changelog
--- geoip-database-20230203/debian/changelog 2023-02-03 10:44:44.000000000
+0200
+++ geoip-database-20230203+really20191224/debian/changelog 2026-07-04
13:34:41.000000000 +0300
@@ -1,3 +1,11 @@
+geoip-database (20230203+really20191224-0+deb12u1) bookworm; urgency=medium
+
+ * Non-maintainer upload.
+ * Revert to the last version before the license change.
+ (Closes: #1134158)
+
+ -- Adrian Bunk <[email protected]> Sat, 04 Jul 2026 13:34:41 +0300
+
geoip-database (20230203-1) unstable; urgency=medium
* New upstream release.
diff -Nru geoip-database-20230203/debian/control
geoip-database-20230203+really20191224/debian/control
--- geoip-database-20230203/debian/control 2023-02-03 10:44:44.000000000
+0200
+++ geoip-database-20230203+really20191224/debian/control 2026-07-04
13:34:41.000000000 +0300
@@ -1,9 +1,11 @@
Source: geoip-database
Section: net
Priority: optional
-Homepage: https://mailfud.org/geoip-legacy/
+Homepage: https://www.maxmind.com/
Maintainer: Patrick Matthäi <[email protected]>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: debhelper-compat (= 13),
+ geoip-bin (>= 1.6.12-5~),
+ libgeoip-dev (>= 1.6.12-5~)
Rules-Requires-Root: no
Standards-Version: 4.6.2
diff -Nru geoip-database-20230203/debian/create-orig.sh
geoip-database-20230203+really20191224/debian/create-orig.sh
--- geoip-database-20230203/debian/create-orig.sh 2023-02-03
10:44:44.000000000 +0200
+++ geoip-database-20230203+really20191224/debian/create-orig.sh
1970-01-01 02:00:00.000000000 +0200
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-OLDDIR=$(pwd)
-TMPDIR=$(mktemp -d)
-DATE=$(date +'%Y%m%d')
-
-cd ${TMPDIR}
-
-wget https://mailfud.org/geoip-legacy/GeoIP.dat.gz
-wget https://mailfud.org/geoip-legacy/GeoIPv6.dat.gz
-gunzip GeoIP.dat.gz GeoIPv6.dat.gz
-
-mkdir ${TMPDIR}/geoip-database-${DATE}
-
-mv GeoIP.dat GeoIPv6.dat ${TMPDIR}/geoip-database-${DATE}/
-
-tar -cJf geoip-database_${DATE}.orig.tar.xz geoip-database-${DATE}
-mv geoip-database_${DATE}.orig.tar.xz
${OLDDIR}/../geoip-database_${DATE}.orig.tar.xz
-
-cd ${OLDDIR}
-rm -rf ${TMPDIR}
-
-echo "Saved tarball: ${OLDDIR}/../geoip-database_${DATE}.orig.tar.xz"
-
-exit 0
diff -Nru geoip-database-20230203/debian/geoip-database.install
geoip-database-20230203+really20191224/debian/geoip-database.install
--- geoip-database-20230203/debian/geoip-database.install 2023-02-03
10:44:44.000000000 +0200
+++ geoip-database-20230203+really20191224/debian/geoip-database.install
2020-11-19 15:56:58.000000000 +0200
@@ -1,2 +1,2 @@
-GeoIPv6.dat usr/share/GeoIP/
-GeoIP.dat usr/share/GeoIP/
+tmp/GeoIPv6.dat usr/share/GeoIP/
+tmp/GeoIP.dat usr/share/GeoIP/
diff -Nru geoip-database-20230203/debian/rules
geoip-database-20230203+really20191224/debian/rules
--- geoip-database-20230203/debian/rules 2023-02-03 10:44:44.000000000
+0200
+++ geoip-database-20230203+really20191224/debian/rules 2020-11-19
15:56:58.000000000 +0200
@@ -2,5 +2,35 @@
include /usr/share/dpkg/pkg-info.mk
+BUILD_DATE := $(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))
+
%:
dh $@
+
+override_dh_install:
+ mkdir -p $(CURDIR)/tmp/
+ # Convert the GeoLite2 database sources to the legacy source format.
+ cat $(CURDIR)/GeoLite2-Country-Blocks-IPv4.csv |
/usr/lib/geoip/geolite2-to-legacy-csv.sh \
+ /usr/share/geoip/countryInfo.txt >
$(CURDIR)/GeoIPCountryWhois.csv
+ cat $(CURDIR)/GeoLite2-Country-Blocks-IPv6.csv |
/usr/lib/geoip/geolite2-to-legacy-csv.sh \
+ /usr/share/geoip/countryInfo.txt > $(CURDIR)/v6.csv
+ # Building geoip v4 country database.
+ /usr/lib/geoip/geoip-generator -v -4 \
+ --info="$$(date -u +'GEO-106FREE %Y%m%d Build' -d
'$(BUILD_DATE)')" \
+ -o $(CURDIR)/tmp/GeoIP.dat GeoIPCountryWhois.csv
+ # Convert the v4 csv layout to the v6 one.
+ perl /usr/lib/geoip/v4-to-v6-layout.pl \
+ < GeoIPCountryWhois.csv \
+ > $(CURDIR)/tmp/v4_converted.csv
+ # Merge the converted v4 with the v6 database.
+ cat v6.csv $(CURDIR)/tmp/v4_converted.csv \
+ > $(CURDIR)/tmp/v4v6merged.csv
+ # Building geoip v6 country database.
+ /usr/lib/geoip/geoip-generator -v -6 \
+ --info="$$(date -u +'GEO-106FREE %Y%m%d Build' -d
'$(BUILD_DATE)')" \
+ -o $(CURDIR)/tmp/GeoIPv6.dat $(CURDIR)/tmp/v4v6merged.csv
+ dh_install
+
+override_dh_clean:
+ rm -rf $(CURDIR)/tmp/
+ dh_clean
diff -Nru geoip-database-20230203/debian/source/lintian-overrides
geoip-database-20230203+really20191224/debian/source/lintian-overrides
--- geoip-database-20230203/debian/source/lintian-overrides 2023-02-03
10:44:44.000000000 +0200
+++ geoip-database-20230203+really20191224/debian/source/lintian-overrides
2020-11-19 15:56:58.000000000 +0200
@@ -1,3 +1,2 @@
geoip-database source: debian-watch-file-is-missing
geoip-database source: upstream-metadata-file-is-missing
-geoip-database source: very-long-line-length-in-source-file *
diffstat for geoip-database-20191224 geoip-database-20230203+really20191224
changelog | 35 +++++++++++++++++++++++++++++++++++
control | 2 +-
2 files changed, 36 insertions(+), 1 deletion(-)
diff -Nru geoip-database-20191224/debian/changelog
geoip-database-20230203+really20191224/debian/changelog
--- geoip-database-20191224/debian/changelog 2020-11-19 15:56:58.000000000
+0200
+++ geoip-database-20230203+really20191224/debian/changelog 2026-07-04
13:34:41.000000000 +0300
@@ -1,3 +1,38 @@
+geoip-database (20230203+really20191224-0+deb12u1) bookworm; urgency=medium
+
+ * Non-maintainer upload.
+ * Revert to the last version before the license change.
+ (Closes: #1134158)
+
+ -- Adrian Bunk <[email protected]> Sat, 04 Jul 2026 13:34:41 +0300
+
+geoip-database (20230203-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Patrick Matthäi <[email protected]> Fri, 03 Feb 2023 09:44:44 +0100
+
+geoip-database (20230105-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump Standards-Version to 4.6.2.
+
+ -- Patrick Matthäi <[email protected]> Thu, 05 Jan 2023 16:36:03 +0100
+
+geoip-database (20221020-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Switch package source to mailfud.
+ Closes: #985457
+
+ -- Patrick Matthäi <[email protected]> Thu, 20 Oct 2022 15:43:17 +0200
+
+geoip-database (20191224-4) unstable; urgency=medium
+
+ * Bump Standards-Version to 4.6.1.
+
+ -- Patrick Matthäi <[email protected]> Wed, 14 Sep 2022 14:37:34 +0200
+
geoip-database (20191224-3) unstable; urgency=medium
* Adjust lintian overrides.
diff -Nru geoip-database-20191224/debian/control
geoip-database-20230203+really20191224/debian/control
--- geoip-database-20191224/debian/control 2020-11-19 15:56:58.000000000
+0200
+++ geoip-database-20230203+really20191224/debian/control 2026-07-04
13:34:41.000000000 +0300
@@ -7,7 +7,7 @@
geoip-bin (>= 1.6.12-5~),
libgeoip-dev (>= 1.6.12-5~)
Rules-Requires-Root: no
-Standards-Version: 4.5.1
+Standards-Version: 4.6.2
Package: geoip-database
Architecture: all
