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

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 5572 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  5e5a470399cc2f1b377de7ecacfd1dffe90b89fc (commit)
       via  31098f84abea3288c775339f432a492e4abeeb6b (commit)
       via  5ad244623711541969613a883012af3d13fa364b (commit)
       via  820edb2374ef3af02e8fa37a4b1acebefcc6317c (commit)
      from  e8ecc81a70f504430f2f0791789de4778f938fe3 (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 5e5a470399cc2f1b377de7ecacfd1dffe90b89fc
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Nov 29 11:52:18 2020 +0100

    Core 153: Update ownership of "/var/ipfire/red".
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 31098f84abea3288c775339f432a492e4abeeb6b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Nov 29 11:52:17 2020 +0100

    configroot: Change ownership of "/var/ipfire/red" to nobody.
    
    Otherwise the WUI is not allowed to put and release the nobeep file in
    this folder and the desired functionality does not work.
    
    Fixes #12385.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5ad244623711541969613a883012af3d13fa364b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Dec 1 16:12:43 2020 +0000

    core153: Ship openvpn
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 820edb2374ef3af02e8fa37a4b1acebefcc6317c
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Wed Nov 25 22:26:03 2020 +0000

    OpenVPN: Update to version 2.5.0
    
    Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
    Tested-by: Adolf Belka <ahb.ipfire(a)gmail.com>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/openvpn                              | 1 -
 config/rootfiles/{oldcore/100 => core/153}/filelists/openvpn | 0
 config/rootfiles/core/153/update.sh                          | 7 +++++++
 lfs/configroot                                               | 2 +-
 lfs/openvpn                                                  | 4 ++--
 5 files changed, 10 insertions(+), 4 deletions(-)
 copy config/rootfiles/{oldcore/100 => core/153}/filelists/openvpn (100%)

Difference in files:
diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index 547842db3..41ccc885e 100644
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -19,7 +19,6 @@ usr/sbin/openvpn
 #usr/share/doc/openvpn/README.down-root
 #usr/share/doc/openvpn/README.mbedtls
 #usr/share/doc/openvpn/management-notes.txt
-#usr/share/man/man8/openvpn.8
 var/ipfire/ovpn/ca
 var/ipfire/ovpn/caconfig
 var/ipfire/ovpn/ccd
diff --git a/config/rootfiles/core/153/filelists/openvpn b/config/rootfiles/core/153/filelists/openvpn
new file mode 120000
index 000000000..493f3f7a4
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/153/update.sh b/config/rootfiles/core/153/update.sh
index f94cf4925..08adaf797 100644
--- a/config/rootfiles/core/153/update.sh
+++ b/config/rootfiles/core/153/update.sh
@@ -90,6 +90,8 @@ rm -rf /lib/modules
 
 # Stop services
 /etc/init.d/ipsec stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
 
 # Extract files
 extract_files
@@ -100,6 +102,9 @@ ldconfig
 # Update permissions
 chown -vR root:root /etc/ntp
 
+# Update owernship of "/var/ipfire/red"
+chown nobody:nobody /var/ipfire/red
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
@@ -116,6 +121,8 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
     /etc/init.d/ipsec start
 fi
 /etc/init.d/suricata restart
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
 
 # Reload sysctl.conf
 sysctl -p
diff --git a/lfs/configroot b/lfs/configroot
index 0afacebaf..a37c2c401 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -171,7 +171,7 @@ $(TARGET) :
 	# Configroot permissions
 	chown -R nobody:nobody $(CONFIG_ROOT)
 	chown      root:root   $(CONFIG_ROOT)
-	for i in backup/ header.pl general-functions.pl graphs.pl lang.pl addon-lang/ langs/ red/ ; do \
+	for i in backup/ header.pl general-functions.pl graphs.pl lang.pl addon-lang/ langs/ ; do \
             chown -R root:root $(CONFIG_ROOT)/$$i; \
 	done
 	chown -Rv root:root $(CONFIG_ROOT)/*/bin
diff --git a/lfs/openvpn b/lfs/openvpn
index 779bf5520..b026d515b 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.9
+VER        = 2.5.0
 
 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 446df6dc29364d00929ea9c725412cb8
+$(DL_FILE)_MD5 = ba426e2217833b522810d6c06f7cc8f7
 
 install : $(TARGET)
 


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