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, master 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@ipfire.org Date: Wed May 24 10:02:00 2023 +0000

Revert "update.sh: Adds code to update an existing ovpnconfig with pass or no-pass"

This reverts commit 9cac1034bcfe423c4a5e0f547664fbabcf9050e6.

https://lists.ipfire.org/pipermail/development/2023-May/015952.html

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit bd313e31b8f063e2e3db290782b206534cf8563d Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 24 10:00:19 2023 +0000

Revert "core175: Ship updated clwarn.cgi"

This reverts commit 9fae7ab32b1dacf9c6476e9733f6ebe905343aa8.

This file is not part of the core distribution, but part of the squidclamav package.

Signed-off-by: Michael Tremer michael.tremer@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/core/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

-## Modify ovpnconfig according to bug 11048 for pass, no-pass modification in 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=OFS=","} {if($5=="net") {$43="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/ovpnconfig); 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="$y" '{FS=OFS=","} {if($3==var) {$43="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="$y" '{FS=OFS=","} {if($3==var) {$43="pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.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

diff --git a/lfs/squidclamav b/lfs/squidclamav index d3bb673f3..06133c5de 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 21 +PAK_VER = 22

DEPS = clamav

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