[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ec77442f18154b589b0256d736e2dd1aa3f363b2
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via ec77442f18154b589b0256d736e2dd1aa3f363b2 (commit) via e1176c3be6e2e6b5fb1fce0bda578620278827cc (commit) via ac41c814a8f046d875573fdb79b588f0121cb242 (commit) from 7f52b94f2db141e197d7e2113aa93bce6dfde72e (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit ec77442f18154b589b0256d736e2dd1aa3f363b2 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 31 16:00:00 2021 +0000
libloc: Update to 0.9.6
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e1176c3be6e2e6b5fb1fce0bda578620278827cc Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 31 12:12:05 2021 +0000
core156: Ship strongswan
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ac41c814a8f046d875573fdb79b588f0121cb242 Author: Peter Müller peter.mueller@ipfire.org Date: Tue Mar 30 21:14:27 2021 +0200
strongSwan: update to 5.9.2
This versions' changelog can be retrieved from https://wiki.strongswan.org/versions/80.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: .../{oldcore/148 => core/156}/filelists/libloc | 0 .../{oldcore/106 => core/156}/filelists/strongswan | 0 config/rootfiles/core/156/update.sh | 3 +++ lfs/libloc | 11 ++++----- lfs/strongswan | 6 ++--- ...oc-0.9.5-location-Fix-list-networks-by-as.patch | 27 ---------------------- 6 files changed, 10 insertions(+), 37 deletions(-) copy config/rootfiles/{oldcore/148 => core/156}/filelists/libloc (100%) copy config/rootfiles/{oldcore/106 => core/156}/filelists/strongswan (100%) delete mode 100644 src/patches/libloc-0.9.5-location-Fix-list-networks-by-as.patch
Difference in files: diff --git a/config/rootfiles/core/156/filelists/libloc b/config/rootfiles/core/156/filelists/libloc new file mode 120000 index 000000000..ff4a92429 --- /dev/null +++ b/config/rootfiles/core/156/filelists/libloc @@ -0,0 +1 @@ +../../../common/libloc \ No newline at end of file diff --git a/config/rootfiles/core/156/filelists/strongswan b/config/rootfiles/core/156/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/156/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/156/update.sh b/config/rootfiles/core/156/update.sh index fca7d4cb6..8485d84a0 100644 --- a/config/rootfiles/core/156/update.sh +++ b/config/rootfiles/core/156/update.sh @@ -54,6 +54,9 @@ ldconfig # Start services telinit u /etc/init.d/suricata restart +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec restart +fi
# This update needs a reboot... #touch /var/run/need_reboot diff --git a/lfs/libloc b/lfs/libloc index ac0aecb3b..da684c771 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/lfs/strongswan b/lfs/strongswan index ace2c5814..0f00b071f 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 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,7 +24,7 @@
include Config
-VER = 5.9.1 +VER = 5.9.2
THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1f4db969d072e120dc12d1c116a0f658 +$(DL_FILE)_MD5 = 8918e6675e1be3784817641f07eadeb8
install : $(TARGET)
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 ea29885a8..000000000 --- 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 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 -
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer