OPNSense/core 73d6ea2src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes FilterRuleField.php

Remove this shadowing of the interface variable which came from the earlier merge conflict with master
DeltaFile
+0-3src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+0-31 files

OPNSense/src 5bd9fa7sys/netinet ip_divert.c

divert: Fix removal of divert sockets from a group
DeltaFile
+16-2sys/netinet/ip_divert.c
+16-21 files

OPNSense/core efe726fsrc/opnsense/scripts/unbound-dnsbl/lib dnsbl.py

unbound: clean up marker and size files, closes #9489 (#9491)

* unbound: clean up marker and size files, closes #9489

* unbound: ditch dnsbl_available and bind around self.dnsbl

* unbound: ditch chained comparison
DeltaFile
+29-28src/opnsense/scripts/unbound-dnsbl/lib/dnsbl.py
+29-281 files

OPNSense/plugins 9d6a12dnet/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd Relayd.xml

net/relayd: style
DeltaFile
+357-357net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Relayd.xml
+357-3571 files

OPNSense/plugins 938cd94net/radsecproxy/src/opnsense/mvc/app/models/OPNsense/RadSecProxy RadSecProxy.xml

net/radsecproxy: style
DeltaFile
+0-74net/radsecproxy/src/opnsense/mvc/app/models/OPNsense/RadSecProxy/RadSecProxy.xml
+0-741 files

OPNSense/plugins 2039748net/ftp-proxy/src/opnsense/mvc/app/models/OPNsense/FtpProxy FtpProxy.xml

net/ftp-proxy: style
DeltaFile
+75-75net/ftp-proxy/src/opnsense/mvc/app/models/OPNsense/FtpProxy/FtpProxy.xml
+75-751 files

OPNSense/plugins 8516ed0sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut Nut.xml

sutils/nut: style
DeltaFile
+149-154sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Nut.xml
+149-1541 files

OPNSense/plugins e8a05cbnet-mgmt/nrpe/src/opnsense/mvc/app/models/OPNsense/Nrpe General.xml Command.xml

net-mgmt/nrpe: style
DeltaFile
+0-2net-mgmt/nrpe/src/opnsense/mvc/app/models/OPNsense/Nrpe/General.xml
+0-1net-mgmt/nrpe/src/opnsense/mvc/app/models/OPNsense/Nrpe/Command.xml
+0-32 files

OPNSense/plugins 1f2af6bnet-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp General.xml User.xml

net-mgmt/net-snmp: style
DeltaFile
+3-14net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml
+3-6net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/User.xml
+6-202 files

OPNSense/plugins 66a47b8mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd RSpamd.xml

mail/rspamd: style
DeltaFile
+495-512mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
+495-5121 files

OPNSense/plugins e164391sysutils/sftp-backup/src/opnsense/mvc/app/models/OPNsense/Backup SftpSettings.xml

sysutils/sftp-backup: style
DeltaFile
+12-12sysutils/sftp-backup/src/opnsense/mvc/app/models/OPNsense/Backup/SftpSettings.xml
+12-121 files

OPNSense/plugins e591bd7www/web-proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO ProxySSO.xml

www/web-proxy-sso: style
DeltaFile
+19-19www/web-proxy-sso/src/opnsense/mvc/app/models/OPNsense/ProxySSO/ProxySSO.xml
+19-191 files

OPNSense/plugins c8a35eawww/squid/src/opnsense/mvc/app/models/OPNsense/Proxy Proxy.xml

www/squid: style
DeltaFile
+216-216www/squid/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+216-2161 files

OPNSense/plugins c93a745www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP General.xml Antivirus.xml

www/c-icap: style
DeltaFile
+11-17www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/General.xml
+10-10www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/Antivirus.xml
+21-272 files

OPNSense/plugins 3752d19net/ndp-proxy-go/src/opnsense/mvc/app/controllers/OPNsense/NdpProxy/Api GeneralController.php

net/ndp-proxy-go: style change
DeltaFile
+0-1net/ndp-proxy-go/src/opnsense/mvc/app/controllers/OPNsense/NdpProxy/Api/GeneralController.php
+0-11 files

OPNSense/plugins 7d14cacwww/caddy Makefile pkg-descr, www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy reverse_proxy.volt

www/caddy: sync with master
DeltaFile
+18-11www/caddy/src/opnsense/mvc/app/views/OPNsense/Caddy/reverse_proxy.volt
+1-1www/caddy/Makefile
+1-0www/caddy/pkg-descr
+20-123 files

OPNSense/core 7b175c7src/etc/inc/plugins.inc.d dhcpd.inc, src/opnsense/mvc/app/models/OPNsense/Firewall Filter.php

Merge branch 'master' into firewall-interfacenot-floating
DeltaFile
+111-108src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModelTest.php
+101-97src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php
+114-0src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigTest.php
+48-0src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigConfig/backup/array.xml
+26-8src/etc/inc/plugins.inc.d/dhcpd.inc
+28-5src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+428-21831 files not shown
+589-32737 files

OPNSense/plugins b54176a. README.md, sysutils/dmidecode Makefile

sysutils/dmidecode: mark unmaintained, last update in 2019
DeltaFile
+1-1README.md
+0-1sysutils/dmidecode/Makefile
+1-22 files

OPNSense/plugins e71840b. README.md, www/web-proxy-sso Makefile

www/web-proxy-sso: switch to ummaintained instead of obsolete for now

PR: https://github.com/opnsense/plugins/commit/6450cbcaca3
DeltaFile
+1-1README.md
+0-2www/web-proxy-sso/Makefile
+1-32 files

OPNSense/core 9209c65src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api FilterController.php, src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes FilterRuleField.php

Firewall: Rules [new] - cleanup logic for https://github.com/opnsense/core/pull/9426
DeltaFile
+13-18src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
+1-6src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/FilterRuleField.php
+14-242 files

OPNSense/core 972433b. Makefile

make: allow test to be run always

I think the install dependencies were removed.  At least when patching
the local installation the tests do not care suggesting they use the
proper repository files for testing.
DeltaFile
+0-6Makefile
+0-61 files

OPNSense/core bea89efsrc/opnsense/mvc/app/library/OPNsense/Core Config.php

mvc: use LIBXML_NOBLANKS when loading config files

This avoids edge cases where the tag is not closing or leaving
whitespaces around.
DeltaFile
+1-1src/opnsense/mvc/app/library/OPNsense/Core/Config.php
+1-11 files

OPNSense/core 80d87f7. plist, src/opnsense/mvc/tests/app/library/OPNsense/Core ConfigTest.php

tests: restructure ConfigTest to allow for multiple test files

And add the failing test for the upcoming fix.
DeltaFile
+48-0src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigConfig/backup/array.xml
+0-48src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigConfig/backup/config.xml
+36-4src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigTest.php
+8-0src/opnsense/mvc/tests/app/library/OPNsense/Core/ConfigConfig/backup/object.xml
+2-1plist
+94-535 files

OPNSense/core f372161src/opnsense/mvc/app/models/OPNsense/Firewall Filter.php

Firewall - fix regression in https://github.com/opnsense/core/commit/b9620fd6791ab8730467ae9cc4ca33adb9a9a84c caused by fields not available in both snat and rules.

This commit re-arranges the existing validations so the type specific ones are only evaluated on that type.
DeltaFile
+101-97src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php
+101-971 files

OPNSense/core e9d2b9e. plist, src/opnsense/mvc/app/views/OPNsense/Firewall filter.volt

filter.volt has no consumer left and can be removed
DeltaFile
+0-159src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
+0-1plist
+0-1602 files

OPNSense/core 4d81f7csrc/opnsense/mvc/app/controllers/OPNsense/Firewall SourceNatController.php, src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api SourceNatController.php

nat/snat: Refactor source nat view
DeltaFile
+623-0src/opnsense/mvc/app/views/OPNsense/Firewall/snat_rule.volt
+200-81src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogSNatRule.xml
+34-4src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/SourceNatController.php
+4-16src/opnsense/mvc/app/controllers/OPNsense/Firewall/SourceNatController.php
+3-3src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml
+3-3src/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml
+867-1073 files not shown
+874-1079 files

OPNSense/core ff084dasrc/etc/inc/plugins.inc.d netflow.inc core.inc

System: High Availability - missing syslog caused by netflow_xmlrpc_sync() shadowing the section

PR: https://github.com/opnsense/core/issues/9481

(cherry picked from commit 6e478cf67131b2646ea53e2da3bb855a74bb5b3b)
(cherry picked from commit 4bfa65463c869d0e9decd26aa9a3e1e315e8b579)
DeltaFile
+4-7src/etc/inc/plugins.inc.d/netflow.inc
+1-1src/etc/inc/plugins.inc.d/core.inc
+5-82 files

OPNSense/core 4bfa654src/etc/inc/plugins.inc.d netflow.inc

netflow: annotate typo via b2074ef3a3b73cddb2 #9481
DeltaFile
+4-7src/etc/inc/plugins.inc.d/netflow.inc
+4-71 files

OPNSense/core 0ac213bsrc/opnsense/mvc/app/views/OPNsense/Diagnostics fw_log.volt, src/opnsense/www/js opnsense_bootgrid.js

firewall: live view: allow column modifications and combine hostname columns

Since the normal bootgrid implementation expects an action bar to
be able to provide a reset, the shortest path here is to expose
the _setPersistence toggle to allow manual resets from pages
where an action bar is not present.

While here, modify the lookup formatter such that it includes
ports as well, and make sure we unset the src/dst columns
if we lookup hostnames, and vice versa if we don't.
DeltaFile
+28-5src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+4-0src/opnsense/www/js/opnsense_bootgrid.js
+32-52 files

OPNSense/core 6e478cfsrc/etc/inc/plugins.inc.d core.inc

System: High Availability - missing syslog caused by netflow_xmlrpc_sync() shadowing the section. closes https://github.com/opnsense/core/issues/9481

As people might already be using "syslog" to sync Netflow, we better rename syslog with syslog-ng (which we use anyway).
DeltaFile
+1-1src/etc/inc/plugins.inc.d/core.inc
+1-11 files