Revert "~/src/patches/: Clean up orphaned patches, duplicates and application patches...

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

diff --git a/lfs/libloc b/lfs/libloc
index e6f24abb4588e2114ee9d55b93f77e3b7bcb6c27..da684c771ff05c3fea8de25cbd33241af1364682 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-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,11 +24,11 @@
 
 include Config
 
-VER        = 0.9.0
-GIT_REV    = cd022c
+VER        = 0.9.6
+DB_DATE    = 2021-03-30
 
-THISAPP    = libloc-$(VER)-$(GIT_REV)
-DL_FILE    = $(THISAPP).tar.xz
+THISAPP    = libloc-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/libloc-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -37,11 +37,15 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+       location-$(DB_DATE).db.xz
 
-$(DL_FILE) = $(DL_FROM)/$(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                = a05c44568bce04ab777caadb3e1d3c51
+location-$(DB_DATE).db.xz_MD5 = e5a05e01e999ba5c70d7e2960336d2a4
 
-$(DL_FILE)_MD5 = a40fcbdd5585f720ca801166befeef85
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -73,12 +77,36 @@ $(subst %,%_MD5,$(objects)) :
 $(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
+
+       # Copy database to correct location.
+       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.
+       cd $(DIR_APP) && /usr/bin/location export \
+               --directory=/usr/share/xt_geoip \
+               --family=ipv4 \
+               --format=xt_geoip
+
+       # Remove exported IPv6 zones.
+       cd $(DIR_APP) && rm -rvf /usr/share/xt_geoip/*.iv6
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)