webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

libloc: update to 0.9.5 and backport fix for #12554

Browse Source 
This patch updates libloc to 0.9.5, deletes the upstream patchset from
version 0.9.4, and includes a latest upstream patch to backport a fix
for #12554.

Cc: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Peter Müller
2020-12-23 15:03:32 +01:00
committed by Michael Tremer
parent 5189d54a2f
commit f31c8d2ade
3 changed files with 34 additions and 3857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lfs/libloc
View File

@@ -24,8 +24,8 @@
include Config
VER = 0.9.4
DB_DATE = 2020-09-21
VER = 0.9.5
DB_DATE = 2020-12-23
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 = 82770e9eba20f636c96e6fa42ff234b5
location-$(DB_DATE).db.xz_MD5 = fa3069bf31170629d638317e283913c0
$(DL_FILE)_MD5 = 41d8dc3fb4e498db958b7696cadd61f5
location-$(DB_DATE).db.xz_MD5 = 3a71931555623fc3665f280c8e5c292a
install : $(TARGET)
@@ -78,8 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
# Import changes from upstream
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.4-upstream.patch
# 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"

3850
src/patches/libloc-0.9.4-upstream.patch
View File

File diff suppressed because it is too large Load Diff

27
src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch Normal file
View File

@@ -0,0 +1,27 @@
From b178117bac33b4b1e7ce341a6f2eec493cca13f8 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 21 Dec 2020 16:25:46 +0000
Subject: [PATCH] location: Fix list-networks-by-as
Fixes: #12554
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
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