Framework: partially sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2020-06-02 04:24:27 +02:00
parent afcf5a4cf5
commit 6ddb5dfb4b
8 changed files with 41 additions and 13 deletions

View File

@ -10,6 +10,14 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
20200531:
AUTHOR: kde@FreeBSD.org
pyqt.mk gained support for test-only dependencies. If a component, say
py-qt5-gui is only required for testing, you can add
USE_PYQT=<other_deps> gui_test
20200514:
AUTHOR: mat@FreeBSD.org

2
GIDs
View File

@ -820,7 +820,7 @@ bitmark-recorder:*:873:
# free: 877
# free: 878
# free: 879
# free: 880
pyspf-milter:*:880:
ultimaker:*:881:
midpoint:*:882:
ipfs-go:*:883:

13
MOVED
View File

@ -13868,7 +13868,6 @@ graphics/pysvg||2020-01-27|Has expired: Unmaintained, uses EOLed python27
irc/py-supybot-plugins||2020-01-27|Has expired: Unmaintained, uses EOLed python27
japanese/kana-no-quiz||2020-01-27|Has expired: Unmaintained, uses EOLed python27
lang/py-prolog||2020-01-27|Has expired: Unmaintained, uses EOLed python27
lang/sdcc||2020-01-27|Has expired: Unmaintained, uses EOLed python27
mail/archivemail||2020-01-27|Has expired: Unmaintained, uses EOLed python27
mail/mailfmt||2020-01-27|Has expired: Unmaintained, uses EOLed python27
mail/py-libgmail||2020-01-27|Has expired: Unmaintained, uses EOLed python27
@ -14595,7 +14594,6 @@ devel/bouml-doc||2020-05-05|Has expired: Broken for more than 6 months
devel/cobf||2020-05-05|Has expired: Broken for more than 6 months
devel/djgpp-crx||2020-05-05|Has expired: Broken for more than 6 months
devel/elfrc||2020-05-05|Has expired: Broken for more than 6 months
devel/frink||2020-05-05|Has expired: Broken for more than 6 months
devel/gogland-eap||2020-05-05|Has expired: Broken for more than 6 months
devel/hive||2020-05-05|Has expired: Broken for more than 6 months
devel/hs-bytestring-nums||2020-05-05|Has expired: No releases since 2012
@ -15045,3 +15043,14 @@ devel/hs-data-default-instances-containers||2020-05-26|Deprecated: Haskell libra
x11-wm/hs-xmonad-contrib||2020-05-26|Deprecated: Haskell libraries get pushed out of the ports tree
x11/hs-X11||2020-05-26|Deprecated: Haskell libraries get pushed out of the ports tree
x11/hs-X11-xft||2020-05-26|Deprecated: Haskell libraries get pushed out of the ports tree
devel/rubygem-peek-redis-rails5|devel/rubygem-peek-redis-rails52|2020-05-29|Obsolete: Please use devel/rubygem-peek-redis-rails52 instead
devel/rubygem-peek-rblineprof-rails5|devel/rubygem-peek-rblineprof-rails52|2020-05-29|Obsolete, please use devel/rubygem-peek-rblineprof-rails52 instead
www/moodle36|www/moodle37|2020-05-30|Has expired: EOLed upstream
sysutils/ansible24|sysutils/ansible|2020-05-31|Has expired: Upstream support ended. Consider upgrading to sysutils/ansible
sysutils/ansible26|sysutils/ansible|2020-05-31|Has expired: Upstream support ended. Consider upgrading to sysutils/ansible
sysutils/ansible25|sysutils/ansible|2020-05-31|Has expired: Upstream support ended. Consider upgrading to sysutils/ansible
www/py-requests-futures097|www/py-requests-futures|2020-05-31|Has expired: Use www/py-requests-futures instead
sysutils/ansible23|sysutils/ansible|2020-05-31|Has expired: Upstream support ended. Consider upgrading to sysutils/ansible
devel/graphql.el||2020-05-31|Has expired: No longer required by anything
lang/perl5.26|lang/perl5.28|2020-05-31|Has expired: Support ends three years after .0 release, please upgrade to a more recent version of Perl
www/py-beautifulsoup460|www/py-beautifulsoup448|2020-05-31|Has expired: Use www/py-beautifulsoup448 instead

View File

@ -44,9 +44,7 @@ USE_PERL5?= run build
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
. if ${PERL5_DEFAULT} == 5.26
.include "${PORTSDIR}/lang/perl5.26/version.mk"
. elif ${PERL5_DEFAULT} == 5.28
. if ${PERL5_DEFAULT} == 5.28
.include "${PORTSDIR}/lang/perl5.28/version.mk"
. elif ${PERL5_DEFAULT} == 5.30
.include "${PORTSDIR}/lang/perl5.30/version.mk"
@ -85,10 +83,8 @@ PERL_ARCH?= mach
# Mk/bsd.default-versions.mk in sync.
. if ${PERL_LEVEL} >= 503000
PERL_PORT?= perl5.30
. elif ${PERL_LEVEL} >= 502800
. else # ${PERL_LEVEL} < 503000
PERL_PORT?= perl5.28
. else # ${PERL_LEVEL} < 502800
PERL_PORT?= perl5.26
. endif
SITE_PERL_REL?= lib/perl5/site_perl

View File

@ -15,6 +15,7 @@
# USE_PYQT - List of PyQt components to depend on
# * foo_build only build depend
# * foo_run only run depend
# * foo_test only test depend
# * foo both (default)
# PYQT_SIPDIR - where sip files will be installed to
# PYQT_APIDIR - where api files will be installed to
@ -280,15 +281,17 @@ do-configure:
.endif # !target(do-configure)
.endif # defined(PYQT_DIST)
# Set build and run depends -- we need to prefix them internally with "py-"
# Set build, run and test depends -- we need to prefix them internally with "py-"
# else we conflict with the ones defined in bsd.qt.mk with the same name
_USE_PYQT_ALL+= ${_USE_PYQT${_PYQT_VERSION}_ONLY}
.for comp in ${_USE_PYQT_ALL:O:u}
_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run
_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run py-${comp}_test
py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
py-${comp}_TEST_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
py-${comp}_build_BUILD_DEPENDS?= ${py-${comp}_BUILD_DEPENDS}
py-${comp}_run_RUN_DEPENDS?= ${py-${comp}_RUN_DEPENDS}
py-${comp}_test_TEST_DEPENDS?= ${py-${comp}_TEST_DEPENDS}
.endfor
_USE_PYQT= ${USE_PYQT:O:u}
@ -296,6 +299,7 @@ _USE_PYQT= ${USE_PYQT:O:u}
. if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}}
BUILD_DEPENDS+= ${py-${comp}_BUILD_DEPENDS}
RUN_DEPENDS+= ${py-${comp}_RUN_DEPENDS}
TEST_DEPENDS+= ${py-${comp}_TEST_DEPENDS}
. else
IGNORE?= cannot be installed: unknown USE_PYQT component ${comp} #'
. endif

View File

@ -67,7 +67,7 @@ LLVM_DEFAULT?= 90
LUA_DEFAULT?= 5.2
# Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.1m, 10.2m, 10.3m, 10.4m, 5.5p, 5.6p, 5.7p, 5.6w
MYSQL_DEFAULT?= 5.7
# Possible values: 5.26, 5.28, 5.30, devel
# Possible values: 5.28, 5.30, devel
.if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
defined(PACKAGE_BUILDING))
PERL5_DEFAULT?= 5.30

2
UIDs
View File

@ -825,7 +825,7 @@ bitmark-recorder:*:873:873::0:0:Bitmark Property Recorder:/var/lib/recorderd:/us
# free: 877
# free: 878
# free: 879
# free: 880
pyspf-milter:*:880:880::0:0:pyspf-milter:/nonexistent:/usr/sbin/nologin
ultimaker:*:881:881::0:0:Ultimaker user:/nonexistent:/usr/sbin/nologin
midpoint:*:882:882::0:0:midPoint user:/var/db/midpoint:/usr/sbin/nologin
ipfs-go:*:883:883::0:0:ipfs-go user:/var/db/ipfs-go:/bin/sh

View File

@ -5,6 +5,17 @@ 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.
20200531:
AFFECTS: users of mail/postfix-policyd-spf-python
AUTHOR: yasu@utahime.org
This port is now deprecated because upstream project is superseded by its
successor. So uninstall this port and install mail/py-spf-engine instead.
Keep in mind that the path of configuration file is changed from
${PREFIX}/etc/postfix-policyd-spf-python/policyd-spf.conf to
${PREFIX}/etc/python-policyd-spf/policyd-spf.conf. So you need to move
it to new location unless you use the default one without changing.
20200526:
AFFECTS: users of databases/mariadb104-client, databases/mariadb104-server
AUTHOR: brnrd@FreeBSD.org