Framework: partially sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2020-12-04 12:26:10 +01:00
parent e2857fb699
commit 46af9d2517
10 changed files with 122 additions and 40 deletions

View File

@ -69,9 +69,9 @@ AUTHOR: bapt@FreeBSD.org
20201001:
AUTHOR: manu@FreeBSD.org
The @sample keyword was rewritten in lua.
It behaves exactly like the previous one but it is sandboxed and
is rootdir compliant (see pkg -r option).
The @sample keyword was rewritten in lua.
It behaves exactly like the previous one but it is sandboxed and
is rootdir compliant (see pkg -r option).
20201001:
AUTHOR: bapt@FreeBSD.org

1
LEGAL
View File

@ -48,7 +48,6 @@ cos-* java/cos Special conditions apply for commercial use
cosmo/* games/cosmo Possible copyright infringement
CrystalSVGforGnomeIcons* x11-themes/gnome-icons-crystal Themes may contain artwork not done by the author. Keep FreeBSD safe if theme author violated copyrights.
cyberbit/* x11-fonts/cyberbit-ttfonts Not free for commercial use
datamodeler databases/datamodeler Packaging prohibited by Oracle license
dbvis java/dbvis Redistribution is not permitted
dcl-*-C.tar.gz science/cdcl No commercial use
dcl-*.tar.gz science/dcl No commercial use

36
MOVED
View File

@ -788,7 +788,6 @@ devel/p5-MooseX-Policy-SemiAffordanceAccessor|devel/p5-MooseX-SemiAffordanceAcce
www/mediawiki12|www/mediawiki112|2009-08-19|Renamed
lang/gcc42-withgcjawt|lang/gcc42|2009-08-19|Not needed any longer, still an option for the regular lang/gcc ports
math/octave-forge-windows||2009-08-23|Abandoned upstream
math/freefem++||2009-08-23|Has expired: unmaintained and consistently unportable
math/it++||2009-08-23|Has expired: unmaintained and consistently unportable
databases/firebird-client||2009-09-03|Removed: no longer under development
databases/firebird-server||2009-09-03|Removed: no longer under development
@ -12845,7 +12844,6 @@ textproc/rubygem-gitlab-linguist|textproc/rubygem-github-linguist|2019-08-31|Has
textproc/rubygem-html-pipeline1|textproc/rubygem-html-pipeline|2019-08-31|Has expired: Use textproc/rubygem-html-pipeline instead
devel/pure-stldict||2019-09-01|Has expired: Depends on expiring devel/llvm35
lang/dmd1||2019-09-01|Has expired: No longer supported upstream
lang/gprolog||2019-09-01|Has expired: Abandonware upstream (more than five years), fails in various ways with remotely recent compilers
math/pure-mpfr||2019-09-01|Has expired: Depends on expiring devel/llvm35
math/pure-rational||2019-09-01|Has expired: Depends on expiring devel/llvm35
net/pure-sockets||2019-09-01|Has expired: Depends on expiring devel/llvm35
@ -12872,7 +12870,6 @@ editors/dexed||2019-09-05|Has expired: Depends on expiring devel/dfmt
editors/p5-Padre||2019-09-05|Has expired: Depends on expiring x11-toolkits/p5-Wx
emulators/qemu2||2019-09-05|Has expired: Latest 3.X branch is in ports tree
games/asc||2019-09-05|Has expired: Broken for more than 6 months
games/slade||2019-09-05|Has expired: Broken for more than 6 months
graphics/gimp-wavelet-decompose-plugin||2019-09-05|Has expired: Broken for more than 6 months
irc/irssi-otr||2019-09-05|Has expired: Broken for more than 6 months
mail/p5-Mail-ClamAV||2019-09-05|Has expired: Broken for more than 6 months
@ -14678,7 +14675,6 @@ lang/ohugs||2020-05-05|Has expired: Broken for more than 6 months
lang/opendylan||2020-05-05|Has expired: Broken for more than 6 months
lang/phc||2020-05-05|Has expired: Broken for more than 6 months
lang/starlogo||2020-05-05|Has expired: Broken for more than 6 months
lang/yap||2020-05-05|Has expired: Broken for more than 6 months
lang/yap-devel||2020-05-05|Has expired: Broken for more than 6 months
mail/chk4mail||2020-05-05|Has expired: Broken for more than 6 months
mail/librfc822||2020-05-05|Has expired: Broken for more than 6 months
@ -15708,4 +15704,34 @@ www/py-meld3||2020-11-15|Has expired: EOLed upstream
www/py-requestbuilder||2020-11-15|Has expired: Uses deprecated version of python
x11-toolkits/py-SquareMap||2020-11-15|Has expired: Uses deprecated version of python
devel/py-utils||2020-11-16|Removed on maintainers request, uses EOLed python27
net-mgmt/cnagios4|net-mgmt/cnagio|2020-11-17|Moved to nagios4 flavored version
net-mgmt/cnagios4|net-mgmt/cnagios|2020-11-17|Moved to nagios4 flavored version
net/remmina-plugin-exec|net/remmina|2020-11-24|Moved to remmina flavored version
net/remmina-plugin-nx|net/remmina|2020-11-24|Moved to remmina flavored version
net/remmina-plugin-rdp|net/remmina|2020-11-24|Moved to remmina flavored version
net/remmina-plugin-secret|net/remmina|2020-11-24|Moved to remmina flavored version
net/remmina-plugin-spice|net/remmina|2020-11-24|Moved to remmina flavored version
net/remmina-plugin-st|net/remmina|2020-11-24|Moved to remmina flavored version
net/remmina-plugin-vnc|net/remmina|2020-11-24|Moved to remmina flavored version
net/remmina-plugin-www|net/remmina|2020-11-24|Moved to remmina flavored version
net/remmina-plugin-xdmcp|net/remmina|2020-11-24|Moved to remmina flavored version
net/remmina-plugins|net/remmina|2020-11-24|Moved to remmina flavored version
graphics/jpeg|graphics/jpeg-turbo|2020-12-01|Has expired: Outdated and vulnerable, new version breaks API and ABI
databases/datamodeler||2020-12-01|Has expired: depends on expiring java/openjfx8-devel
devel/gradle4||2020-12-01|Has expired: only needed for expiring java/openjfx8-devel
devel/py-astroid1|devel/py-astroid|2020-12-01|Has expired: Use devel/py-astroid instead
devel/pylint1|devel/pylint|2020-12-01|Has expired: Use devel/pylint instead
german/mediathekview||2020-12-01|Has expired: depends on expiring java/openjfx8-devel
java/openjfx8-devel||2020-12-01|Has expired: No longer maintained upstream
java/openjfx8-scenebuilder||2020-12-01|Has expired: depends on expiring java/openjfx8-devel
net-im/py-sleekxmpp|net-im/py-slixmpp|2020-12-01|Has expired: Upstream archived and advices to use net-im/py-slixmpp
net-mgmt/zabbix44-agent|net-mgmt/zabbix5-agent|2020-12-01|Has expired: End of Life
net-mgmt/zabbix44-frontend|net-mgmt/zabbix5-frontend|2020-12-01|Has expired: End of Life
net-mgmt/zabbix44-java|net-mgmt/zabbix5-java|2020-12-01|Has expired: End of Life
net-mgmt/zabbix44-proxy|net-mgmt/zabbix5-proxy|2020-12-01|Has expired: End of Life
net-mgmt/zabbix44-server|net-mgmt/zabbix5-server|2020-12-01|Has expired: End of Life
print/jabref||2020-12-01|Has expired: depends on expiring java/openjfx8-devel
science/datawarrior||2020-12-01|Has expired: depends on expiring java/openjfx8-devel
www/rubygem-dashing||2020-12-03|Has expired: Unmaintained by upstream, use www/rubygem-smashing instead
www/rubygem-redmine_acts_as_taggable_on||2020-12-03|Has expired: Unmaintained by upstream
www/rubygem-gitlab-grack||2020-12-03|Has expired: Deprecated by upstream
databases/db6||2020-12-03|Has expired: latest 6.2.x version and newer not downloadable without registration

View File

@ -592,7 +592,7 @@ proxydeps_suggest_uses() {
elif [ ${pkg} = "converters/libiconv" ]; then
warn "you need USES+=iconv, USES+=iconv:wchar_t, or USES+=iconv:translit depending on needs"
# jpeg
elif [ ${pkg} = "graphics/jpeg" -o ${pkg} = "graphics/jpeg-turbo" ]; then
elif [ ${pkg} = "graphics/jpeg-turbo" ]; then
warn "you need USES+=jpeg"
# libarchive
elif [ ${pkg} = "archivers/libarchive" ]; then

View File

@ -59,19 +59,22 @@ BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME}
_BDB_DEFAULT_save:=${BDB_DEFAULT}
_DB_PORTS= 5 6
_DB_DEFAULTS= 5 # does not include 6 due to different licensing
# but user can re-add it through WITH_BDB6_PERMITTED
_DB_PORTS= 5 18
_DB_DEFAULTS= 5
#
# Since 2020-12-02, this name is not fitting too much but
# retained for now for compatibility. The name of this variable
# is subject to change especially once db6 were removed.
. if defined(WITH_BDB6_PERMITTED)
_DB_DEFAULTS+= 6
_DB_DEFAULTS+= 18
. endif
# Dependency lines for different db versions
db5_DEPENDS= libdb-5.3.so:databases/db5
db6_DEPENDS= libdb-6.2.so:databases/db6
db18_DEPENDS= libdb-18.1.so:databases/db18
# Detect db versions by finding some files
db5_FIND= ${LOCALBASE}/include/db5/db.h
db6_FIND= ${LOCALBASE}/include/db6/db.h
db18_FIND= ${LOCALBASE}/include/db18/db.h
# Override the global BDB_DEFAULT with the
# port specific <BDB_UNIQUENAME>_WITH_BDB_VER
@ -109,9 +112,9 @@ _INST_BDB_VER+=${bdb}
# 2. parse supported versions:
# 2a. build list from _bdb_ARGS
_SUPP_BDB_VER=
__bdb_ARGS:=${_bdb_ARGS:C,\+$,,:C/(.)(.)$/\1.\2/}
__bdb_ARGS:=${_bdb_ARGS:C,\+$,,}
.if !empty(_bdb_ARGS:M*+)
. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/}
. for bdb in ${_DB_PORTS}
. if ${__bdb_ARGS} <= ${bdb}
_SUPP_BDB_VER+=${bdb:C/\.//}
. endif
@ -121,9 +124,9 @@ _SUPP_BDB_VER=${_bdb_ARGS}
.endif
# 2b. expand INVALID_BDB_VER if given with "+":
.if !empty(INVALID_BDB_VER:M*+)
_INV_BDB:=${INVALID_BDB_VER:C,\+$,,:C/(.)(.)$/\1.\2/}
_INV_BDB:=${INVALID_BDB_VER:C,\+$,,}
_INV_BDB_VER:=
. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/}
. for bdb in ${_DB_PORTS}
. if ${_INV_BDB} <= ${bdb}
_INV_BDB_VER+=${bdb:C/\.//}
. endif
@ -179,10 +182,10 @@ LIB_DEPENDS+= ${db${_BDB_VER}_DEPENDS}
BDB_LIB_NAME= db-5.3
BDB_LIB_CXX_NAME= db_cxx-5.3
BDB_LIB_DIR= ${LOCALBASE}/lib/db5
. elif ${_BDB_VER} == 6
BDB_LIB_NAME= db-6.2
BDB_LIB_CXX_NAME= db_cxx-6.2
BDB_LIB_DIR= ${LOCALBASE}/lib/db6
. elif ${_BDB_VER} == 18
BDB_LIB_NAME= db-18.1
BDB_LIB_CXX_NAME= db_cxx-18.1
BDB_LIB_DIR= ${LOCALBASE}/lib/db18
. endif
BDB_LIB_NAME?= db${_BDB_VER}
BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx

View File

@ -71,15 +71,16 @@ MKINSTDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
_FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \
fcl-async fcl-base fcl-db fcl-extra fcl-fpcunit fcl-image \
fcl-js fcl-json fcl-net fcl-passrc fcl-pdf fcl-registry \
fcl-res fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml fftw \
fpindexer fppkg fv gdbint gdbm gmp googleapi graph gtk2 \
hermes httpd22 httpd24 ibase iconvenc imagemagick \
ldap libcurl libgd libmicrohttpd libpng libvlc libxml2 lua mad \
modplug mysql ncurses newt numlib odbc oggvorbis openal opengl \
openssl oracle pasjpeg pcap postgres proj4 pthreads pxlib \
regexpr rexx rsvg rtl-console rtl-extra rtl-objpas rtl-unicode \
sdl sqlite svgalib symbolic syslog unzip users utmp uuid x11 \
xforms zlib
fcl-report fcl-res fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml \
fftw fpindexer fppkg fv gdbint gdbm gnutls gmp googleapi \
graph gtk2 hermes httpd22 httpd24 ibase iconvenc imagemagick \
ldap libcups libcurl libenet libfontconfig libgd libmagic \
libmicrohttpd libpng libvlc libxml2 lua mad modplug \
mysql ncurses newt numlib odata odbc oggvorbis openal opengl openssl \
oracle pasjpeg pastojs pcap postgres proj4 pthreads pxlib \
regexpr rexx rsvg rtl-console rtl-extra rtl-generics rtl-objpas \
rtl-unicode sdl sqlite svgalib symbolic syslog unzip users utmp \
uuid vcl-compat webidl x11 xforms zlib
.if ${fpc_ARGS:Mbase}
USE_FPC= gdbint graph httpd22 httpd24 ibase mysql odbc oracle pasjpeg \
@ -136,6 +137,7 @@ fcl_net_UNIT= devel/fpc-fcl-net
fcl_passrc_UNIT= devel/fpc-fcl-passrc
fcl_pdf_UNIT= devel/fpc-fcl-pdf
fcl_registry_UNIT= devel/fpc-fcl-registry
fcl_report_UNIT= devel/fpc-fcl-report
fcl_res_UNIT= devel/fpc-fcl-res
fcl_sdo_UNIT= devel/fpc-fcl-sdo
fcl_sound_UNIT= devel/fpc-fcl-sound
@ -149,6 +151,7 @@ fpvectorial_UNIT= graphics/fpc-fpvectorial
fv_UNIT= devel/fpc-fv
hermes_UNIT= graphics/fpc-hermes
gdbm_UNIT= databases/fpc-gdbm
gnutls_UNIT= security/fpc-gnutls
gmp_UNIT= math/fpc-gmp
googleapi_UNIT= www/fpc-googleapi
gtk2_UNIT= x11-toolkits/fpc-gtk2
@ -156,7 +159,11 @@ iconvenc_UNIT= converters/fpc-iconvenc
imagemagick_UNIT= graphics/fpc-imagemagick
ldap_UNIT= net/fpc-ldap
libcurl_UNIT= ftp/fpc-libcurl
libcups_UNIT= print/fpc-libcups
libenet_UNIT= net/fpc-libenet
libfontconfig_UNIT= x11-fonts/fpc-libfontconfig
libgd_UNIT= graphics/fpc-libgd
libmagic_UNIT= devel/fpc-libmagic
libmicrohttpd_UNIT= www/fpc-libmicrohttpd
libpng_UNIT= graphics/fpc-libpng
libvlc_UNIT= multimedia/fpc-libvlc
@ -167,10 +174,12 @@ modplug_UNIT= audio/fpc-modplug
newt_UNIT= devel/fpc-newt
ncurses_UNIT= graphics/fpc-ncurses
numlib_UNIT= math/fpc-numlib
odata_UNIT= devel/fpc-odata
oggvorbis_UNIT= audio/fpc-oggvorbis
openal_UNIT= audio/fpc-openal
opengl_UNIT= graphics/fpc-opengl
openssl_UNIT= security/fpc-openssl
pastojs_UNIT= lang/fpc-pastojs
pcap_UNIT= net/fpc-pcap
proj4_UNIT= graphics/fpc-proj4
pxlib_UNIT= databases/fpc-pxlib
@ -178,6 +187,7 @@ rexx_UNIT= lang/fpc-rexx
rsvg_UNIT= graphics/fpc-rsvg
rtl_console_UNIT= lang/fpc-rtl-console
rtl_extra_UNIT= lang/fpc-rtl-extra
rtl_generics_UNIT= lang/fpc-rtl-generics
rtl_objpas_UNIT= lang/fpc-rtl-objpas
rtl_unicode_UNIT= lang/fpc-rtl-unicode
sdl_UNIT= devel/fpc-sdl
@ -188,6 +198,8 @@ unzip_UNIT= archivers/fpc-unzip
users_UNIT= sysutils/fpc-users
utmp_UNIT= sysutils/fpc-utmp
uuid_UNIT= sysutils/fpc-uuid
vcl_compat_UNIT= graphics/fpc-vcl-compat
webidl_UNIT= www/fpc-webidl
x11_UNIT= x11/fpc-x11
xforms_UNIT= x11-toolkits/fpc-xforms
zlib_UNIT= devel/fpc-zlib

View File

@ -8,7 +8,7 @@
#
# User defined variables:
# JPEG_PORT - jpeg implementation
# Valid values: graphics/jpeg and graphics/jpeg-turbo
# Valid value: graphics/jpeg-turbo
# Default value: graphics/jpeg-turbo
#
# MAINTAINER: portmgr@FreeBSD.org

View File

@ -54,11 +54,11 @@ _KDE_RELNAME= KDE${_KDE_VERSION}
# === VERSIONS OF THE DIFFERENT COMPONENTS =====================================
# Current KDE desktop.
KDE_PLASMA_VERSION?= 5.20.3
KDE_PLASMA_VERSION?= 5.20.4
KDE_PLASMA_BRANCH?= stable
# Current KDE frameworks.
KDE_FRAMEWORKS_VERSION?= 5.75.0
KDE_FRAMEWORKS_VERSION?= 5.76.0
KDE_FRAMEWORKS_BRANCH?= stable
# Current KDE applications.

View File

@ -35,7 +35,7 @@ ${_l:tu}_DEFAULT= ${lang:C/.*=//g}
# Possible values: 2.4
APACHE_DEFAULT?= 2.4
# Possible values: 48, 5, 6
# Possible values: 5, 6, 18
BDB_DEFAULT?= 5
# Possible values: 2, 3
COROSYNC_DEFAULT?= 2
@ -46,7 +46,7 @@ FIREBIRD_DEFAULT?= 2.5
# Possible values: flang (experimental), gfortran
FORTRAN_DEFAULT?= gfortran
# Possible values: 3.0.4
FPC_DEFAULT?= 3.0.4
FPC_DEFAULT?= 3.2.0
# Possible values: 8, 9 (powerpcspe was dropped with GCC 9)
.if ${ARCH} == "powerpcspe"
GCC_DEFAULT?= 8
@ -60,7 +60,7 @@ JAVA_DEFAULT?= 8
# Possible values: 0.6, 0.7, 1.0, 1.1
JULIA_DEFAULT?= 1.0
# Possible values: 2.0.8
LAZARUS_DEFAULT?= 2.0.8
LAZARUS_DEFAULT?= 2.0.10
# Possible values: rust legacy
.if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le)
LIBRSVG2_DEFAULT?= rust
@ -103,7 +103,7 @@ PYTHON2_DEFAULT?= 2.7
# Possible values: 3.6, 3.7, 3.8, 3.9
PYTHON3_DEFAULT?= 3.7
# Possible values: 2.5, 2.6, 2.7, 3.0
RUBY_DEFAULT?= 2.6
RUBY_DEFAULT?= 2.7
# Possible values: rust, rust-nightly
RUST_DEFAULT?= rust
# Possible values: 4.11, 4.12, 4.13

View File

@ -5,6 +5,48 @@ 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.
20201130:
AFFECTS: users of graphics/jpeg
AUTHOR: rene@FreeBSD.org
The graphics/jpeg port has been removed in favor of graphics/jpeg-turbo.
The former port was vulnerable and used an outdated ABI and API.
Please check your make configuration for JPEG_PORT and remove it or
set it to "jpeg-turbo" if it is currently set to "jpeg".
20201128:
AFFECTS: users of databases/cego
AUTHOR: pi@FreeBSD.org
Database updates from 2.45.x to 2.46.x require a xml tableset export
and import, since table structure information has been changed.
20201128:
AFFECTS: users of lang/ruby26
AUTHOR: mfechner@FreeBSD.org
The default ruby version has been updated from 2.6 to 2.7.
If you compile your own ports you may keep 2.6 as the default version by
adding the following lines to your /etc/make.conf file:
#
# Keep ruby 2.6 as default version
#
DEFAULT_VERSIONS+=ruby=2.6
If you wish to update to the new default version, you need to first stop any
software that uses ruby. Then, you will need to follow these steps, depending
upon how you manage your system.
If you use pkg, simply upgrade:
# pkg upgrade
If you do not use pkg, please check entry 20190420.
The description there should also work for this version.
20201112:
AFFECTS: users of net-mgmt/pushgateway
AUTHOR: rhurlin@FreeBSD.org