[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 451cf01677c4da62dd7235ec1cfbe8b54fa8b201

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 451cf01677c4da62dd7235ec1cfbe8b54fa8b201

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 4076 bytes --]

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  451cf01677c4da62dd7235ec1cfbe8b54fa8b201 (commit)
       via  9d23bd75dedd87ff4fa7afb9459ff7c99626b773 (commit)
      from  b1c25d7a8456b7ff05f23c461c623dc18fddbae4 (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 451cf01677c4da62dd7235ec1cfbe8b54fa8b201
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Mar 21 19:04:11 2022 +0000

    Core Update 166: Ship and restart strongSwan
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 9d23bd75dedd87ff4fa7afb9459ff7c99626b773
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Mon Mar 21 16:33:19 2022 +0000

    strongSwan: Update to 5.9.5
    
    Please refer to https://github.com/strongswan/strongswan/releases/tag/5.9.5 for this
    versions' changelog.
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
    Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/{oldcore/106 => core/166}/filelists/strongswan | 0
 config/rootfiles/core/166/update.sh                             | 4 ++++
 lfs/strongswan                                                  | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)
 copy config/rootfiles/{oldcore/106 => core/166}/filelists/strongswan (100%)

Difference in files:
diff --git a/config/rootfiles/core/166/filelists/strongswan b/config/rootfiles/core/166/filelists/strongswan
new file mode 120000
index 000000000..90c727e26
--- /dev/null
+++ b/config/rootfiles/core/166/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/166/update.sh b/config/rootfiles/core/166/update.sh
index 1370555b0..4c1c1e483 100644
--- a/config/rootfiles/core/166/update.sh
+++ b/config/rootfiles/core/166/update.sh
@@ -46,6 +46,7 @@ gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617
 unset GNUPGHOME
 
 # Stop services
+/etc/init.d/ipsec stop
 
 # Extract files
 extract_files
@@ -69,6 +70,9 @@ perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::oinkmaster();"
 # Start services
 /etc/init.d/apache restart
 /etc/init.d/sshd restart
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+       /etc/init.d/ipsec start
+fi
 
 # This update needs a reboot...
 touch /var/run/need_reboot
diff --git a/lfs/strongswan b/lfs/strongswan
index 45ff8f426..63699c5d7 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info(a)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.4
+VER        = 5.9.5
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9c387eb77f0159fdefbcf7e81c905c35
+$(DL_FILE)_MD5 = 53005324e3cba8592f1fb958b1c2d0e5
 
 install : $(TARGET)
 


hooks/post-receive
--
IPFire 2.x development tree