Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Hello,
on the 14.10.2014 I have recieved patches from two contributors to support the
building of the GeoIP City and ASN database in a DFSG free way, which is realy
great!
Sadly I just had got time to adapt them from the beginning of the 27.10.2014,
where I
thought it is enough time. After I have uploaded the changes I were told, that
packages
in sid do not get a free-unblock-ack since jessie, fu I didn't get this
change..
Anyway I realy hope that we can make an exception here to include more DFSG
free (required)
geoip databases within jessie (an unblock request for geoip-database is after
that also
required).
$ diff -Naur 1.6.2-1/ 1.6.2-2/ --exclude=.svn | diffstat
changelog| 11
control |2
geoip-bin.install|1
geoip-bin.lintian-overrides |1
rules|2
src/geoip-asn-csv-to-dat.cpp | 889 ++
src/geoip-csv-to-dat.cpp | 1122 +--
7 files changed, 1786 insertions(+), 242 deletions(-)
diff -Naur '--exclude=.svn' 1.6.2-1/debian/changelog 1.6.2-2/debian/changelog
--- 1.6.2-1/debian/changelog2014-07-24 19:29:11.241627982 +0200
+++ 1.6.2-2/debian/changelog2014-10-27 19:31:48.626784609 +0100
@@ -1,3 +1,14 @@
+geoip (1.6.2-2) unstable; urgency=low
+
+ * Add patch for geoip-csv-to-dat to add support for building GeoIP city DB.
+Many thanks to Andrew Moise for contributing!
+ * Add and install geoip-generator-asn, which is able to build the ASN DB. It
+is a modified version from the original geoip-generator. Much thanks for
+contributing also to Aaron Gibson!
+ * Bump Standards-Version to 3.9.6 (no changes required).
+
+ -- Patrick Matthäi pmatth...@debian.org Mon, 27 Oct 2014 19:15:25 +0100
+
geoip (1.6.2-1) unstable; urgency=medium
* New upstream release.
diff -Naur '--exclude=.svn' 1.6.2-1/debian/control 1.6.2-2/debian/control
--- 1.6.2-1/debian/control 2014-07-24 19:29:11.245627903 +0200
+++ 1.6.2-2/debian/control 2014-10-27 19:31:48.626784609 +0100
@@ -9,7 +9,7 @@
autotools-dev,
dh-autoreconf,
libtool
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Package: libgeoip1
Section: libs
diff -Naur '--exclude=.svn' 1.6.2-1/debian/geoip-bin.install
1.6.2-2/debian/geoip-bin.install
--- 1.6.2-1/debian/geoip-bin.install2014-07-24 19:29:11.245627903 +0200
+++ 1.6.2-2/debian/geoip-bin.install2014-10-27 19:31:48.626784609 +0100
@@ -1,3 +1,4 @@
debian/tmp/usr/bin/* usr/bin/
debian/tmp/geoip-generator usr/lib/geoip/
+debian/tmp/geoip-generator-asn usr/lib/geoip/
debian/src/v4-to-v6-layout.pl usr/lib/geoip/
diff -Naur '--exclude=.svn' 1.6.2-1/debian/geoip-bin.lintian-overrides
1.6.2-2/debian/geoip-bin.lintian-overrides
--- 1.6.2-1/debian/geoip-bin.lintian-overrides 2014-07-24 19:29:11.245627903
+0200
+++ 1.6.2-2/debian/geoip-bin.lintian-overrides 2014-10-27 19:31:48.626784609
+0100
@@ -1 +1,2 @@
geoip-bin: hardening-no-fortify-functions usr/lib/geoip/geoip-generator
+geoip-bin: hardening-no-fortify-functions usr/lib/geoip/geoip-generator-asn
diff -Naur '--exclude=.svn' 1.6.2-1/debian/rules 1.6.2-2/debian/rules
--- 1.6.2-1/debian/rules2014-07-24 19:29:11.241627982 +0200
+++ 1.6.2-2/debian/rules2014-10-27 19:31:48.626784609 +0100
@@ -13,6 +13,8 @@
# Build the build script.
$(CXX) $(CPPFLAGS) $(LDFLAGS) -g debian/src/geoip-csv-to-dat.cpp -o
debian/tmp/geoip-generator -lGeoIP \
-I $(CURDIR)/debian/tmp/usr/include/ -L
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
+ $(CXX) $(CPPFLAGS) $(LDFLAGS) -g debian/src/geoip-asn-csv-to-dat.cpp -o
debian/tmp/geoip-generator-asn -lGeoIP \
+ -I $(CURDIR)/debian/tmp/usr/include/ -L
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
chrpath -d -k debian/tmp/usr/bin/geoip*
override_dh_strip:
diff -Naur '--exclude=.svn' 1.6.2-1/debian/src/geoip-asn-csv-to-dat.cpp
1.6.2-2/debian/src/geoip-asn-csv-to-dat.cpp
--- 1.6.2-1/debian/src/geoip-asn-csv-to-dat.cpp 1970-01-01 01:00:00.0
+0100
+++ 1.6.2-2/debian/src/geoip-asn-csv-to-dat.cpp 2014-10-27 19:31:48.626784609
+0100
@@ -0,0 +1,889 @@
+/* geoip-csv-to-dat - convert a country database from CSV to GeoIP binary
format
+ *
+ * Copyright (c) 2009 Kalle Olavi Niemitalo.
+ * Copyright (c) 2011 Patrick Matthäi
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR
