From c8b08fba9e714eb0257751304bafbc13458015e7 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 3 Jun 2019 04:18:12 +0200 Subject: [PATCH] Framework: partially sync with upstream Taken from: HardenedBSD --- MOVED | 15 +++++++++++++++ Mk/Uses/python.mk | 6 ++++++ Mk/bsd.gcc.mk | 3 ++- Mk/bsd.port.mk | 11 ----------- UPDATING | 7 +++++++ 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/MOVED b/MOVED index cda5d25cf059..10c0ecb89e90 100644 --- a/MOVED +++ b/MOVED @@ -12775,3 +12775,18 @@ www/rubygem-webpack-rails-rails50|www/rubygem-webpack-rails-rails5|2019-05-28|Ob lang/ghc843||2019-05-28|Old versions of GHC are removed from ports. Use devel/stack and appropriate resolver to install this version of GHC for your user only lang/ghc844||2019-05-28|Old versions of GHC are removed from ports. Use devel/stack and appropriate resolver to install this version of GHC for your user only lang/ghc862||2019-05-28|Old versions of GHC are removed from ports. Use devel/stack and appropriate resolver to install this version of GHC for your user only +graphics/cinepaint||2019-05-29|Has expired: Vulnerable since 2015, unmaintained and underlinks +audio/specimen||2019-05-29|Has expired: Unmaintained, depends on expiring x11-toolkits/phat +devel/smack||2019-05-29|Has expired: Unmaintained, upstream disappeared, underlinks +x11-toolkits/phat||2019-05-29|Has expired: Unmaintained, upstream disappeared, underlinks +math/gracetmpl||2019-05-30|Has expired: Long unmaintained abandonware; depends on stale numarray +math/py-numarray|math/py-numpy|2019-05-30|Has expired: Obsoleted upstream in favor of NumPy +net/neubot||2019-05-30|Has expired: neubot client has been retired upstream +www/py-django20|www/py-django22|2019-05-31|Has expired: Extended support has expired on April 1, 2019. Use www/py-django21 or www/py-django22 instead +www/rubygem-heroku||2019-05-31|Has expired: Upstream has changed to node-based CLI (https://cli.heroku.com/) +multimedia/gmerlin-avdecoder||2019-05-31|Has expired: unused in the ports tree and depends on vulnerable multimedia/ffmpeg0 +security/racoon2-legacy|security/racoon2|2019-05-31|Has expired: No longer supported upstream, use security/racoon2 +www/pivotx||2019-05-31|Has expired: inactive upstream and does not work with PHP 7 +dns/bind912|dns/bind914|2019-05-31|Has expired: Support ends, please move to dns/bind914. +multimedia/vdr-plugin-softhddevice||2019-05-31|Has expired: unmaintained and depends on vulnerable multimedia/ffmpeg0 +devel/pecl-pthreads||2019-06-02|Has expired: Does not work with recent versions of php diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index e7724b7bac55..346ea1173741 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -659,6 +659,12 @@ PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} # Common Python modules that can be needed but only for some versions of Python. +.if ${PYTHON_REL} < 3500 +PY_TYPING= ${PYTHON_PKGNAMEPREFIX}typing>=3.6.4:devel/py-typing@${PY_FLAVOR} +.else +PY_TYPING= +.endif + .if ${PYTHON_REL} < 3400 PY_ENUM34= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${PY_FLAVOR} PY_ENUM_COMPAT= ${PYTHON_PKGNAMEPREFIX}enum-compat>0:devel/py-enum-compat@${PY_FLAVOR} diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk index 58ef2332f669..04d249f2934d 100644 --- a/Mk/bsd.gcc.mk +++ b/Mk/bsd.gcc.mk @@ -35,7 +35,7 @@ GCC_Include_MAINTAINER= gerald@FreeBSD.org # ascending order and in sync with the table below. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -GCCVERSIONS= 040200 040800 060000 070000 080000 +GCCVERSIONS= 040200 040800 060000 070000 080000 090000 # The first field is the OSVERSION in which it disappeared from the base. # The second field is the version as USE_GCC would use. @@ -44,6 +44,7 @@ GCCVERSION_040800= 0 4.8 GCCVERSION_060000= 0 6 GCCVERSION_070000= 0 7 GCCVERSION_080000= 0 8 +GCCVERSION_090000= 0 9 # No configurable parts below this. #################################### # diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 02cbdcc651d4..bf9fee37f372 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -387,17 +387,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_WX - If set, this port uses the WxWidgets library and related # components. See bsd.wx.mk for more details. ## -# -# USE_QT4 - A list of the Qt 4 dependencies the port has (e.g, -# corelib, webkit). Implies that the port needs Qt. -# Implies the inclusion of bsd.qt.mk. See bsd.qt.mk -# for more details. -# -# USE_QT5 - A list of the Qt 5 dependencies the port has (e.g, -# core, webkit). Implies that the port needs Qt. -# Implies the inclusion of bsd.qt.mk. See bsd.qt.mk -# for more details. -## # USE_LINUX_PREFIX # - Controls the action of PREFIX (see above). Only use this # if the port is a Linux infrastructure port (e.g. contains libs diff --git a/UPDATING b/UPDATING index 347860851ed7..23cf0d921454 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,13 @@ 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. +20180601: + AFFECTS: www/tt-rss + AUTHOR: dereks@lifeofadishwasher.com + + tt-rss now uses php intl for extension; a web server reload + will be required if intl extension isn't already loaded. + 20190522: AFFECTS: users of sysutils/graylog AUTHOR: dch@FreeBSD.org