From mboxrd@z Thu Jan 1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
9ea8de7c39ee35d6fcabc3bfca4a7754344e6610
Date: Sat, 17 Dec 2022 14:49:10 +0000
Message-ID: <4NZ84Q4f97z2xlh@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5086899635241564001=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============5086899635241564001==
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 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=C3=BCller <peter.mueller(a)ipfire.org>
Date: Sat Dec 17 14:48:00 2022 +0000
Revert "lsof: Update to version 4.96.4"
=20
This reverts commit 80274cc875304fa2c1e83b9e25ca8cbcb9805e33.
=20
See: #13015
Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
commit bbbb0b9e01d342a5a5b4db14a37641a427786844
Author: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
Date: Sat Dec 17 14:46:32 2022 +0000
backup(.pl): Replace OpenVPN DH parameter with ffdhe4096
=20
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).
=20
Reported-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
commit ee7944fe32e49c73abcaeb2509c1f1630b645b32
Author: Peter M=C3=BCller <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/n2ncon=
f/*/*.conf
=20
https://lists.ipfire.org/pipermail/development/2022-December/015001.html
=20
Reported-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Peter M=C3=BCller <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
=20
+ # Replace previously used OpenVPN Diffie-Hellman parameter by ffdhe4096
+ sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfi=
re/ovpn/server.conf /var/ipfire/ovpn/n2nconf/*/*.conf
+
# Update OpenVPN CRL
/etc/fcron.daily/openvpn-crl-updater
=20
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/updatexlrat=
or/updxlrator-lib.pl /var/ipfire/menu.d/*
=20
# Replace existing OpenVPN Diffie-Hellman parameter by ffdhe4096, as specifi=
ed 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/ipfi=
re/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/ipfi=
re/ovpn/n2nconf/*/*.conf
-fi
+sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfir=
e/ovpn/server.conf /var/ipfire/ovpn/n2nconf/*/*.conf
=20
# Start services
if grep -q "ENABLE_IDS=3Don" /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 @@
=20
include Config
=20
-VER =3D 4.96.4
+VER =3D 4.95.0.linux
=20
-THISAPP =3D lsof-$(VER)
-DL_FILE =3D $(THISAPP).tar.gz
+THISAPP =3D lsof_$(VER)
+DL_FILE =3D $(THISAPP).tar.bz2
DL_FROM =3D $(URL_IPFIRE)
DIR_APP =3D $(DIR_SRC)/$(THISAPP)
TARGET =3D $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D c420e2f928ffa8148a62298ba7176f860b15f9e78f4c2dc2991626=
14a1d9b94a85c42ee93ef5e92b8a99f1c67e496cf2c848874b844c22c287aab53bfe211c58
+$(DL_FILE)_BLAKE2 =3D 6a7d6353ec7f0f1e14416bff98867e64009c3f3901110c947f845b=
b3dcf9af3d40755c7ac6d586412a61778bc8ac355d2388cf2cfa8a975dbf4870c339c75a8c
=20
install : $(TARGET)
=20
hooks/post-receive
--
IPFire 2.x development tree
--===============5086899635241564001==--