From ec77442f18154b589b0256d736e2dd1aa3f363b2 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 31 Mar 2021 16:00:00 +0000 Subject: [PATCH] libloc: Update to 0.9.6 Signed-off-by: Michael Tremer --- config/rootfiles/core/156/filelists/libloc | 1 + lfs/libloc | 11 +++----- ...9.5-location-Fix-list-networks-by-as.patch | 27 ------------------- 3 files changed, 5 insertions(+), 34 deletions(-) create mode 120000 config/rootfiles/core/156/filelists/libloc delete mode 100644 src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch diff --git a/config/rootfiles/core/156/filelists/libloc b/config/rootfiles/core/156/filelists/libloc new file mode 120000 index 0000000000..ff4a92429c --- /dev/null +++ b/config/rootfiles/core/156/filelists/libloc @@ -0,0 +1 @@ +../../../common/libloc \ No newline at end of file diff --git a/lfs/libloc b/lfs/libloc index ac0aecb3b2..da684c771f 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -24,8 +24,8 @@ include Config -VER = 0.9.5 -DB_DATE = 2021-01-28 +VER = 0.9.6 +DB_DATE = 2021-03-30 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 = 41d8dc3fb4e498db958b7696cadd61f5 -location-$(DB_DATE).db.xz_MD5 = f1814a144e22c9386aea00fa01992719 +$(DL_FILE)_MD5 = a05c44568bce04ab777caadb3e1d3c51 +location-$(DB_DATE).db.xz_MD5 = e5a05e01e999ba5c70d7e2960336d2a4 install : $(TARGET) @@ -78,9 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(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 diff --git a/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch b/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch deleted file mode 100644 index ea29885a82..0000000000 --- a/src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b178117bac33b4b1e7ce341a6f2eec493cca13f8 Mon Sep 17 00:00:00 2001 -From: Michael Tremer -Date: Mon, 21 Dec 2020 16:25:46 +0000 -Subject: [PATCH] location: Fix list-networks-by-as - -Fixes: #12554 -Signed-off-by: Michael Tremer ---- - src/python/location.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/python/location.in b/src/python/location.in -index b30beae..ad2ccf5 100644 ---- a/src/python/location.in -+++ b/src/python/location.in -@@ -493,7 +493,7 @@ class CLI(object): - f = writer(sys.stdout, prefix="AS%s" % asn) - - # Print all matching networks -- for n in db.search_networks(asn=asn, family=ns.family): -+ for n in db.search_networks(asns=[asn], family=ns.family): - f.write(n) - - f.finish() --- -2.26.2 - -- 2.39.5