From 26b680c0b40e902f96a35fa147e7b44cf6e8c18b Mon Sep 17 00:00:00 2001 From: Pablo Date: Sat, 16 Dec 2017 15:18:45 +0100 Subject: [PATCH 1/4] fixreplacements-geoip-database-contrib --- ...-contrib_update.shim => update-geoip-database.shim} | 0 helpers/make-geoip-database-contrib | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) rename helpers/DATA/geoip-database-contrib/{geoip-database-contrib_update.shim => update-geoip-database.shim} (100%) diff --git a/helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim b/helpers/DATA/geoip-database-contrib/update-geoip-database.shim similarity index 100% rename from helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim rename to helpers/DATA/geoip-database-contrib/update-geoip-database.shim diff --git a/helpers/make-geoip-database-contrib b/helpers/make-geoip-database-contrib index 95d5a8c..43be805 100644 --- a/helpers/make-geoip-database-contrib +++ b/helpers/make-geoip-database-contrib @@ -15,18 +15,18 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# +# VERSION=1 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 +sed "/^exit 0/d" -i update-geoip-database +cat $DATA/update-geoip-database.shim >> update-geoip-database cat $DATA/copyright.shim >> debian/copyright -sed '/rm -f \/usr\/share\/GeoIP\/GeoLiteCityv6\.dat/a\ +sed '/rm -f \/var\/lib\/geoip-database-contrib\/GeoLiteCityv6\.dat/a\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPCountryCSV.zip\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPv6.csv.gz\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCity-latest.tar.xz\ @@ -35,7 +35,7 @@ sed '/rm -f \/usr\/share\/GeoIP\/GeoLiteCityv6\.dat/a\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2v6.zip ' -i debian/postrm -changelog 'Handle CSV source in geoip-database-contrib_update and postrm #13927' +changelog 'Handle CSV source in update-geoip-database and postrm #13927' compile From d139259c476ec5b5fe2bbee288fad723c45418aa Mon Sep 17 00:00:00 2001 From: Pablo Date: Mon, 18 Dec 2017 01:38:21 +0100 Subject: [PATCH 2/4] Suggested modifications and more cleanup --- helpers/make-geoip-database-contrib | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/helpers/make-geoip-database-contrib b/helpers/make-geoip-database-contrib index 43be805..63b00a7 100644 --- a/helpers/make-geoip-database-contrib +++ b/helpers/make-geoip-database-contrib @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM multiverse' . ./config @@ -26,13 +26,15 @@ sed "/^exit 0/d" -i update-geoip-database cat $DATA/update-geoip-database.shim >> update-geoip-database cat $DATA/copyright.shim >> debian/copyright -sed '/rm -f \/var\/lib\/geoip-database-contrib\/GeoLiteCityv6\.dat/a\ +sed '\|rm -f /var/lib/geoip-database-contrib/GeoLiteCityv6\.dat|a\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPCountryCSV.zip\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPv6.csv.gz\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCity-latest.tar.xz\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCityv6.csv.gz\ rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2.zip\ - rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2v6.zip + rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2v6.zip\ + rmdir --ignore-fail-on-non-empty /usr/share/doc/geoip-database-contrib/csv &&\\\ + rmdir --ignore-fail-on-non-empty /usr/share/doc/geoip-database-contrib ' -i debian/postrm changelog 'Handle CSV source in update-geoip-database and postrm #13927' From c6e7c0d2ef69d9c47d1cdafa3e9f10eba4401eb4 Mon Sep 17 00:00:00 2001 From: Pablo Date: Fri, 22 Dec 2017 18:54:26 +0100 Subject: [PATCH 3/4] fix identation to fit postrm --- helpers/make-geoip-database-contrib | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/helpers/make-geoip-database-contrib b/helpers/make-geoip-database-contrib index 63b00a7..f27d06f 100644 --- a/helpers/make-geoip-database-contrib +++ b/helpers/make-geoip-database-contrib @@ -27,14 +27,14 @@ cat $DATA/update-geoip-database.shim >> update-geoip-database cat $DATA/copyright.shim >> debian/copyright sed '\|rm -f /var/lib/geoip-database-contrib/GeoLiteCityv6\.dat|a\ - rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPCountryCSV.zip\ - rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPv6.csv.gz\ - rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCity-latest.tar.xz\ - rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCityv6.csv.gz\ - rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2.zip\ - rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2v6.zip\ - rmdir --ignore-fail-on-non-empty /usr/share/doc/geoip-database-contrib/csv &&\\\ - rmdir --ignore-fail-on-non-empty /usr/share/doc/geoip-database-contrib + rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPCountryCSV.zip\ + rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPv6.csv.gz\ + rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCity-latest.tar.xz\ + rm -f /usr/share/doc/geoip-database-contrib/csv/GeoLiteCityv6.csv.gz\ + rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2.zip\ + rm -f /usr/share/doc/geoip-database-contrib/csv/GeoIPASNum2v6.zip\ + rmdir --ignore-fail-on-non-empty /usr/share/doc/geoip-database-contrib/csv &&\\\ + rmdir --ignore-fail-on-non-empty /usr/share/doc/geoip-database-contrib ' -i debian/postrm changelog 'Handle CSV source in update-geoip-database and postrm #13927' From 451e83bbb1be52349b0cfaeed86133e0dfa4fdcc Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 23 Jan 2018 16:16:35 +0100 Subject: [PATCH 4/4] Fixed version modification error --- helpers/make-geoip-database-contrib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-geoip-database-contrib b/helpers/make-geoip-database-contrib index f27d06f..9d8dc70 100644 --- a/helpers/make-geoip-database-contrib +++ b/helpers/make-geoip-database-contrib @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=2 +VERSION=1 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM multiverse' . ./config