suricata: Change midstream policy to "pass-flow"

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

diff --git a/lfs/libloc b/lfs/libloc
index c4e409fa52ef19bab045beddad7c3729b247f7ba..35a711286ffdce5af88a114e9ec6308d4950c7fb 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-2024  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.2
-DB_DATE    = 2020-06-10
+VER        = 0.9.17
+DB_DATE    = 2024-02-17
 
 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                = c6ed4fcbdb2ce4ca7e6df8abbd985411
-location-$(DB_DATE).db.xz_MD5 = 268b6d58a26c6d36081ed1e899b89020
+$(DL_FILE)_BLAKE2 = b0bf860ebaccd3cb49c58c066c430f7a1f936a2029957db9b88e22c04240af0268a8f6388e8ca512102f14033037a2ab8bbb93fe83e525b9859c790c5c382df4
+location-$(DB_DATE).db.xz_BLAKE2 = 36432bed306871e96a741d364fdefaa677d47245e38596d1c7fb6a8f0a143e3ffa549e16effa58289b5481220b0a2560255e75b0bfe53219b1400d6d250aa02b
 
 install : $(TARGET)
 
@@ -52,13 +52,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 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)) :
@@ -67,8 +67,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -78,12 +78,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
 
+       # https://lists.ipfire.org/pipermail/development/2022-November/014763.html
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.17-Revert-Install-Perl-files-to-Perl-vendor-directory.patch
+
        cd $(DIR_APP) && ./autogen.sh
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
+               --libdir=/usr/lib \
                --sysconfdir=/etc \
                --localstatedir=/var \
-               --disable-manpages
+               --disable-man-pages \
+               --with-database-path=/var/lib/location/database.db
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
@@ -91,16 +96,20 @@ $(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.
+       # 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)