From 26dd5061fc295006c05137e89bdea2f112cfd1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jerry=20Lundstr=C3=B6m?= Date: Mon, 28 Mar 2022 12:10:14 +0200 Subject: [PATCH] GeoIP - Phase out GeoIP (obsolete library) - Remove GeoIP from packages - Indicate MaxMindDB library should be used instead --- README.md | 2 +- debian/control | 2 +- rpm/dsc.spec | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 989cb8cf..93955077 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ General support and discussion: environment with autoconf, automake, libtool and pkgconfig. `dsc` has a non-optional dependency on the PCAP library and optional -dependency on the GeoIP library (for the `asn` and `country` indexer). +dependency on the MaxMindDB library (for the `asn` and `country` indexer). To install the dependencies under Debian/Ubuntu: ``` diff --git a/debian/control b/debian/control index cfb3d991..466b1c74 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Jerry Lundström Build-Depends: debhelper (>= 10), build-essential, automake, autoconf, - libpcap-dev, netbase, libgeoip-dev, pkg-config, libmaxminddb-dev, + libpcap-dev, netbase, pkg-config, libmaxminddb-dev, libdnswire-dev (>= 0.3.0), libuv1-dev, python3 (>= 3.5) Standards-Version: 3.9.4 Homepage: https://www.dns-oarc.net/oarc/data/dsc diff --git a/rpm/dsc.spec b/rpm/dsc.spec index ca2c9439..41bbc260 100644 --- a/rpm/dsc.spec +++ b/rpm/dsc.spec @@ -11,12 +11,7 @@ URL: https://www.dns-oarc.net/oarc/data/dsc Source0: https://www.dns-oarc.net/files/dsc/%{name}-%{version}.tar.gz?/%{name}_%{version}.orig.tar.gz BuildRequires: libpcap-devel -%if 0%{?suse_version} || 0%{?sle_version} BuildRequires: libmaxminddb-devel -%else -BuildRequires: GeoIP-devel -BuildRequires: libmaxminddb-devel -%endif BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool