###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2022 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.4
-DB_DATE = 2020-09-21
+VER = 0.9.11
+DB_DATE = 2022-02-16
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 = 82770e9eba20f636c96e6fa42ff234b5
-location-$(DB_DATE).db.xz_MD5 = fa3069bf31170629d638317e283913c0
+$(DL_FILE)_BLAKE2 = 46df0dc058235ede47c103c9be5882f50b688c80613c2bdf6f3bc40a2effff67e3ef77cd28142dc3b3fb832689a345e8840fe466738e7ae151698e98c17a68ed
+location-$(DB_DATE).db.xz_BLAKE2 = 9ba0ae5bbabef1a0f692cee11515796d754b2f83aa21c2a2730b4d04249606fe00df856dad08fbdfdad3fad6b06c902b36e3a7717181ce0fac4738b46737b5b4
install : $(TARGET)
download :$(patsubst %,$(DIR_DL)/%,$(objects))
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
dist:
@$(PAK)
###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+ @$(B2SUM)
###############################################################################
# Installation Details
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
-
- # 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) && 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.
+ # Create directory for ipset databases.
+ cd $(DIR_APP) && mkdir -pv /var/lib/location/ipset
+
+ # Launch location util and export all locations in ipset compatible format.
cd $(DIR_APP) && /usr/bin/location export \
- --directory=/usr/share/xt_geoip \
+ --directory=/var/lib/location/ipset \
--family=ipv4 \
- --format=xt_geoip
+ --format=ipset
# Remove exported IPv6 zones.
- cd $(DIR_APP) && rm -rvf /usr/share/xt_geoip/*.iv6
+ cd $(DIR_APP) && rm -rvf /var/lib/location/ipset/*.ipset6
@rm -rf $(DIR_APP)
@$(POSTBUILD)