geoipupdate: bump to 2.3.1, add TEST().

* Since this release we need to call libtoolize.
* Replace the copy of the GNU GPL v2 LICENSE (that upstream now puts
  in $docDir) by a symlink to our copy in /system/data/licenses/.
* Upstream now installs GeoIP.conf.default in $docDir (instead of
  $settingsDir in the previous release) so we now have to get it
  from there when moving it to $dataDir/geoipupdate/.
* Simplify the previous patch for GeoIP.conf since upstream now
  ships a default config which has sane defaults for unregistered
  users, making GeoIP.conf usable out of the box. This simplified
  patch now only adds a table with a small list of ProductIds.

net-misc/geoipupdate/geoipupdate-2.3.1.recipe

@@ -5,11 +5,11 @@ are supplied in the configuration file for the set of chosen ProductIds. A \
 generic UserId may be used, however, to download some databases, including \
 GeoLite2 Country and GeoLite2 City."
 HOMEPAGE="https://github.com/maxmind/geoipupdate"
-COPYRIGHT="2002-2016 MaxMind, Inc."
+COPYRIGHT="2002-2017 MaxMind, Inc."
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/maxmind/geoipupdate/releases/download/v$portVersion/geoipupdate-$portVersion.tar.gz"
-CHECKSUM_SHA256="156ab7604255a9c62c4a442c76d48d024ac813c6542639bffa93b28e2a781621"
+CHECKSUM_SHA256="4f71e911774c4fd32e217889c242d2c311fa5ffd3df56be48a2d1aedfe2e671c"
 PATCHES="geoipupdate-$portVersion.patchset"
 
 GLOBAL_WRITABLE_FILES="settings/GeoIP.conf keep-old"
@@ -57,6 +57,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
+	libtoolize --force --copy --install
 	aclocal
 	autoconf
 	automake --add-missing
@@ -81,9 +82,17 @@ INSTALL()
 		$manDir/man5/GeoIP.conf.5
 
 	sed -i -e "s,/usr/local/share/GeoIP,${CACHE_DIR#/boot}/GeoIP," \
-		$settingsDir/GeoIP.conf.default \
+		$docDir/GeoIP.conf.default \
 		$settingsDir/GeoIP.conf
 
 	mkdir -p $dataDir/geoipupdate
-	mv $settingsDir/GeoIP.conf.default $dataDir/geoipupdate
+	mv $docDir/GeoIP.conf.default $dataDir/geoipupdate
+
+	rm $docDir/LICENSE
+	ln -r -s $dataDir/licenses/GNU\ GPL\ v2 $docDir/LICENSE
+}
+
+TEST()
+{
+	make check
 }

net-misc/geoipupdate/patches/geoipupdate-2.3.1.patchset

@@ -5,10 +5,10 @@ Subject: Search for xasprintf in libroot.
 
 
 diff --git a/configure.ac b/configure.ac
-index 97f6e75..47dbbb4 100644
+index 518030f..a1db7da 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -29,6 +29,7 @@ AC_CHECK_HEADERS(curl/curl.h, , AC_MSG_ERROR(curl header (curl/curl.h) not found
+@@ -30,6 +30,7 @@ AC_CHECK_HEADERS(curl/curl.h, , AC_MSG_ERROR(curl header (curl/curl.h) not found
  
  AC_CHECK_LIB(z, gzopen, [], [AC_MSG_ERROR([libz not found.])])
  AC_CHECK_LIB(curl, curl_easy_setopt, [], [AC_MSG_ERROR([libcurl not found.])])
@@ -41,7 +41,7 @@ index b4a6e07..b2a3397 100644
  bin_PROGRAMS = geoipupdate
  
 diff --git a/bin/geoipupdate_s.c b/bin/geoipupdate_s.c
-index 948e1fc..f49727e 100644
+index 948e1fc..f252912 100644
 --- a/bin/geoipupdate_s.c
 +++ b/bin/geoipupdate_s.c
 @@ -9,7 +9,7 @@ geoipupdate_s *geoipupdate_s_new(void)
@@ -59,25 +59,18 @@ index 948e1fc..f49727e 100644
 
 From d45d2746a970be2cd9d279e368ef45124f9204be Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
-Date: Tue, 5 Apr 2016 10:05:21 +0000
-Subject: Make the default GeoIP.conf file usable out of the box.
+Date: Thu, 5 Jan 2017 01:22:18 +0000
+Subject: Add table of ProductIds to GeoIP.conf
 
 
 diff --git a/conf/GeoIP.conf.default b/conf/GeoIP.conf.default
-index 91fbe9b..9c608c7 100644
+index f9401fe..26e263d 100644
 --- a/conf/GeoIP.conf.default
 +++ b/conf/GeoIP.conf.default
-@@ -9,7 +9,27 @@ LicenseKey YOUR_LICENSE_KEY_HERE
+@@ -8,6 +8,19 @@
+ UserId 0
+ LicenseKey 000000000000
  
- # Enter the product IDs of the databases you would like to update.
- # Multiple product IDs are separated by spaces.
--ProductIds GeoIP2-Country GeoIP2-City 106 132
-+#ProductIds GeoIP2-Country GeoIP2-City 106 132
-+
-+# Some databases may be downloaded by the GeoIP Update program, geoipupdate,
-+# without an account if the following generic UsedId is specified:
-+UserId 999999
-+
 +# List of databases available without an account:
 +# (Source: https://dev.maxmind.com/geoip/geoipupdate/)
 +
@@ -91,11 +84,9 @@ index 91fbe9b..9c608c7 100644
 +# GeoLite2-Country            GeoLite2-Country.mmdb GeoLite2 Country
 +# GeoLite2-City               GeoLite2-City.mmdb    GeoLite2 City
 +
-+#ProductIds 506 517 533 GeoLite-Legacy-IPv6-Country GeoLite-Legacy-IPv6-City
-+ProductIds GeoLite2-Country GeoLite2-City 
- 
- # The remaining settings are OPTIONAL.
- 
+ # Enter the product IDs of the databases you would like to update.
+ # Multiple product IDs are separated by spaces.
+ ProductIds GeoLite2-Country GeoLite2-City
 -- 
-2.7.0
+2.11.0