From 6cd1de8eccb59df70235149165f6867ac8e4f07f Mon Sep 17 00:00:00 2001 From: "Andrew M. 'Leny' Lindley" <andrew@andrewlindley.co.uk> Date: Wed, 8 Apr 2015 11:29:10 +0100 Subject: [PATCH] Download source CSVs for GNU FSDG compliance --- .../geoip-database-contrib/copyright.shim | 6 ++ .../geoip-database-contrib_update.shim | 56 +++++++++++++++++++ helpers/make-geoip-database-contrib | 4 ++ 3 files changed, 66 insertions(+) create mode 100644 helpers/DATA/geoip-database-contrib/copyright.shim create mode 100644 helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim diff --git a/helpers/DATA/geoip-database-contrib/copyright.shim b/helpers/DATA/geoip-database-contrib/copyright.shim new file mode 100644 index 00000000..e9206493 --- /dev/null +++ b/helpers/DATA/geoip-database-contrib/copyright.shim @@ -0,0 +1,6 @@ + +Files: geoip-database-contrib_update +Copyright: 2010/2013, Ludovico Cavedon <cavedon@debian.org> + Patrick Matthäi <pmatthaei@debian.org> + 2015 Andrew Lindley <andrew@andrewlindley.co.uk> +License: GPL-2+ diff --git a/helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim b/helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim new file mode 100644 index 00000000..e9cd76ef --- /dev/null +++ b/helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim @@ -0,0 +1,56 @@ +# Download the compressed source CSVs for GNU FSDG compliance + +GEOLITE_COUNTRY_CSV_PATH="" +GEOLITE_COUNTRY_CSV_FILE="GeoIPCountryCSV.zip" + +GEOLITE_COUNTRY_IPV6_CSV_PATH="" +GEOLITE_COUNTRY_IPV6_CSV_FILE="GeoIPv6.csv.gz" + +GEOLITE_CITY_CSV_PATH="GeoLiteCity_CSV/" +GEOLITE_CITY_CSV_FILE="GeoLiteCity-latest.tar.xz" + +GEOLITE_CITY_IPV6_CSV_PATH="GeoLiteCityv6-beta/" +GEOLITE_CITY_IPV6_CSV_FILE="GeoLiteCityv6.csv.gz" + +GEOLITE_ASNUM_CSV_PATH="asnum/" +GEOLITE_ASNUM_CSV_FILE="GeoIPASNum2.zip" + +GEOLITE_ASNUM_IPV6_CSV_PATH="asnum/" +GEOLITE_ASNUM_IPV6_CSV_FILE="GeoIPASNum2v6.zip" + +GEOIP_CSV_DIR="/usr/share/doc/geoip-database-contrib/csv/" + +FAILED=0 + +mkdir -p $GEOIP_CSV_DIR + +for url in \ + "$GEOIP_URL$GEOLITE_COUNTRY_CSV_PATH$GEOLITE_COUNTRY_CSV_FILE" \ + "$GEOIP_URL$GEOLITE_COUNTRY_IPV6_CSV_PATH$GEOLITE_COUNTRY_IPV6_CSV_FILE" \ + "$GEOIP_URL$GEOLITE_CITY_CSV_PATH$GEOLITE_CITY_CSV_FILE" \ + "$GEOIP_URL$GEOLITE_CITY_IPV6_CSV_PATH$GEOLITE_CITY_IPV6_CSV_FILE" \ + "$GEOIP_URL$GEOLITE_ASNUM_CSV_PATH$GEOLITE_ASNUM_CSV_FILE" \ + "$GEOIP_URL$GEOLITE_ASNUM_IPV6_CSV_PATH$GEOLITE_ASNUM_IPV6_CSV_FILE" +do + echo "Downloading: $url" + + # Download file in the same directory as the final one so that the "mv" + # below can be atomic. + TEMP=$(mktemp --tmpdir=$GEOIP_CSV_DIR) + FILE=$(basename $url) + + /usr/bin/wget -q -t3 -T15 "$url" -O $TEMP + + if [ "$?" != "0" ] + then + echo "Failed to download $url" + else + rm -f $GEOIP_CSV_DIR$FILE + mv $TEMP $GEOIP_CSV_DIR$FILE + chmod 644 $GEOIP_CSV_DIR$FILE + fi + + rm -f $TEMP +done + +exit 0 diff --git a/helpers/make-geoip-database-contrib b/helpers/make-geoip-database-contrib index bffac2ea..835d5c64 100644 --- a/helpers/make-geoip-database-contrib +++ b/helpers/make-geoip-database-contrib @@ -22,6 +22,10 @@ EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM multiverse' . ./config +sed "/exit 0/d" -i geoip-database-contrib_update +cat $DATA/geoip-database-contrib_update.shim >> geoip-database-contrib_update +cat $DATA/copyright.shim >> debian/copyright + changelog 'Imported into Trisquel #13927' compile -- GitLab