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

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

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 5518 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  9ea8de7c39ee35d6fcabc3bfca4a7754344e6610 (commit)
       via  bbbb0b9e01d342a5a5b4db14a37641a427786844 (commit)
       via  ee7944fe32e49c73abcaeb2509c1f1630b645b32 (commit)
      from  6619aed611693d4bca7c009867c838b2fbaf85ac (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 9ea8de7c39ee35d6fcabc3bfca4a7754344e6610
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Dec 17 14:48:00 2022 +0000

    Revert "lsof: Update to version 4.96.4"
    
    This reverts commit 80274cc875304fa2c1e83b9e25ca8cbcb9805e33.
    
    See: #13015
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit bbbb0b9e01d342a5a5b4db14a37641a427786844
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Dec 17 14:46:32 2022 +0000

    backup(.pl): Replace OpenVPN DH parameter with ffdhe4096
    
    This ensures restoring a backup won't silently bring back an insecure
    Diffie-Hellman parameter (which could also not be inspected through the
    web interface anymore).
    
    Reported-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit ee7944fe32e49c73abcaeb2509c1f1630b645b32
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sat Dec 17 14:44:49 2022 +0000

    Core Updatr 172: Properly replace DH parameter in /var/ipfire/ovpn/n2nconf/*/*.conf
    
    https://lists.ipfire.org/pipermail/development/2022-December/015001.html
    
    Reported-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

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

Summary of changes:
 config/backup/backup.pl             |  3 +++
 config/rootfiles/core/172/update.sh |  8 +-------
 lfs/lsof                            | 10 +++++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 6fd9e45bb..96e794439 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -184,6 +184,9 @@ restore_backup() {
 	# move nobeeps if exist
 	[ -e "/var/ipfire/ppp/nobeeps" ] && mv /var/ipfire/ppp/nobeeps /var/ipfire/red/nobeeps
 
+	# Replace previously used OpenVPN Diffie-Hellman parameter by ffdhe4096
+	sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/server.conf /var/ipfire/ovpn/n2nconf/*/*.conf
+
 	# Update OpenVPN CRL
 	/etc/fcron.daily/openvpn-crl-updater
 
diff --git a/config/rootfiles/core/172/update.sh b/config/rootfiles/core/172/update.sh
index 585943950..dffe090d8 100644
--- a/config/rootfiles/core/172/update.sh
+++ b/config/rootfiles/core/172/update.sh
@@ -155,13 +155,7 @@ done
 chown -Rv root:root /var/ipfire/connscheduler/lib.pl /var/ipfire/updatexlrator/updxlrator-lib.pl /var/ipfire/menu.d/*
 
 # Replace existing OpenVPN Diffie-Hellman parameter by ffdhe4096, as specified in RFC 7919
-if [ -f /var/ipfire/ovpn/server.conf ]; then
-	sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/server.conf
-fi
-
-if [ -f "/var/ipfire/ovpn/n2nconf/*/*.conf" ]; then
-	sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/n2nconf/*/*.conf
-fi
+sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/server.conf /var/ipfire/ovpn/n2nconf/*/*.conf
 
 # Start services
 if grep -q "ENABLE_IDS=on" /var/ipfire/suricata/settings; then
diff --git a/lfs/lsof b/lfs/lsof
index 055643870..eefaf35f5 100644
--- a/lfs/lsof
+++ b/lfs/lsof
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2018  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,10 +24,10 @@
 
 include Config
 
-VER        = 4.96.4
+VER        = 4.95.0.linux
 
-THISAPP    = lsof-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = lsof_$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = c420e2f928ffa8148a62298ba7176f860b15f9e78f4c2dc299162614a1d9b94a85c42ee93ef5e92b8a99f1c67e496cf2c848874b844c22c287aab53bfe211c58
+$(DL_FILE)_BLAKE2 = 6a7d6353ec7f0f1e14416bff98867e64009c3f3901110c947f845bb3dcf9af3d40755c7ac6d586412a61778bc8ac355d2388cf2cfa8a975dbf4870c339c75a8c
 
 install : $(TARGET)
 


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