From 5e6a6e21c857ff5047c73df0c396dca7a7043bea Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 16 Jan 2025 12:36:10 +0100
Subject: [PATCH] www/squid: sync with master

---
 www/squid/Makefile                                             | 1 +
 .../opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml | 3 ++-
 www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml | 1 -
 .../service/templates/OPNsense/Syslog/local/squid_access.conf  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 30e2f86cd..a70692d4f 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		squid
 PLUGIN_VERSION=		1.1
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		Squid is a caching proxy for the web
 PLUGIN_DEPENDS=		squid squid-langpack
 PLUGIN_TIER=		2
diff --git a/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml b/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
index 7671a7f47..998bd76b4 100644
--- a/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
+++ b/www/squid/src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/main.xml
@@ -343,7 +343,8 @@
                 <id>proxy.forward.workers</id>
                 <label>Number of squid workers</label>
                 <type>text</type>
-                <help>Start N main Squid process daemons (i.e., SMP mode). Requires Restart. Default: 1</help>
+                <help>Start N main Squid process daemons (i.e., SMP mode). Requires Restart. Do not enable when using local cache.</help>
+                <hint>1</hint>
                 <advanced>true</advanced>
             </field>
             <field>
diff --git a/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index 1c04b1f6b..3d77eabfe 100644
--- a/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -283,7 +283,6 @@
               <ValidationMessage>Please enter ip addresses or domain names here</ValidationMessage>
             </sslnobumpsites>
             <workers type="IntegerField">
-              <Default>1</Default>
               <MinimumValue>1</MinimumValue>
               <MaximumValue>100</MaximumValue>
               <ValidationMessage>worker number needs to be an integer value between 1 and 100</ValidationMessage>
diff --git a/www/squid/src/opnsense/service/templates/OPNsense/Syslog/local/squid_access.conf b/www/squid/src/opnsense/service/templates/OPNsense/Syslog/local/squid_access.conf
index 159dcb563..1b81f08a7 100644
--- a/www/squid/src/opnsense/service/templates/OPNsense/Syslog/local/squid_access.conf
+++ b/www/squid/src/opnsense/service/templates/OPNsense/Syslog/local/squid_access.conf
@@ -2,5 +2,5 @@
 # Local syslog-ng configuration filter definition [squid_access].
 ###################################################################
 filter f_local_squid_access {
-    program("^(squid-|squid-coord-)\\d+");
+    program("squid-*");
 };