[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 79fb08749b6d9304818d3bada92302cdfab682c0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 79fb08749b6d9304818d3bada92302cdfab682c0

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 5294 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  79fb08749b6d9304818d3bada92302cdfab682c0 (commit)
       via  3ce996ffc3bb0c0c4f0cadc2442f8417b9cab172 (commit)
       via  78ba0514867f5b0bff0f15dd8600c8969a5f63b5 (commit)
       via  4943252194a553dea1475a709f0ef1fbbc9e51c5 (commit)
      from  8017c5cf1f972301c3728da23f26dc29d611119f (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 79fb08749b6d9304818d3bada92302cdfab682c0
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Sep 18 08:02:14 2022 +0000

    Core Update 171: Stop Apache before applying the upgrade
    
    Since we replace Perl, users most likely get to see some nasty "Internal
    Server Error" messages during the upgrade. To suppres them, and to limit
    the chance of side effects, stop Apache before applying the update, and
    start it again afterwards.
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 3ce996ffc3bb0c0c4f0cadc2442f8417b9cab172
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Sep 18 08:01:18 2022 +0000

    Core Update 171: Only start services if they are actually enabled
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 78ba0514867f5b0bff0f15dd8600c8969a5f63b5
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Sep 18 07:58:39 2022 +0000

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

commit 4943252194a553dea1475a709f0ef1fbbc9e51c5
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Sep 17 08:21:23 2022 +0000

    strongSwan: Update to 5.9.7
    
    Please refer to https://github.com/strongswan/strongswan/releases/tag/5.9.7
    for the release notes of this version.
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/strongswan                         |  1 -
 .../{oldcore/106 => core/171}/filelists/strongswan         |  0
 config/rootfiles/core/171/update.sh                        | 14 ++++++++++++--
 lfs/strongswan                                             |  4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)
 copy config/rootfiles/{oldcore/106 => core/171}/filelists/strongswan (100%)

Difference in files:
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index e9d84808a..dd0fd233a 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -168,7 +168,6 @@ usr/lib/ipsec/plugins/libstrongswan-xauth-generic.so
 usr/lib/ipsec/plugins/libstrongswan-xauth-noauth.so
 usr/lib/ipsec/plugins/libstrongswan-xcbc.so
 #usr/libexec/ipsec
-usr/libexec/ipsec/_copyright
 usr/libexec/ipsec/_updown
 usr/libexec/ipsec/charon
 usr/libexec/ipsec/scepclient
diff --git a/config/rootfiles/core/171/filelists/strongswan b/config/rootfiles/core/171/filelists/strongswan
new file mode 120000
index 000000000..90c727e26
--- /dev/null
+++ b/config/rootfiles/core/171/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh
index 3b961ee9e..48fd742b5 100644
--- a/config/rootfiles/core/171/update.sh
+++ b/config/rootfiles/core/171/update.sh
@@ -32,8 +32,10 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/etc/rc.d/init.d/apache stop
 /etc/rc.d/init.d/squid stop
 /etc/rc.d/init.d/openvpn stop
+/etc/rc.d/init.d/ipsec stop
 
 # Remove files
 rm -rvf \
@@ -147,8 +149,16 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
 
 # Start services
-/etc/init.d/squid start
-/etc/init.d/openvpn start
+/etc/rc.d/init.d/apache start
+if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
+	/etc/init.d/openvpn start
+fi
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+	/etc/init.d/ipsec start
+fi
+if -f /var/ipfire/proxy/enable; then
+	/etc/init.d/squid start
+fi
 
 # This update needs a reboot...
 touch /var/run/need_reboot
diff --git a/lfs/strongswan b/lfs/strongswan
index a32c103d7..01b15f152 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.9.6
+VER        = 5.9.7
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 4021a10611e66f9e2e4e432bdfb9de0f94d27ba1be1b7d4e4b8bf3cd797c123658993e60eb3d49c424b479558e9581bb069a345a70f55850d1faf5abaa401246
+$(DL_FILE)_BLAKE2 = 062f80431aefabfa4ba03454c3ab80e278772ebbd2bdeb69de98796f6e1bd7fc17d161e23b74bb238378eedc005079ff14e64e9a8967e2bf4f159a076e9f6384
 
 install : $(TARGET)
 


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