OPNSense/core a21394dsrc/opnsense/mvc/app/controllers/OPNsense/Base ControllerRoot.php

mvc, fix "Notice: Access to undefined property translator in.." when trying to access an 
unexisting controller

OPNSense/tools 7b977acconfig/18.1 make.conf

add POP3 and IMAP to nginx

OPNSense/core 77f648esrc/opnsense/scripts/filter/lib alias.py

Firewall/alias, if the name of the alias equals it's content, try to resolve. for 
https://github.com/opnsense/core/issues/2199

(cherry picked from commit cdae884ec970ab4d214ea8b28010c421c03ba018)

OPNSense/core ec3f7b5src/opnsense/scripts/filter update_tables.py, src/opnsense/scripts/filter/lib alias.py

Firewall/aliases, move general settings to AliasParser and fix Alias constructor to 
receive the general settings

(cherry picked from commit 58350179a8d763052f40fc03747e2c885513e1e0)

OPNSense/core d9f803asrc/opnsense/mvc/app/models/OPNsense/Base/FieldTypes OptionField.php

Translate OptionValues.

(cherry picked from commit 5eafd14b72cc6d8fec2045fc829b5673bfadfbea)
(cherry picked from commit d3f51dedb04d12cb998c7405435755139f45ff6b)

OPNSense/core dddfef4src/opnsense/mvc/app/views/OPNsense/Diagnostics fw_log.volt, src/opnsense/scripts/filter read_log.py

firewall: show IPv6 ports in live log; closes #2190

(cherry picked from commit a83c91dff040bc4bba6f4916923581060020884a)
(cherry picked from commit 44d4fa90c4dbaa894ea3c77a56095970b045e987)
(cherry picked from commit fb9029cb7e2b2b18a70fa8bb827fbeb00caf8047)
(cherry picked from commit 5dd82c946a01250b3bdfb5ac6f8c9a743e368d79)
(cherry picked from commit 26cda422bb68de3e740b7995a5d79e186c26157c)
(cherry picked from commit c142c5c17ba1a02bccf6fe4969ca4f965b4599ba)

OPNSense/core a83c91dsrc/opnsense/mvc/app/views/OPNsense/Diagnostics fw_log.volt, src/opnsense/scripts/filter read_log.py

firewall: show IPv6 ports in live log; closes #2190

OPNSense/core f953fc4src/opnsense/mvc/app/views/layouts default.volt, src/www head.inc

Revert "another take on tab removal. (https://github.com/opnsense/core/issues/1928)", 
closes https://github.com/opnsense/core/issues/2065

This reverts commit 2b94b6691a9f965950c1e9759542359fc6d6e6f4.

OPNSense/core 9fb4415src/etc/inc services.inc

RADVD Problem on PPPeO link without public IPv6 address (#2200)

(cherry picked from commit 5a0306e66f51ad78ff4341db739a5d5c1206a144)
(cherry picked from commit b46fc7fe4cc6d5087d176c32454324e1aa59313e)

OPNSense/core b46fc7fsrc/etc/inc services.inc

radvd: style tweak

OPNSense/core 5b89ccdsrc/etc rc.configure_plugins rc.configure_firmware

rc: proper includes

PR: https://forum.opnsense.org/index.php?topic=7320.0
(cherry picked from commit b85cd97da0d346fe988333344e8c6cec3b21ad08)

OPNSense/core 74f40b6src/opnsense/mvc/app/models/OPNsense/Base/Menu MenuSystem.php, src/www firewall_rules.php

firewall/categories, move filter to top, for https://github.com/opnsense/core/issues/2182

(cherry picked from commit ac4f5a1aec26d5ec1fc89680b9019ef37ce6db4c)
(cherry picked from commit 5bc9fdfe55868d375287f578065d1feede1676c9)
(cherry picked from commit 0752629d109f5344a758f5ce46ece7c5151401f2)
(cherry picked from commit 97cdecbc3d6841c97c9a0eead567900ed2358585)

OPNSense/core dcd8190src/www firewall_aliases_edit.php

Firewall/aliases, ignore case while searching.

(cherry picked from commit fb06878b3f4fe9e77d3b91ba3c442282c58b353c)

OPNSense/core fb06878src/www firewall_aliases_edit.php

Firewall/aliases, ignore case while searching.

OPNSense/core 97cdecbsrc/www firewall_rules.php

firewall/category, move selection to top-right, closes 
https://github.com/opnsense/core/issues/2182

OPNSense/tools 47cfcf9. README.md

README: it's 11.1 now
DeltaFile
+1-1README.md
+1-11 files

OPNSense/plugins 90cab1csysutils/monit/src/opnsense/mvc/app/views/OPNsense/Monit index.volt

sysutils/monit: add missing translation

OPNSense/ports b1d39f9. UPDATING MOVED, Mk bsd.ruby.mk

Framework: sync with upstream

Taken from: HardenedBSD

OPNSense/ports bba6567www/nginx Makefile

www/nginx: sync with upstream

Taken from: HardenedBSD
DeltaFile
+0-2www/nginx/Makefile
+0-21 files

OPNSense/ports 27ba04fsysutils/consul distinfo Makefile

sysutils/consul: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 98af0ccsecurity/py-pycrypto Makefile

security/py-pycrypto: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 0624922security/vault distinfo Makefile

security/vault: sync with upstream

Taken from: HardenedBSD

OPNSense/ports a8725ccsecurity/acme.sh pkg-plist distinfo

security/acme.sh: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 3860023net/socat Makefile

net/socat: sync with upstream

Taken from: HardenedBSD
DeltaFile
+0-3net/socat/Makefile
+0-31 files

OPNSense/ports 1960a61net/vnstat Makefile

net/vnstat: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 2bef153net/rsync Makefile

net/rsync: sync with upstream

Taken from: HardenedBSD
DeltaFile
+2-3net/rsync/Makefile
+2-31 files

OPNSense/ports b9889d0net/quagga distinfo Makefile, net/quagga/files patch-lib_command.c patch-bgpd_bgp__nht.c

net/quagga: sync with upstream

Taken from: HardenedBSD

OPNSense/ports f0ca2a6net/frr distinfo Makefile

net/frr: partially sync with upstream

Taken from: HardenedBSD

OPNSense/ports c3021bcnet/openldap24-server Makefile

net/openldap24-server: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 2d44f1dnet/asterisk13 distinfo Makefile

net/asterisk13: sync with upstream

Taken from: HardenedBSD

OPNSense/ports c40e741databases/freetds Makefile

databases/freetds: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 3384c5cnet/libfixbuf Makefile distinfo

net/libfixbuf: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 93e302bnet-mgmt/yaf distinfo pkg-plist

net-mgmt/yaf: sync with upstream

Taken from: HardenedBSD

OPNSense/ports e961b2cdevel/p5-Test2-Suite distinfo pkg-plist

devel/p5-Test2-Suite: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 6772449lang/ruby25/files patch-ext_ripper_ripper.c patch-parse.c

lang/ruby25: sync with upstream

Taken from: HardenedBSD

OPNSense/ports bf859c6ftp/wget Makefile

ftp/wget: sync with upstream

Taken from: HardenedBSD
DeltaFile
+1-7ftp/wget/Makefile
+1-71 files

OPNSense/ports 877ada0devel/patch distinfo Makefile, devel/patch/files patch-lib__Makefile.in patch-lib__localcharset.c

devel/patch: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 39a6484security/ca_root_nss pkg-plist Makefile

security/ca_root_nss: sync with upstream

Taken from: HardenedBSD

OPNSense/ports d6d99eedevel/py-gyp Makefile

devel/py-gyp: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 739c215devel/py-coverage Makefile, devel/py-coverage/files patch-setup.py

devel/py-coverage: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 6d6fff2benchmarks/iperf3 distinfo Makefile

benchmarks/iperf3: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 300eb58security/vuxml vuln.xml

security/vuxml: sync with upstream

Taken from: HardenedBSD
DeltaFile
+235-0security/vuxml/vuln.xml
+235-01 files

OPNSense/ports 797b06flang/python27 Makefile, lang/python27/files patch-issue30622

lang/python27: sync with upstream

Taken from: HardenedBSD

OPNSense/ports 305f3c9audio/picard pkg-plist, audio/picard-plugins pkg-plist

*/*: sync with upstream

Taken from: HardenedBSD

OPNSense/core 02e3b0esrc/www status_interfaces.php

status_interfaces, prefix containers and remove duplicate htmlspecialchars(), closes 
https://github.com/opnsense/core/issues/2202

(cherry picked from commit 8787a3200b98b33b28e2bd0565b9111c275adb3a)

OPNSense/core 8787a32src/www status_interfaces.php

status_interfaces, prefix containers and remove duplicate htmlspecialchars(), closes 
https://github.com/opnsense/core/issues/2202

OPNSense/core 0752629src/www firewall_rules.php

firewall/categories, move filter to top, for https://github.com/opnsense/core/issues/2182

OPNSense/core b5d6cddsrc/www guiconfig.inc

print_info_box_apply() code issue, there doesn't appear to be a reason to set an action 
url here. sprintf() expects the second argument to be mapped "somewhere"

OPNSense/core b85cd97src/etc rc.configure_plugins rc.configure_firmware

OPNSense/plugins 054578csysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api SettingsController.php

sysutils/monit: fix test deletion (#564)