From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 22 Sep 2020 18:25:09 +0000 (+0200)
Subject: libloc: Update to 0.9.4
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8be7a2206c39527e5f0cba735d129248eb610ac1

libloc: Update to 0.9.4

Also update to the shipped database to 2020-09-21.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/libloc b/lfs/libloc
index 178f9f9ccd..da53e51494 100644
--- a/lfs/libloc
+++ b/lfs/libloc
@@ -24,8 +24,8 @@
 
 include Config
 
-VER        = 0.9.3
-DB_DATE    = 2020-07-10
+VER        = 0.9.4
+DB_DATE    = 2020-09-21
 
 THISAPP    = libloc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,8 +43,8 @@ objects = $(DL_FILE) \
 $(DL_FILE)                    = https://source.ipfire.org/releases/libloc//$(DL_FILE)
 location-$(DB_DATE).db.xz     = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz
 
-$(DL_FILE)_MD5                = 61f1d543f67baf665b0140d3676fdade
-location-$(DB_DATE).db.xz_MD5 = 3f68f631e94c29b953c4e60454567540
+$(DL_FILE)_MD5                = 82770e9eba20f636c96e6fa42ff234b5
+location-$(DB_DATE).db.xz_MD5 = fa3069bf31170629d638317e283913c0
 
 install : $(TARGET)
 
@@ -78,10 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
 
-	# Apply upstream patches
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-location-provide-return-code.patch
-
 	# Add patch for i586 to disable strong stack protector.
 ifeq "$(BUILD_ARCH)" "i586"
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-i586-regular-stack-protector.patch
diff --git a/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch b/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch
deleted file mode 100644
index 0ad9229fd6..0000000000
--- a/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 61d3516bbfce6b4e6393825329c07b1e2a88d47d
-Author: Michael Tremer <michael.tremer@ipfire.org>
-Date:   Mon Jul 13 10:47:30 2020 +0000
-
-    country: Terminate buffer when reading from database
-    
-    Compilers on ARM do not seem to initialise the buffer.
-    
-    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-
-diff --git a/src/country.c b/src/country.c
-index d6ddf50..2ba93e6 100644
---- a/src/country.c
-+++ b/src/country.c
-@@ -125,6 +125,9 @@ int loc_country_new_from_database_v1(struct loc_ctx* ctx, struct loc_stringpool*
- 	// Read country code
- 	loc_country_code_copy(buffer, dbobj->code);
- 
-+	// Terminate buffer
-+	buffer[2] = '\0';
-+
- 	// Create a new country object
- 	int r = loc_country_new(ctx, country, buffer);
- 	if (r)
diff --git a/src/patches/libloc-0.9.3-location-provide-return-code.patch b/src/patches/libloc-0.9.3-location-provide-return-code.patch
deleted file mode 100644
index 2382145c39..0000000000
--- a/src/patches/libloc-0.9.3-location-provide-return-code.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 1be0681cc4bcc006369e69d90dc4439eaa6f58d5
-Author: Stefan Schantl <stefan.schantl@ipfire.org>
-Date:   Wed Jul 29 18:50:20 2020 +0200
-
-    location: Provide a return code if the database does not need to be
-    updated.
-    
-    Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
-
-diff --git a/src/python/location.in b/src/python/location.in
-index 5211b28..8cdd140 100644
---- a/src/python/location.in
-+++ b/src/python/location.in
-@@ -416,7 +416,7 @@ class CLI(object):
- 					_("The datase has recently be updated recently (%s)") % \
- 						format_timedelta(now - t),
- 				)
--				return
-+				return 3
- 
- 		# Fetch the timestamp we need from DNS
- 		t = location.discover_latest_version()