Framework: sync with upstream

Taken from: HardenedBSD

GIDs

@@ -211,9 +211,9 @@ odoo:*:267:
 tenshi:*:268:tenshi
 dendrite:*:269:
 _rpki-client:*:270:
-# free: 271
-# free: 272
-# free: 273
+signaling:*:271:
+gvm:*:272:
+seaweedfs:*:273:
 # free: 274
 haclient:*:275:
 frontbase:*:276:

MOVED

@@ -9370,7 +9370,6 @@ security/openvas-libraries|security/openvas8-libraries|2017-08-03|Renamed to inc
 security/openvas-cli|security/openvas8-cli|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name
 security/openvas-manager|security/openvas8-manager|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name
 security/openvas-scanner|security/openvas8-scanner|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name
-security/greenbone-security-assistant|security/greenbone-security-assistant8|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name
 sysutils/consolekit|sysutils/consolekit2|2017-08-05|Continuation of the consolekit project
 mail/dovecot2|mail/dovecot|2017-08-07|Renamed to mail/dovecot
 mail/dovecot2-pigeonhole|mail/dovecot-pigeonhole|2017-08-07|Renamed to mail/dovecot-pigeonhole
@@ -15932,7 +15931,6 @@ www/trac-defaultcc||2021-01-01|Has expired: Uses Python 2.7 which is EOLed upstr
 www/trac-discussion||2021-01-01|Has expired: Uses Python 2.7 which is EOLed upstream
 www/trac-email2trac||2021-01-01|Has expired: Uses Python 2.7 which is EOLed upstream
 www/trac-downloads||2021-01-01|Has expired: Uses Python 2.7 which is EOLed upstream
-www/trac-devel||2021-01-01|Has expired: Uses Python 2.7 which is EOLed upstream
 www/trac-email2trac-postfix||2021-01-01|Has expired: Uses Python 2.7 which is EOLed upstream
 www/trac-estimator||2021-01-01|Has expired: Uses Python 2.7 which is EOLed upstream
 www/trac-fivestarvote||2021-01-01|Has expired: Uses Python 2.7 which is EOLed upstream
@@ -16006,10 +16004,12 @@ www/trac-accountmanager||2021-01-02|Has expired: Uses Python 2.7 which is EOLed
 print/xfce4-print||2021-01-02|Unmaintained, depends on dropped XFCE GTK2 support
 x11/xfce4-quicklauncher-plugin||2021-01-02|Unmaintained, depends on dropped XFCE GTK2 support
 x11/xfce4-wmdock-plugin||2021-01-02|Unmaintained, depends on dropped XFCE GTK2 support
-x11-toolkits/libxfce4gui||2012-01-02|Unmaintained, depends on dropped XFCE GTK2 support
-devel/py-backports.functools_lru_cache||2020-01-02|Uses Python 2.7 which is EOLed upstream
-devel/py-backports_abc||2020-01-02|Uses Python 2.7 which is EOLed upstream
-devel/py-futures||2020-01-02|Uses Python 2.7 which is EOLed upstream
-devel/py-singledispatch||2020-01-02|Uses Python 2.7 which is EOLed upstream
-graphics/py-pillow6|graphics/pillow|2020-01-02|Uses Python 2.7 which is EOLed upstream
+x11-toolkits/libxfce4gui||2021-01-02|Unmaintained, depends on dropped XFCE GTK2 support
+devel/py-backports.functools_lru_cache||2021-01-02|Uses Python 2.7 which is EOLed upstream
+devel/py-backports_abc||2021-01-02|Uses Python 2.7 which is EOLed upstream
+devel/py-futures||2021-01-02|Uses Python 2.7 which is EOLed upstream
+devel/py-singledispatch||2021-01-02|Uses Python 2.7 which is EOLed upstream
+graphics/py-pillow6|graphics/py-pillow|2021-01-02|Uses Python 2.7 which is EOLed upstream
 www/wt3|www/wt|2021-01-03|Has expired: Upstream end of life, switch to www/wt instead
+archivers/ecm|archivers/cmdpack|2021-01-04|ECM is now included in cmdpack
+math/qhull5|math/qhull|2021-01-04|Has expired: Legacy version of port no longer required by math/octave

Mk/Uses/python.mk

@@ -644,7 +644,6 @@ PYNUMPY=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.20,1:math/py-numpy@${PY_FLAVOR}
 
 # Common Python modules that can be needed but only for some versions of Python.
 .if ${PYTHON_REL} < 3500
-PY_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR}
 PY_PYGMENTS=	${PYTHON_PKGNAMEPREFIX}pygments-25>=2.5.1<3:textproc/py-pygments-25@${PY_FLAVOR}
 PY_SPHINX=	${PYTHON_PKGNAMEPREFIX}sphinx18>=0,1:textproc/py-sphinx18@${PY_FLAVOR}
 PY_TYPING=	${PYTHON_PKGNAMEPREFIX}typing>=3.7.4.1:devel/py-typing@${PY_FLAVOR}
@@ -669,12 +668,6 @@ PY_IPADDRESS=	${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.23:net/py-ipaddress@${PY_FLA
 PY_IPADDRESS=
 .endif
 
-.if ${PYTHON_REL} < 3200
-PY_FUTURES=	${PYTHON_PKGNAMEPREFIX}futures>=3.2:devel/py-futures@${PY_FLAVOR}
-.else
-PY_FUTURES=
-.endif
-
 .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
 PY_MERCURIAL=	${PYTHON_PKGNAMEPREFIX}mercurial>=5.5:devel/mercurial@${PY_FLAVOR}
 .else

UIDs

@@ -216,9 +216,9 @@ odoo:*:267:267::0:0:Odoo ERP:/nonexistent:/usr/sbin/nologin
 tenshi:*:268:268::0:0:Tenshi user:/var/lib/tenshi:/usr/sbin/nologin
 dendrite:*:269:269::0:0:Dendrite user:/nonexistent:/usr/sbin/nologin
 _rpki-client:*:270:270::0:0:rpki-client user:/nonexistent:/usr/sbin/nologin
-# free: 271
-# free: 272
-# free: 273
+signaling:*:271:271::0:0:Signaling server:/nonexistent:/usr/sbin/nologin
+gvm:*:272:272::0:0:Greenbone Vulnerability Management:/nonexistent:/usr/sbin/nologin
+seaweedfs:*:273:273::0:0:seaweedfs user:/var/db/seaweedfs:/usr/sbin/nologin
 # free: 274
 hacluster:*:275:275::0:0:Heartbeat cluster user:/nonexistent:/usr/sbin/nologin
 frontbase:*:276:276::0:0:FrontBase Daemon:/usr/local/FrontBase/Databases:/bin/sh

UPDATING

@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20210106:
+  AFFECTS: mail/dovecot
+  AUTHOR: [email protected]
+
+  The VPOPMAIL option was removed, because it was dropped upstream,
+  so please check your config bevor upgrading.
+
+20210106:
+  AFFECTS: sysutils/graylog
+  AUTHOR: [email protected]
+
+  graylog 4.0 and higher now use a new license, the SSPL. For more
+  details, see https://www.graylog.org/post/graylog-v4-0-licensing-sspl
+
 20210102:
   AFFECTS: x11/libexo, XFCE4 desktop users
   AUTHOR: [email protected]