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

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 5909 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  c4710adcbc8d4b6aa5c5c4c0a48a3c7b5f809ab9 (commit)
       via  872619f5ec46dbc9e167edb946633747fbc8a5c6 (commit)
       via  959497f90f6b76df1593e7ba609045bfa1f57104 (commit)
       via  c7e223e592b2b52888a96fd7e357b869fd251649 (commit)
      from  a8af2483a14ecc4048143c864d88c925cbb7af91 (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 c4710adcbc8d4b6aa5c5c4c0a48a3c7b5f809ab9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 16 15:04:02 2023 +0000

    Update credits.cgi
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 872619f5ec46dbc9e167edb946633747fbc8a5c6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 16 15:03:18 2023 +0000

    core179: Ask users to reboot after this update
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 959497f90f6b76df1593e7ba609045bfa1f57104
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 16 15:02:48 2023 +0000

    core179: Restart OpenVPN services during the update
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit c7e223e592b2b52888a96fd7e357b869fd251649
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Aug 16 14:35:30 2023 +0200

    openvpn: Update to version 2.5.9
    
    - Update from version 2.5.8 to 2.5.9 which is the last version in the 2.5 series
    - Update of rootfile not required
    - Tested openvpn-2.5.9 in my vm testbed. OpenVPN RW connection worked fine. Also tested
       OpenVPN N2N connection with CU179 & OpenVPN version 2.5.9 at one end and CU177 &
       OpenVPN version 2.5.8 at the other end. N2N connection worked with no problemns.
    - Changelog
        2.5.9
          Implement optional cipher in --data-ciphers prefixed with ?
          Fix handling an optional invalid cipher at the end of data-ciphers
          Ensure that argument to parse_line has always space for final sentinel
          Improve documentation on user/password requirement and unicodize function
          Remove unused gc_arena
          Fix corner case that might lead to leaked file descriptor
          msvc: always call git-version.py
          git-version.py: proper support for tags
          Check if pkcs11_cert is NULL before freeing it
          Do not add leading space to pushed options
          pull-filter: ignore leading "spaces" in option names
          Do not include auth-token in pulled option digest
    
    Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/179/update.sh | 6 +++++-
 html/cgi-bin/credits.cgi            | 2 +-
 lfs/openvpn                         | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/179/update.sh b/config/rootfiles/core/179/update.sh
index 110335d13..636792d82 100644
--- a/config/rootfiles/core/179/update.sh
+++ b/config/rootfiles/core/179/update.sh
@@ -50,6 +50,8 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
 
 # Extract files
 extract_files
@@ -85,9 +87,11 @@ migrate_extrahd
 # Start services
 /etc/init.d/udev restart
 /etc/init.d/squid restart
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
 
 # This update needs a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 4803f2dd7..2d9697a65 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -63,8 +63,8 @@ print <<END
 Michael Tremer,
 Arne Fitzenreiter,
 Peter Müller,
-Stefan Schantl,
 Adolf Belka,
+Stefan Schantl,
 Matthias Fischer,
 Christian Schmidt,
 Alexander Marx,
diff --git a/lfs/openvpn b/lfs/openvpn
index db2246206..b71b4ccc9 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2023  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        = 2.5.8
+VER        = 2.5.9
 
 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = d029f6facd94a82aa28765cab340130dd4e5a4ffc2e0ccf3bf4888aee52d337126c21fdd7304dbaad5fe67d0a1f8d44e5a3c44801dcfa935aef200675ac5167f
+$(DL_FILE)_BLAKE2 = e5110ebb9149121c11de45f085f66d30a89fb674ad96c5792d83b16dc29c95215a91e682adb3c800b91ed4d88d6d24b5bcae0799cdb855a284832f0668ffcb82
 
 install : $(TARGET)
 


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