Framework: partially sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2019-11-28 08:51:00 +01:00
parent 1440c8ce2b
commit 6ccab3657c
7 changed files with 100 additions and 11 deletions

1
LEGAL
View file

@ -240,3 +240,4 @@ vmd-* science/vmd No commercial use: commercial use requires a commercial lic
msms-* science/msms No commercial use, only for use by individuals in scientific research
unifi-devel-* net-mgmt/unifi-devel License restrictions, see https://www.ubnt.com/eula/
netio* benchmarks/netio No commercial use: commercial use requires a commercial license
zerotier-* net/zerotier No SaaS or Govt usage: https://github.com/zerotier/ZeroTierOne/blob/master/LICENSE.txt

23
MOVED
View file

@ -2522,7 +2522,6 @@ www/mediawiki115||2011-09-03|Unsupported upstream
www/p5-Catalyst-Plugin-Authentication-Store-DBIC||2011-09-03|Use p5-Catalyst-Authentication-Store-DBIx-Class instead
net/uproxy||2011-09-04|Master site disappeared, abandonware
x11/ebuttons||2011-09-05|Has expired: Website has disappeared
cad/oregano||2011-09-05|Has expired: Website has disappeared
devel/jakelib2||2011-09-05|Has expired: Website has disappeared
x11-wm/epiwm||2011-09-07|Has expired: Abandonware
x11-toolkits/p5-GdkPixbuf||2011-09-07|Has expired: Disappear from CPAN
@ -13469,7 +13468,6 @@ devel/powerpc64-binutils|devel/binutils@powerpc64|2019-11-05|Moved to a flavored
devel/riscv64-binutils|devel/binutils@riscv64|2019-11-05|Moved to a flavored version
devel/s390x-binutils|devel/binutils@s390x|2019-11-05|Moved to a flavored version
devel/sparc64-binutils|devel/binutils@sparc64|2019-11-05|Moved to a flavored version
devel/xtoolchain-llvm-devel|devel/llvm-devel|2019-11-15|Subsumed into devel/llvm-devel
mail/opensmtpd-extras-filter-clamav||2019-11-15| Deprecated upstream
mail/opensmtpd-extras-filter-dkim||2019-11-15| Deprecated upstream
mail/opensmtpd-extras-filter-dnsbl||2019-11-15| Deprecated upstream
@ -13483,3 +13481,24 @@ mail/opensmtpd-extras-filter-spamassassin||2019-11-15| Deprecated upstream
mail/opensmtpd-extras-tool-stats||2019-11-15| Deprecated upstream
x11-wm/compton-yshui|x11-wm/picom|2019-11-18|Project renamed
lang/ponyc-static|lang/ponyc@llvm_static|2019-11-20|Flavored
devel/git-subversion|devel/git|2019-11-22|Subversion enabled by default in devel/git
devel/libtrue||2019-11-22|Has expired: The joke is dead
devel/rubygem-flipper-active_support_cache_store013|devel/rubygem-flipper-active_support_cache_store|2019-11-23|Obsolete, please use devel/rubygem-flipper-active_support_cache_store
databases/rubygem-flipper-active_record013|databases/rubygem-flipper-active_record|2019-11-23|Obsolete, please use databases/rubygem-flipper-active_record instead
devel/rubygem-flipper013|devel/rubygem-flipper|2019-11-23|Obsolete, please use devel/rubygem-flipper instead
devel/rubygem-google-protobuf371|devel/rubygem-google-protobuf|2019-11-23|Obsolete, please use devel/rubygem-google-protobuf instead
mail/rubygem-premailer-rails19-rails52|mail/rubygem-premailer-rails-rails52|2019-11-23|Obsolete, please use mail/rubygem-premailer-rails-rails52 instead
mail/rubygem-premailer-rails19-rails5|mail/rubygem-premailer-rails-rails5|2019-11-23|Obsolete, please use mail/rubygem-premailer-rails-rails5 instead
www/rubygem-rack-attack44|www/rubygem-rack-attack|2019-11-23|Obsolete, please use www/rubygem-rack-attack instead
databases/rubygem-state_machines-activerecord05|databases/rubygem-state_machines-activerecord|2019-11-23|Obsolete, use databases/rubygem-state_machines-activerecord instead
devel/rubygem-default_value_for32|devel/rubygem-default_value_for|2019-11-23|Obsolete, use devel/rubygem-default_value_for instead
www/rubygem-responders2-rails52|www/rubygem-responders-rails52|2019-11-23|Obsolete, please use www/rubygem-responders-rails52 instead
devel/rubygem-gitlab-default_value_for|devel/rubygem-default_value_for|2019-11-23|Obsolete, please use devel/rubygem-default_value_for instead
www/httpdirfs|sysutils/fusefs-httpdirfs|2019-11-23|Rename for consistency with other FUSE ports
math/tvm|misc/tvm|2019-11-24|Move to a more appropriate category
math/onnx|misc/onnx|2019-11-24|Move to a more appropriate category
math/py-onnx-tf|misc/py-onnx-tf|2019-11-24|Move to a more appropriate category
misc/console-bridge|devel/ros-console_bridge|2019-11-24|Use devel/ros-console_bridge instead
misc/urdfdom-headers|devel/ros-urdfdom_headers|2019-11-24|Use devel/ros-urdfdom_headers instead
misc/urdfdom|devel/ros-urdfdom|2019-11-24|Use devel/ros-urdfdom instead
sysutils/kdirstat|sysutils/k4dirstat|2019-11-25|Renamed to match the upstream name

View file

@ -184,6 +184,7 @@ py-phonon_DESC= Python bindings for Phonon module
py-qscintilla2_DESC= Python bindings for QScintilla2
py-script_DESC= Python bindings for QtScript module
py-scripttools_DESC= Python bindings for QtScriptTools module
py-sip_DESC= Python bindings generator for C and C++ libraries
py-sql_DESC= Python bindings for QtSql module
py-svg_DESC= Python bindings for QtSvg module
py-test_DESC= Python bindings for QtTest module
@ -217,7 +218,7 @@ _QMLDIR_REL= ${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL}
PYQT_APIDIR= ${PREFIX}/${_APIDIR_REL}
PYQT_DOCDIR= ${PREFIX}/${_DOCDIR_REL}
PYQT_EXAMPLEDIR= ${PREFIX}/${_EXAMPLEDIR_REL}
PYQT_SIPDIR= ${PREFIX}/${_SIPDIR_REL}
PYQT_SIPDIR?= ${PREFIX}/${_SIPDIR_REL}
PYQT_DESIGNERDIR= ${PREFIX}/${_DESIGNERDIR_REL}
PYQT_QMLDIR= ${PREFIX}/${_QMLDIR_REL}

View file

@ -264,10 +264,8 @@ MOZ_OPTIONS+= --disable-pulseaudio
BUILD_DEPENDS+= ${LOCALBASE}/include/sndio.h:audio/sndio
post-patch-SNDIO-on:
@${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \
${MOZSRC}/media/libcubeb/src/moz.build \
${MOZSRC}/toolkit/library/moz.build
@${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \
${MOZSRC}/media/libcubeb/gtest/moz.build
-e '/DISABLE_LIBSNDIO_DLOPEN/d' \
${MOZSRC}/media/libcubeb/src/moz.build
.endif
.if ${PORT_OPTIONS:MDEBUG}

View file

@ -162,7 +162,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}"
. endif
# The complete list of Java versions, os and vendors supported.
__JAVA_VERSION_LIST= 6 7 8 11 12 13
__JAVA_VERSION_LIST= 7 8 11 12 13
_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST= native linux
_JAVA_VENDOR_LIST= openjdk oracle
@ -270,7 +270,7 @@ JAVA_RUN= jre
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
. if defined(JAVA_VERSION)
_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.6/7/:S/1.7/7/:S/1.8/8/:S/6+/7+/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/}
_JAVA_VERSION= ${JAVA_VERSION:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.7/7/:S/1.8/8/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif

View file

@ -4535,9 +4535,11 @@ generate-plist: ${WRKDIR}
${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \
done
.if !empty(PLIST)
@if [ -f ${PLIST} ]; then \
${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \
.for f in ${PLIST}
@if [ -f "${f}" ]; then \
${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${f} >> ${TMPPLIST}; \
fi
.endfor
.endif
.for dir in ${PLIST_DIRS}

View file

@ -5,6 +5,74 @@ 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.
20191126:
AFFECTS: consumers of net/py-urllib3
AUTHOR: kai@FreeBSD.org
Since version 1.25 HTTPS connections are now verified by default which is
done via "cert_reqs = 'CERT_REQUIRED'". While certificate verification
can be disabled via "cert_reqs = 'CERT_NONE'", it's highly recommended to
leave it on.
Various consumers of net/py-urllib3 already have implemented routines that
either explicitly enable or disable HTTPS certificate verification (e.g.
via configuration settings, CLI arguments, etc.).
Yet it may happen that there are still some consumers which don't
explicitly enable/disable certificate verification for HTTPS connections
which could then lead to errors (as is often the case with self-signed
certificates).
In case of an error one should try first to temporarily disable
certificate verification of the problematic urllib3 consumer to see if
this approach will remedy the issue.
20191125:
AFFECTS: users of emulators/qemu
AUTHOR: bofh@FreeBSD.org
emulators/qemu31 has been updated to 4.1.1. Previous 3.1.X branch has
been repocopied to emulators/qemu31. If someone wants to stick with 3.1.X
branch please use one of the following command:
# pkg install emulators/qemu31
or
# portmaster -o emulators/qemu31 emulators/qemu
or
# portupgrade -o emulators/qemu31 emulators/qemu
20191124:
AFFECTS: users of irc/eggdrop
AUTHOR: dbaio@FreeBSD.org
The irc/eggdrop port has been updated to 1.8.4 and its config is not
backward compatible with 1.6.21. A new port was created to keep 1.6.21
version available at irc/eggdrop16 and it will be available for 3 months
until users have time to upgrade their configuration.
More information at:
https://raw.githubusercontent.com/eggheads/eggdrop/v1.8.4/NEWS
If you would like to keep using 1.6.21, please run the following command
to update pkg database:
pkg set -n eggdrop:eggdrop16
pkg set -o irc/eggdrop:irc/eggdrop16
20191108:
AFFECTS: users of databases/redis[-devel]
AUTHOR: osa@FreeBSD.org
The databases/redis port has been updated to the recent stable release.
Users wanting to stay on v4.x can replace databases/redis with
databases/redis4 with one of the following commands:
# pkg install databases/redis4
or
# portmaster -o databases/redis4 databases/redis
or
# portupgrade -o databases/redis4 databases/redis
20191103:
AFFECTS: users of www/node
AUTHOR: bhughes@FreeBSD.org