summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-12-27 19:38:03 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-12-27 19:38:03 +0000
commit63a493b8a66fa1b0f24446c835452fb2fa26df33 (patch)
tree1184056c380b22e858967eceaa5de54d79336d3c
parentMerging upstream version 2.5.0. (diff)
downloadgeoipupdate-63a493b8a66fa1b0f24446c835452fb2fa26df33.zip
geoipupdate-63a493b8a66fa1b0f24446c835452fb2fa26df33.tar.xz
Merging debian version 2.5.0-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/GeoIP.conf25
-rw-r--r--debian/changelog18
-rw-r--r--debian/control12
-rw-r--r--debian/copyright2
-rw-r--r--debian/cron.d9
-rw-r--r--debian/gbp.conf4
-rw-r--r--debian/install1
-rwxr-xr-xdebian/rules1
8 files changed, 62 insertions, 10 deletions
diff --git a/debian/GeoIP.conf b/debian/GeoIP.conf
new file mode 100644
index 0000000..852d9e4
--- /dev/null
+++ b/debian/GeoIP.conf
@@ -0,0 +1,25 @@
+# Please see http://dev.maxmind.com/geoip/geoipupdate/ for instructions
+# on setting up geoipupdate, including information on how to download a
+# pre-filled GeoIP.conf, if you are a MaxMind subscriber.
+#
+# You can also have a look at GeoIP.conf(5) ("man GeoIP.conf") for a
+# comprehensive list of configuration options.
+
+# Enter your account ID and license key below. These are available from
+# https://www.maxmind.com/en/my_license_key. If you are only using free
+# GeoLite databases, you may leave the 0 values.
+AccountID 0
+LicenseKey 000000000000
+
+# Enter the edition IDs of the databases you would like to update.
+# Multiple edition IDs are separated by spaces.
+#
+# Include one or more of the following edition IDs:
+# * GeoLite2-City - GeoLite 2 City
+# * GeoLite2-Country - GeoLite2 Country
+# * GeoLite-Legacy-IPv6-City - GeoLite Legacy IPv6 City
+# * GeoLite-Legacy-IPv6-Country - GeoLite Legacy IPv6 Country
+# * 506 - GeoLite Legacy Country
+# * 517 - GeoLite Legacy ASN
+# * 533 - GeoLite Legacy City
+EditionIDs GeoLite2-Country GeoLite2-City
diff --git a/debian/changelog b/debian/changelog
index b637473..989c7df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+geoipupdate (2.5.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Adjust the long description to mention that this package can be used for
+ the free GeoLite editions.
+ * Ship a default /etc/GeoIP.conf, with GeoLite2 databases enabled and
+ references to GeoLite Legacy databases.
+ * Ship a default /etc/cron.d/geoipupdate that runs geoiupdate on a weekly
+ basis.
+ * Stop shipping an empty /usr/share/GeoIP, as that path is not used by this
+ package. This was introduced erroneously by upstream in 2.4.0.
+ * Remove Breaks/Conflicts with a pre-jessie version of geoip-bin (1.6.1-1).
+ * Bump Standards-Version to 4.1.2, no changes needed.
+ * Remove bin/base64.{c,h} from debian/copyright, not included with upstream
+ anymore.
+
+ -- Faidon Liambotis <paravoid@debian.org> Wed, 27 Dec 2017 05:59:43 +0200
+
geoipupdate (2.4.0-1~dschinn1) dschinn-backports; urgency=medium
* Initial upload to dschinn-backports.
diff --git a/debian/control b/debian/control
index 6d8fe2d..5133e91 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Bugs: mailto:maintainers@lists.progress-linux.org
Build-Depends: debhelper (>= 10),
zlib1g-dev,
libcurl4-gnutls-dev
-Standards-Version: 4.0.0
+Standards-Version: 4.1.2
Homepage: http://dev.maxmind.com/geoip/geoipupdate/
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/geoipupdate
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/geoipupdate
@@ -18,11 +18,9 @@ XSBC-Original-Vcs-Git: https://anonscm.debian.org/git/collab-maint/geoipupdate.g
Package: geoipupdate
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: geoip-bin (<< 1.6.1-1)
-Replaces: geoip-bin (<< 1.6.1-1)
-Suggests: geoip-bin, mmdb-bin
+Suggests: mmdb-bin, geoip-bin
Description: MaxMind GeoIP/GeoIP2 database updates
The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP Legacy
- binary databases, as supplied by MaxMind. These are typically paid products;
- for the free GeoLite databases, the packages geoip-database or
- geoip-database-contrib can be installed instead.
+ binary databases, as supplied by MaxMind. These may be MaxMind's paid
+ products, or their GeoLite variants that are less accurate but freely
+ available to everyone without a subscription or registration.
diff --git a/debian/copyright b/debian/copyright
index 0ace33d..9d72a9d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Files: *
Copyright: 2013-2014 MaxMind, Inc.
License: GPL-2+
-Files: bin/base64.c bin/base64.h bin/md5.c bin/md5.h
+Files: bin/md5.c bin/md5.h
Copyright: 1995-2012 Free Software Foundation, Inc.
License: GPL-2+
diff --git a/debian/cron.d b/debian/cron.d
new file mode 100644
index 0000000..5d7dfda
--- /dev/null
+++ b/debian/cron.d
@@ -0,0 +1,9 @@
+# Regular cron job for the geoipupdate package, used to update GeoIP databases
+#
+# According to MaxMind: "The GeoIP2 and GeoIP Legacy Country and City databases
+# are updated every Tuesday. The GeoIP2 ISP, GeoIP Legacy ISP and Organization
+# databases are updated every one to two weeks. All other databases are updated
+# on the first Tuesday of each month."
+
+# m h dom mon dow user command
+47 6 * * 3 root test -x /usr/bin/geoipupdate && /usr/bin/geoipupdate
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 00b053e..8057989 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
-[buildpackage]
+[DEFAULT]
upstream-tree=tag
debian-branch=debian
upstream-tag = v%(version)s
no-create-orig = True
-prebuild = rm -f .travis.yml README.dev.md dev-bin/release.sh dev-bin/ppa-release.sh
+prebuild = rm -f .travis.yml .clang-format README.dev.md dev-bin/*
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..dac758a
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+debian/GeoIP.conf etc/
diff --git a/debian/rules b/debian/rules
index 6c79c13..107abbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,3 +14,4 @@ override_dh_auto_install:
dh_auto_install
rm -rf debian/geoipupdate/etc
rm -f debian/geoipupdate/usr/share/doc/geoipupdate/*
+ rmdir debian/geoipupdate/usr/share/GeoIP