From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 79fb08749b6d9304818d3bada92302cdfab682c0 Date: Sun, 18 Sep 2022 08:03:32 +0000 Message-ID: <4MVgKx2bWLz2xdl@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3925040867360434601==" List-Id: --===============3925040867360434601== 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 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=C3=BCller Date: Sun Sep 18 08:02:14 2022 +0000 Core Update 171: Stop Apache before applying the upgrade =20 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. =20 Signed-off-by: Peter M=C3=BCller commit 3ce996ffc3bb0c0c4f0cadc2442f8417b9cab172 Author: Peter M=C3=BCller Date: Sun Sep 18 08:01:18 2022 +0000 Core Update 171: Only start services if they are actually enabled =20 Signed-off-by: Peter M=C3=BCller commit 78ba0514867f5b0bff0f15dd8600c8969a5f63b5 Author: Peter M=C3=BCller Date: Sun Sep 18 07:58:39 2022 +0000 Core Update 171: Ship and restart strongSwan =20 Signed-off-by: Peter M=C3=BCller commit 4943252194a553dea1475a709f0ef1fbbc9e51c5 Author: Peter M=C3=BCller Date: Sat Sep 17 08:21:23 2022 +0000 strongSwan: Update to 5.9.7 =20 Please refer to https://github.com/strongswan/strongswan/releases/tag/5.9= .7 for the release notes of this version. =20 Signed-off-by: Peter M=C3=BCller ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 1 - .../{oldcore/106 =3D> 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 =3D> core/171}/filelists/strongswan (100%) Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/str= ongswan 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/rootfile= s/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=3D1; i<=3D$core; i++ )); do done =20 # 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 =20 # Remove files rm -rvf \ @@ -147,8 +149,16 @@ ldconfig /usr/local/bin/filesystem-cleanup =20 # Start services -/etc/init.d/squid start -/etc/init.d/openvpn start +/etc/rc.d/init.d/apache start +if grep -q "ENABLED=3Don" /var/ipfire/ovpn/settings; then + /etc/init.d/openvpn start +fi +if grep -q "ENABLED=3Don" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec start +fi +if -f /var/ipfire/proxy/enable; then + /etc/init.d/squid start +fi =20 # 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 @@ =20 include Config =20 -VER =3D 5.9.6 +VER =3D 5.9.7 =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 4021a10611e66f9e2e4e432bdfb9de0f94d27ba1be1b7d4e4b8bf3= cd797c123658993e60eb3d49c424b479558e9581bb069a345a70f55850d1faf5abaa401246 +$(DL_FILE)_BLAKE2 =3D 062f80431aefabfa4ba03454c3ab80e278772ebbd2bdeb69de9879= 6f6e1bd7fc17d161e23b74bb238378eedc005079ff14e64e9a8967e2bf4f159a076e9f6384 =20 install : $(TARGET) =20 hooks/post-receive -- IPFire 2.x development tree --===============3925040867360434601==--