Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:geoip-database
User: [email protected]
Usertags: pu
Control: block -1 by 1141419

  * Revert to the last version before the license change.
    (Closes: #1134158)
  * Build depend on geoip with support for the old version restored.

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-20250401/debian/changelog 
geoip-database-20250401+really20191224/debian/changelog
--- geoip-database-20250401/debian/changelog    2025-04-01 11:00:50.000000000 
+0300
+++ geoip-database-20250401+really20191224/debian/changelog     2026-07-04 
12:02:05.000000000 +0300
@@ -1,3 +1,12 @@
+geoip-database (20250401+really20191224-0+deb13u1) trixie; urgency=medium
+
+  * Non-maintainer upload.
+  * Revert to the last version before the license change.
+    (Closes: #1134158)
+  * Build depend on geoip with support for the old version restored.
+
+ -- Adrian Bunk <[email protected]>  Sat, 04 Jul 2026 12:02:05 +0300
+
 geoip-database (20250401-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru geoip-database-20250401/debian/control 
geoip-database-20250401+really20191224/debian/control
--- geoip-database-20250401/debian/control      2025-04-01 11:00:50.000000000 
+0300
+++ geoip-database-20250401+really20191224/debian/control       2026-07-04 
12:02:05.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-11.2~),
+ libgeoip-dev (>= 1.6.12-11.2~)
 Rules-Requires-Root: no
 Standards-Version: 4.7.2
 
diff -Nru geoip-database-20250401/debian/create-orig.sh 
geoip-database-20250401+really20191224/debian/create-orig.sh
--- geoip-database-20250401/debian/create-orig.sh       2025-04-01 
11:00:50.000000000 +0300
+++ geoip-database-20250401+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-20250401/debian/geoip-database.install 
geoip-database-20250401+really20191224/debian/geoip-database.install
--- geoip-database-20250401/debian/geoip-database.install       2025-04-01 
11:00:50.000000000 +0300
+++ geoip-database-20250401+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-20250401/debian/rules 
geoip-database-20250401+really20191224/debian/rules
--- geoip-database-20250401/debian/rules        2025-04-01 11:00:50.000000000 
+0300
+++ geoip-database-20250401+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-20250401/debian/source/lintian-overrides 
geoip-database-20250401+really20191224/debian/source/lintian-overrides
--- geoip-database-20250401/debian/source/lintian-overrides     2025-04-01 
11:00:50.000000000 +0300
+++ geoip-database-20250401+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 *
diff -Nru geoip-database-20191224/debian/changelog 
geoip-database-20250401+really20191224/debian/changelog
--- geoip-database-20191224/debian/changelog    2020-11-19 15:56:58.000000000 
+0200
+++ geoip-database-20250401+really20191224/debian/changelog     2026-07-04 
12:02:05.000000000 +0300
@@ -1,3 +1,98 @@
+geoip-database (20250401+really20191224-0+deb13u1) trixie; urgency=medium
+
+  * Non-maintainer upload.
+  * Revert to the last version before the license change.
+    (Closes: #1134158)
+  * Build depend on geoip with support for the old version restored.
+
+ -- Adrian Bunk <[email protected]>  Sat, 04 Jul 2026 12:02:05 +0300
+
+geoip-database (20250401-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.7.2.
+
+ -- Patrick Matthäi <[email protected]>  Tue, 01 Apr 2025 10:00:50 +0200
+
+geoip-database (20250224-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.7.1.
+
+ -- Patrick Matthäi <[email protected]>  Mon, 24 Feb 2025 14:45:01 +0100
+
+geoip-database (20241014-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Also recommend libgeoip1t64.
+    Closes: #1078708
+
+ -- Patrick Matthäi <[email protected]>  Mon, 14 Oct 2024 16:26:14 +0200
+
+geoip-database (20240708-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.7.0.
+
+ -- Patrick Matthäi <[email protected]>  Mon, 08 Jul 2024 14:28:23 +0200
+
+geoip-database (20240403-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Patrick Matthäi <[email protected]>  Wed, 03 Apr 2024 10:58:27 +0200
+
+geoip-database (20240219-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Patrick Matthäi <[email protected]>  Mon, 19 Feb 2024 11:05:41 +0100
+
+geoip-database (20231212-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Patrick Matthäi <[email protected]>  Tue, 12 Dec 2023 15:40:43 +0100
+
+geoip-database (20231106-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Patrick Matthäi <[email protected]>  Mon, 06 Nov 2023 14:12:11 +0100
+
+geoip-database (20230704-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Patrick Matthäi <[email protected]>  Tue, 04 Jul 2023 15:23:46 +0200
+
+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-20250401+really20191224/debian/control
--- geoip-database-20191224/debian/control      2020-11-19 15:56:58.000000000 
+0200
+++ geoip-database-20250401+really20191224/debian/control       2026-07-04 
12:02:05.000000000 +0300
@@ -4,16 +4,16 @@
 Homepage: https://www.maxmind.com/
 Maintainer: Patrick Matthäi <[email protected]>
 Build-Depends: debhelper-compat (= 13),
- geoip-bin (>= 1.6.12-5~),
- libgeoip-dev (>= 1.6.12-5~)
+ geoip-bin (>= 1.6.12-11.2~),
+ libgeoip-dev (>= 1.6.12-11.2~)
 Rules-Requires-Root: no
-Standards-Version: 4.5.1
+Standards-Version: 4.7.2
 
 Package: geoip-database
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Recommends: libgeoip1
+Recommends: libgeoip1t64 | libgeoip1
 Description: IP lookup command line tools that use the GeoIP library (country 
database)
  GeoIP is a C library that enables the user to find the country that any
  IP address or hostname originates from. It uses a file based database.

Reply via email to