From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 3a86abcf49861f24f51366657e5dadddfb4c3804
Date: Sun, 25 Jun 2023 21:00:14 +0000
Message-ID: <4Qq3Jt22Rtz2xdh@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2963641216364201420=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2963641216364201420==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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  3a86abcf49861f24f51366657e5dadddfb4c3804 (commit)
       via  854d5e777ee7a8c12e63fa455f2a5283fb7c3c1e (commit)
      from  b35bbd2ba20013d941a19a79f3b40eb991b575f7 (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 3a86abcf49861f24f51366657e5dadddfb4c3804
Author: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
Date:   Sun Jun 25 20:59:55 2023 +0000

    Core Update 176: Ship and restart strongSwan
   =20
    Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>

commit 854d5e777ee7a8c12e63fa455f2a5283fb7c3c1e
Author: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
Date:   Sun Jun 25 20:58:17 2023 +0000

    strongswan: Update to 5.9.11
   =20
    Please refer to
    https://github.com/strongswan/strongswan/releases/tag/5.9.11 for the
    release notes of this update.
   =20
    Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>

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

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

Difference in files:
diff --git a/config/rootfiles/core/176/filelists/strongswan b/config/rootfile=
s/core/176/filelists/strongswan
new file mode 120000
index 000000000..90c727e26
--- /dev/null
+++ b/config/rootfiles/core/176/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/176/update.sh b/config/rootfiles/core/176/=
update.sh
index d802da6a4..9c0ef54e4 100644
--- a/config/rootfiles/core/176/update.sh
+++ b/config/rootfiles/core/176/update.sh
@@ -33,6 +33,7 @@ done
=20
 # Stop services
 /etc/init.d/suricata stop
+/etc/rc.d/init.d/ipsec stop
=20
 # Extract files
 extract_files
@@ -58,6 +59,9 @@ ldconfig
 # Start services
 telinit u
 /etc/init.d/suricata start
+if grep -q "ENABLED=3Don" /var/ipfire/vpn/settings; then
+	/etc/rc.d/init.d/ipsec start
+fi
=20
 # Rebuild initial ramdisk to apply microcode updates
 dracut --regenerate-all --force
diff --git a/lfs/strongswan b/lfs/strongswan
index 7cb886fe7..357283b15 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 5.9.10
+VER        =3D 5.9.11
=20
 THISAPP    =3D strongswan-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D 757d55aa0c623356c5d8bf0360df63990ec18294d06f50b6dd4752=
73b75a883354ea8723708e4856a8f0acc4d3237ac6bcf5adc40346fded7051d78375b2bcc9
+$(DL_FILE)_BLAKE2 =3D e8e84d79d1530b9a968ce8429fec0e7b3fcf19b75fdbd4371a3876=
3d8564d5b37d012769006330b5c94cff3e914acb1b1a3e2829749effb8c35f9e5d775be491
=20
 install : $(TARGET)
=20


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

--===============2963641216364201420==--