X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flibloc;h=da684c771ff05c3fea8de25cbd33241af1364682;hb=504e72e17317e9b153d5dc6c0198c6df7c5f750a;hp=12bc52ca4d6294779829f97193ff0156ef3b2a59;hpb=99659ce50b2a693217d674b380af6ffdac191832;p=ipfire-2.x.git

diff --git a/lfs/libloc b/lfs/libloc
index 12bc52ca4d..da684c771f 100644
--- a/lfs/libloc
+++ b/lfs/libloc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,8 +24,8 @@
 
 include Config
 
-VER        = 0.9.3
-DB_DATE    = 2020-07-10
+VER        = 0.9.6
+DB_DATE    = 2021-03-30
 
 THISAPP    = libloc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,11 +40,11 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 objects = $(DL_FILE) \
 	location-$(DB_DATE).db.xz
 
-$(DL_FILE)                    = https://source.ipfire.org/releases/libloc//$(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                = a05c44568bce04ab777caadb3e1d3c51
+location-$(DB_DATE).db.xz_MD5 = e5a05e01e999ba5c70d7e2960336d2a4
 
 install : $(TARGET)
 
@@ -78,13 +78,9 @@ $(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-regular-stack-protector.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-i586-regular-stack-protector.patch
 endif
 
 	cd $(DIR_APP) && ./autogen.sh
@@ -92,7 +88,7 @@ endif
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--disable-manpages
+		--disable-man-pages
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install