From 9cf5ea1346eb1c0369d88fdd434c27fc5aaeb311 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 21 May 2024 08:37:52 +0200 Subject: [PATCH] www/squid: fix another bug due to netaddr/ipaddr switch --- www/squid/Makefile | 2 +- www/squid/pkg-descr | 2 ++ .../src/opnsense/service/templates/OPNsense/Proxy/wpad.dat | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index debbe26ca..cfc272dd5 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= squid PLUGIN_VERSION= 1.0 -PLUGIN_REVISION= 1 +PLUGIN_REVISION= 2 PLUGIN_COMMENT= Squid is a caching proxy for the web PLUGIN_DEPENDS= squid squid-langpack PLUGIN_TIER= 2 diff --git a/www/squid/pkg-descr b/www/squid/pkg-descr index 2e0b72da4..2840d1808 100644 --- a/www/squid/pkg-descr +++ b/www/squid/pkg-descr @@ -8,3 +8,5 @@ Plugin Changelog 1.0 * Initial version based on the OPNsense 23.7.12 core code +* Workaround for segmentation faults using OpenSSL legacy provider +* Correct migration to Python ipaddress library use diff --git a/www/squid/src/opnsense/service/templates/OPNsense/Proxy/wpad.dat b/www/squid/src/opnsense/service/templates/OPNsense/Proxy/wpad.dat index cd4aeaabc..d85f1027f 100644 --- a/www/squid/src/opnsense/service/templates/OPNsense/Proxy/wpad.dat +++ b/www/squid/src/opnsense/service/templates/OPNsense/Proxy/wpad.dat @@ -51,11 +51,11 @@ function FindProxyForURL(url, host) { {% endif %} {% if match.match_type == 'destination_in_net' %} {% set tmp_net = helpers.getIPNetwork(match.network) %} -{% set match_script = match_script + 'isInNet(dstip, "' + tmp_net.network.__str__() + '", "' + tmp_net.netmask.__str__() + '")' %} +{% set match_script = match_script + 'isInNet(dstip, "' + tmp_net.network_address.__str__() + '", "' + tmp_net.netmask.__str__() + '")' %} {% endif %} {% if match.match_type == 'my_ip_in_net' %} {% set tmp_net = helpers.getIPNetwork(match.network) %} -{% set match_script = match_script + 'isInNet(myIpAddress(), "' + tmp_net.network.__str__() + '", "' + tmp_net.netmask.__str__() + '")' %} +{% set match_script = match_script + 'isInNet(myIpAddress(), "' + tmp_net.network_address.__str__() + '", "' + tmp_net.netmask.__str__() + '")' %} {% endif %} {% if match.match_type == 'plain_hostname' %} {% set match_script = match_script + 'isPlainHostName(host)' %}