From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 70ccbf30f34e47563dae9487a339e50f7ceaccf9
Date: Wed, 24 May 2023 10:03:04 +0000
Message-ID: <4QR6FP1C3kz2xp9@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2454636561603710774=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2454636561603710774==
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  70ccbf30f34e47563dae9487a339e50f7ceaccf9 (commit)
       via  bd313e31b8f063e2e3db290782b206534cf8563d (commit)
      from  9fae7ab32b1dacf9c6476e9733f6ebe905343aa8 (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 70ccbf30f34e47563dae9487a339e50f7ceaccf9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 24 10:02:00 2023 +0000

    Revert "update.sh: Adds code to update an existing ovpnconfig with pass o=
r no-pass"
   =20
    This reverts commit 9cac1034bcfe423c4a5e0f547664fbabcf9050e6.
   =20
    https://lists.ipfire.org/pipermail/development/2023-May/015952.html
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit bd313e31b8f063e2e3db290782b206534cf8563d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 24 10:00:19 2023 +0000

    Revert "core175: Ship updated clwarn.cgi"
   =20
    This reverts commit 9fae7ab32b1dacf9c6476e9733f6ebe905343aa8.
   =20
    This file is not part of the core distribution, but part of the
    squidclamav package.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/175/filelists/files |  1 -
 config/rootfiles/core/175/update.sh       | 24 ------------------------
 lfs/squidclamav                           |  2 +-
 3 files changed, 1 insertion(+), 26 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/175/filelists/files b/config/rootfiles/cor=
e/175/filelists/files
index 7cbed4a21..01a32e672 100644
--- a/config/rootfiles/core/175/filelists/files
+++ b/config/rootfiles/core/175/filelists/files
@@ -85,7 +85,6 @@ lib/firmware/rtw89/rtw8852b_fw-1.bin
 srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
-srv/web/ipfire/html/clwarn.cgi
 srv/web/ipfire/html/images/openvpn_encrypted.png
 usr/lib/dracut/dracut.conf.d/ipfire.conf
 usr/lib/firewall/rules.pl
diff --git a/config/rootfiles/core/175/update.sh b/config/rootfiles/core/175/=
update.sh
index 83303a1c3..5e45c819f 100644
--- a/config/rootfiles/core/175/update.sh
+++ b/config/rootfiles/core/175/update.sh
@@ -177,30 +177,6 @@ if [ -e /boot/pakfire-kernel-update ]; then
     /boot/pakfire-kernel-update ${KVER}
 fi
=20
-## Modify ovpnconfig according to bug 11048 for pass, no-pass modification i=
n ovpnconfig index
-# Check if ovpnconfig exists and is not empty
-if [ -s /var/ipfire/ovpn/ovpnconfig ]; then
-       # Make all N2N connections 'no-pass' since they do not use encryption
-       awk '{FS=3DOFS=3D","} {if($5=3D=3D"net") {$43=3D"no-pass"; print $0}}=
' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new
-
-       # Evaluate roadwarrior connection names for *.p12 files
-       for y in $(awk -F',' '/host/ { print $3 }' /var/ipfire/ovpn/ovpnconfi=
g); do
-           # Sort all unencrypted roadwarriors out and set 'no-pass' in [43]=
 index
-               if [[ -n $(openssl pkcs12 -info -in /var/ipfire/ovpn/certs/${=
y}.p12 -noout -password pass:'' 2>&1 | grep 'Encrypted') ]]; then
-                       awk -v var=3D"$y" '{FS=3DOFS=3D","} {if($3=3D=3Dvar) =
{$43=3D"no-pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn=
/ovpnconfig.new
-               fi
-	    # Sort all encrypted roadwarriors out and set 'pass' in [43] index
-               if [[ -n $(openssl pkcs12 -info -in /var/ipfire/ovpn/certs/${=
y}.p12 -noout -password pass:'' 2>&1 | grep 'error')  ]]; then
-                       awk -v var=3D"$y" '{FS=3DOFS=3D","} {if($3=3D=3Dvar) =
{$43=3D"pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ov=
pnconfig.new
-               fi
-       done
-fi
-
-# Replace existing ovpnconfig with updated index
-mv /var/ipfire/ovpn/ovpnconfig.new /var/ipfire/ovpn/ovpnconfig
-# Set correct ownership
-chown nobody:nobody /var/ipfire/ovpn/ovpnconfig
-
 # This update needs a reboot...
 touch /var/run/need_reboot
=20
diff --git a/lfs/squidclamav b/lfs/squidclamav
index d3bb673f3..06133c5de 100644
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -34,7 +34,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D squidclamav
-PAK_VER    =3D 21
+PAK_VER    =3D 22
=20
 DEPS       =3D clamav
=20


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

--===============2454636561603710774==--