iptables: Update to 1.8.6

[ipfire-2.x.git] / lfs / libloc

diff --git a/lfs/libloc b/lfs/libloc
index 5cf3e0819c770304f5eeddd6a2442ed9ff5d88f9..279840535c5c3acb7ba0cd56c356b833f94939d6 100644 (file)
--- a/lfs/libloc
+++ b/lfs/libloc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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.5
+DB_DATE    = 2020-12-23
 
 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                = 41d8dc3fb4e498db958b7696cadd61f5
+location-$(DB_DATE).db.xz_MD5 = 3a71931555623fc3665f280c8e5c292a
 
 install : $(TARGET)
 
@@ -78,15 +78,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
 
-       # Add patch for i585 to disable the stack protector.
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-no-stack-protector.patch
+       # Import recent patches from upstream
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.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
+endif
 
        cd $(DIR_APP) && ./autogen.sh
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc \
                --localstatedir=/var \
-               --disable-manpages
+               --disable-man-pages
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
@@ -94,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && cp -avf $(DIR_DL)/location-$(DB_DATE).db.xz /var/lib/location/database.db.xz
 
        # Uncompress database.
+       cd $(DIR_APP) && rm -f /var/lib/location/database.db
        cd $(DIR_APP) && xz -d /var/lib/location/database.db.xz
 
        # Launch location util and export all locations in xt_geoip format.