X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flibloc;h=4f8d14cb15ef66c330410ec5d23119086fc4eb47;hp=b94906c94eb4a3a9cde0230e31b97cc530b1140b;hb=HEAD;hpb=817f4c1410c2c2f75ca340ff317e75910ac54f27 diff --git a/lfs/libloc b/lfs/libloc index b94906c94e..35a711286f 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # 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.11 -DB_DATE = 2022-02-16 +VER = 0.9.17 +DB_DATE = 2024-02-17 THISAPP = libloc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,8 +43,8 @@ objects = $(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 = 724ce9081a025307528021e6398c9335 -location-$(DB_DATE).db.xz_MD5 = c1ad9c544bab917035eb0cd13b66c453 +$(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 @@ -77,12 +77,18 @@ $(subst %,%_MD5,$(objects)) : $(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-man-pages + --disable-man-pages \ + --with-database-path=/var/lib/location/database.db cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install