###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 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 #
include Config
-VER = 0.9.2
-DB_DATE = 2020-06-10
+VER = 0.9.5
+DB_DATE = 2021-01-28
THISAPP = libloc-$(VER)
DL_FILE = $(THISAPP).tar.gz
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 = c6ed4fcbdb2ce4ca7e6df8abbd985411
-location-$(DB_DATE).db.xz_MD5 = 268b6d58a26c6d36081ed1e899b89020
+$(DL_FILE)_MD5 = 41d8dc3fb4e498db958b7696cadd61f5
+location-$(DB_DATE).db.xz_MD5 = f1814a144e22c9386aea00fa01992719
install : $(TARGET)
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
+ # 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
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.