OPNSense/core 4adc8edsrc/opnsense/mvc/app/controllers/OPNsense/Core/Api FirmwareController.php, src/opnsense/scripts/firmware check.sh

firmware: connection is ok, repository is not

Just change the returned information into something that
makes sense here.  No functional changes between both
sides except we check repository for != 'ok' so we catch
all types of errors if they are added in the future.  Same
is already true for connection.

OPNSense/core 084fdeasrc/opnsense/mvc/app/models/OPNsense/IDS/Migrations M1_0_2.php

IDS, migration to 1.0.2, fix Trying to get property of non-object in....

(cherry picked from commit c28b7915eee1a48aae18b3f90f1734efaa3e9b72)

OPNSense/core c28b791src/opnsense/mvc/app/models/OPNsense/IDS/Migrations M1_0_2.php

IDS, migration to 1.0.2, fix Trying to get property of non-object in....

OPNSense/core e9edf02src/opnsense/scripts/firmware health.sh

firmware: correct invisible error in health check

(cherry picked from commit efbe2d5e9848f52bd42d2fb6c2753471a04eee20)

OPNSense/core f284230src/opnsense/mvc/app/models/OPNsense/Monit Monit.php, src/opnsense/mvc/app/views/OPNsense/Monit index.volt

Monit, regression in refactor

(cherry picked from commit a2899594a0f2837f248f852c65f2c27bfbae7f32)

OPNSense/core 3b704a5src/etc/inc console.inc

console: this is not entirely correct

(cherry picked from commit 9f935b533f834c254ce239a5ea100734e872a4a3)

OPNSense/core 9f935b5src/etc/inc console.inc

console: this is not entirely correct

OPNSense/core a289959src/opnsense/mvc/app/models/OPNsense/Monit Monit.php, src/opnsense/mvc/app/views/OPNsense/Monit index.volt

Monit, regression in refactor

OPNSense/core efbe2d5src/opnsense/scripts/firmware health.sh

firmware: correct invisible error in health check

OPNSense/tools c3555df. README.md Makefile, composite hotfix.sh refresh.sh

composite: rename "refresh" to "hotfix" to explain itself

OPNSense/tools 189d738. Makefile

make: 19.1 can be the default, almost there
DeltaFile
+1-1Makefile
+1-11 files

OPNSense/core 24e452asrc/etc/inc/plugins.inc.d unbound.inc

unbound: prefer-ip6 is defaulting to 'no' for unbound

which makes this precaution a complication as unbound disables
IPv6 responses with it as well and we shouldn't set prefer-ip6
to 'yes' to avoid further breakage.

PR: https://forum.opnsense.org/index.php?topic=10810.0
(cherry picked from commit 53024b5c159c7c47603645baf08d4b34d4af43f7)

OPNSense/ports fd06d87Mk/Uses cargo.mk

Framework: sync with upstream

Taken from: HardenedBSD
DeltaFile
+1-1Mk/Uses/cargo.mk
+1-11 files

OPNSense/ports 8ab16d1security/vault distinfo Makefile

security/vault: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 4437e18security/autossh distinfo Makefile

security/autossh: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 69e9d49net/asterisk13 Makefile distinfo

net/asterisk13: sync with upstream

Taken from: HardenedBSD

OPNSense/ports d2b4b67lang/php71 pkg-plist Makefile

lang/php71: sync with upstream

Taken from: HardenedBSD

OPNSense/ports d6786b6security/vuxml vuln.xml

security/vuxml: sync with upstream

Taken from: HardenedBSD

OPNSense/ports c8a8a8dsecurity/libgpg-error distinfo Makefile

security/libgpg-error: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 999beb1devel/boost-libs Makefile, devel/boost-libs/files patch-libs_locale_src_util_iconv.hpp patch-libs_locale_src_posix_codecvt.cpp

devel/boost-libs: sync with upstream

Taken from: HardenedBSD

OPNSense/ports c30bc30devel/racer/files patch-rustc-ap-syntax-297, graphics/mesa-dri/files patch-configure

*/*: sync with upstream

Taken from: HardenedBSD

OPNSense/core 23c7c6fsrc/opnsense/mvc/app/models/OPNsense/Monit Monit.php

monit: style sweep

OPNSense/plugins 2da34absecurity/usermapping/src/opnsense/scripts/user_mapping usermanager.rb

security/usermapping: seems to work now on the VM

OPNSense/core 0627451src/opnsense/mvc/app/controllers/OPNsense/Monit/Api SettingsController.php, src/opnsense/mvc/app/controllers/OPNsense/Monit/forms services.xml

Monit, major cleanup, related to https://github.com/opnsense/core/pull/3119

(cherry picked from commit df8d12c8a0e8abb4d3d180f56cc6129b237cb505)
(cherry picked from commit 6d11ffc2ab374b7f0db19cf6f1bf8aba495ddd8f)
(cherry picked from commit c32cb08f58f57b6d7a36049c3a3608f3b701c540)

OPNSense/core c32cb08. LICENSE, src/opnsense/mvc/app/views/OPNsense/Monit index.volt status.volt

monit: correct copyright headers, update LICENSE

OPNSense/core 4ae8b31src/opnsense/mvc/app/controllers/OPNsense/Monit/Api SettingsController.php, src/opnsense/mvc/app/controllers/OPNsense/Monit/forms tests.xml

monit: add Service/Test type relation; improve Service Tests UI

(cherry picked from commit 29abe8e16ec4c9660b457b30646f28d0324c7a67)
(cherry picked from commit 4f88d926e5e5448db00786279305c0e2b962feeb)
(cherry picked from commit cfca9304663ac57c8362afe8422b6ad06a23c327)

OPNSense/core 8bc62c1src/www vpn_openvpn_client.php

openvpn: flip back to multiple

It looked like the original request was misunderstood and this
changed the wrong option.

PR: https://forum.opnsense.org/index.php?topic=10950.0
(cherry picked from commit 1c8731dd784cf5bd101f8d433f99d9f6a68a982c)

OPNSense/core 1e092desrc/opnsense/mvc/app/models/OPNsense/Base BaseModel.php

MVC, treat an empty ArrayField as non existent, closes 
https://github.com/opnsense/core/issues/3123

(cherry picked from commit a111b345ffe29410844aeb95f2979237bb3094f0)

OPNSense/core c2ec702src/opnsense/mvc/app/models/OPNsense/Base BaseModel.php

MVC, treat an empty ArrayField as non existent, closes 
https://github.com/opnsense/core/issues/3123

(cherry picked from commit a111b345ffe29410844aeb95f2979237bb3094f0)

OPNSense/core a111b34src/opnsense/mvc/app/models/OPNsense/Base BaseModel.php

MVC, treat an empty ArrayField as non existent, closes 
https://github.com/opnsense/core/issues/3123

OPNSense/tools 4318419. README.md

README: typo
DeltaFile
+1-1README.md
+1-11 files

OPNSense/tools 3c995be. README.md

EADME: document previous
DeltaFile
+3-2README.md
+3-21 files

OPNSense/tools 4cd3636composite refresh.sh

composite/refresh: if we only need core or plugins allow override

OPNSense/core 6d11ffcsrc/opnsense/mvc/app/controllers/OPNsense/Monit/Api SettingsController.php, src/opnsense/mvc/app/views/OPNsense/Monit index.volt

Monit, notifications are depricated in 19.1, remove the import here.

OPNSense/core 8c54709src/opnsense/mvc/app/controllers/OPNsense/Monit/Api SettingsController.php, src/opnsense/mvc/app/controllers/OPNsense/Monit/forms services.xml

Merge branch 'fbrendel-monit'

OPNSense/core df8d12csrc/opnsense/mvc/app/controllers/OPNsense/Monit/Api SettingsController.php, src/opnsense/mvc/app/controllers/OPNsense/Monit/forms services.xml alerts.xml

Monit, major cleanup, related to https://github.com/opnsense/core/pull/3119

- remove locking in model, core framework should do that if required. (see Config->lock), 
deadlock issues in previous code (freezing UI)
- in settings controller, expand endpoints to one per type (in stead of "one to rule them 
all")
- in settings controller, align to base wrappers of ApiMutableModelControllerBase
- move extended validations to model, to avoid validation issues when another service 
would like to reuse the model
- align forms to standard wrappers (naming convention, simplifies code)
- remove "deleteRelations", if we need something like this at some point, it should be in 
the model, for now it seems safe enough to ditch
- ditch migration code, since it does the same as having a default value (defaults are 
always enforced during migrations)
** left UnitTest code for what it is now, probably needs changes too

OPNSense/core e4b194esrc/opnsense/mvc/app/controllers/OPNsense/Core/Api FirmwareController.php, src/opnsense/scripts/firmware check.sh

firmware: also detect a revoked fingerprint

OPNSense/core 8d0fc74src/opnsense/mvc/app/controllers/OPNsense/Monit/forms services.xml, src/opnsense/mvc/app/models/OPNsense/Monit Monit.xml

monit: Support declaring dependencies

(cherry picked from commit 105462bb5d17468daabe0470a16eaac585b01b78)
(cherry picked from commit 8ad3b9d1a2437a9619524f6d3cb28694672ebc58)

OPNSense/core 5fdadcfsrc/opnsense/mvc/script load_phalcon.php

Fix usage of include_once in load_phalcon.php (#3109)

include_once returns TRUE if the file has already been loaded. This is not what you want 
if you're setting a variable from it.
http://php.net/manual/en/function.include-once.php

This fixes notices when including certain old scripts from modern controllers, as well as 
a notice when running run_migrations.php.

(cherry picked from commit e3de6b2e28d24b9b113c1ee95a40b990ef8374ec)

OPNSense/plugins 30835dasecurity/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms dialogAction.xml, security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient AcmeClient.xml

security/acme-client: sync with master

OPNSense/plugins fa08707. LICENSE

LICENSE: sync
DeltaFile
+1-1LICENSE
+1-11 files

OPNSense/plugins fc4f093security/usermapping/src/opnsense/scripts/user_mapping usermanager.rb

security/usermapping: logout call works, reformat code

OPNSense/plugins cb7c990security/usermapping/src/opnsense/scripts/user_mapping usermanager.rb

security/usermapping: work on logout functionality including pf code

OPNSense/ports 55c53d5security/suricata/files patch-src_source-netmap.c

security/suricata: allow forward compat with netmap

Contributed by: Sunny Valley Networks

OPNSense/ports de42175. UPDATING MOVED, Mk bsd.default-versions.mk

Framework: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 7524c87www/nginx Makefile Makefile.options.desc

www/nginx: partially sync with upstream

Taken from: HardenedBSD

OPNSense/ports 45aa6aasysutils/devcpu-data distinfo Makefile

sysutils/devcpu-data: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 2075e7anet/ntopng Makefile distinfo, net/ntopng/files ntopng-geoip2update.sh.in ntopng-geoipupdate.sh.in

net/ntopng: sync with upstream

Taken from: HardenedBSD

OPNSense/ports d5929e5net/pjsip pkg-descr Makefile

net/pjsip: sync with upstream

Taken from: HardenedBSD

OPNSense/ports b2be07anet-mgmt/telegraf distinfo Makefile, net-mgmt/telegraf/files patch-scripts_build_py

net-mgmt/telegraf: sync with upstream

Taken from: HardenedBSD