Lainports/opnsense-ports
3
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Framework: sync with upstream

Browse source 
Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2018-01-26 20:00:29 +01:00
parent a0d968d24e
commit e1b448d518
6 changed files with 58 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CHANGES
View file

@ -10,6 +10,21 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
20180125:
AUTHOR: mat@FreeBSD.org
Add support to passing directories to EXTRA_PATCHES.
Instead of:
EXTRA_PATCHES= ${PATCHDIR}/feat-foo-patch-file.c \
${PATCHDIR}/feat-foo-patch-file.h \
${PATCHDIR}/feat-foo-patch-file2.c
Move those files to ${PATCHDIR}/feat-foo/, name them patch-*, and set:
EXTRA_PATCHES= ${PATCHDIR}/feat-foo
20180116:
AUTHOR: mat@FreeBSD.org

19
MOVED
View file

@ -993,7 +993,6 @@ japanese/stardict2-dict-ja||2010-02-25|Please use japanese/stardict-dict-ja
net/mpd||2010-02-25|Has expired: obsoleted, unsupported port. Use net/mpd4, net/mpd5 instead
textproc/xmlada-gcc||2010-02-27|Has expired: broken and practically unmaintained
www/cheetah||2010-03-16|Has expired: broken, unmaintained, development ceased in 2001
net-p2p/rblibtorrent-devel||2010-03-16|Old version, no longer depended on
mail/sylpheed2|mail/sylpheed3|2010-03-23|Update to new major version
multimedia/gstreamer-schroedinger||2010-03-24|Removed
multimedia/video4bsd-kmod|multimedia/cuse4bsd-kmod|2010-03-25|Renamed
@ -1117,7 +1116,6 @@ sysutils/bacula-client-devel||2010-07-16|Removed
sysutils/bacula-server-devel||2010-07-16|Removed
java/eclipse-v4all||2010-07-16|Not useful with Eclipse 3.x
irc/kvirc-devel||2010-07-17|irc/kvirc has been updated to the latest version
www/p5-Plack-Server-AnyEvent||2010-07-19|Use www/p5-Twiggy instead
science/qelectrotech|cad/qelectrotech|2010-07-21|Fix category
mail/squirrelmail-compatibility-plugin1|mail/squirrelmail-compatibility-plugin|2010-07-21|Has expired: use mail/squirrelmail-compatibility-plugin
mail/squirrelmail-newuser_wiz-plugin|mail/squirrelmail-askuserinfo-plugin|2010-07-21|Has expired: use mail/squirrelmail-askuserinfo-plugin
@ -1233,7 +1231,7 @@ multimedia/vlconwooztalk||2010-09-14|Has expired: wooztalk website not respondin
net-im/wooztalk||2010-09-14|Has expired: wooztalk website not responding as of 20100731
russian/php_doc||2010-09-14|Has expired: Support for the Russian translation of the PHP manual seems to have stopped
sysutils/ipmi-kmod||2010-09-14|Has expired: in base system since 6.2-RELEASE
www/p5-Plack-Server-AnyEvent||2010-09-14|Has expired: yes
www/p5-Plack-Server-AnyEvent||2010-07-19|Use www/p5-Twiggy instead
www/xpi-dailymotiononwooztalk||2010-09-14|Has expired: wooztalk website not responding as of 20100731
www/xpi-deezeronwooztalk||2010-09-14|Has expired: wooztalk website not responding as of 20100731
www/xpi-firefoxonwooztalk||2010-09-14|Has expired: wooztalk website not responding as of 20100731
@ -3966,7 +3964,6 @@ sysutils/salt|sysutils/py-salt|2013-01-27|Rename to consistency with other Pytho
sysutils/salt-cloud|sysutils/py-salt-cloud|2013-01-27|Rename to consistency with other Python ports
deskutils/py-dosage|deskutils/dosage|2013-01-28|Rename - it's a standalone application
textproc/clucene-contrib|textproc/clucene|2013-01-28|Integrated into textproc/clucene
textproc/clucene-contrib|textproc/clucene|2013-01-28|Integrated into textproc/clucene
lang/erlang14||2013-01-30|Not needed; no issues came up with R15
www/tomcat55||2013-01-31|Has expired: EOL and unsupported upstream
net/samba-pdbsql||2013-01-31|Depends from the obsoleted net/samba34
@ -5250,7 +5247,6 @@ www/clickheat||2013-12-07|Has expired: No more activity since 2011
security/rarcrack||2013-12-08|Has expired: Not active since several years
java/subversion-java|java/java-subversion|2013-12-08|Rename to reflect subversion child port naming scheme
games/flare|games/flare-game|2013-12-10|Flare port was split into engine and game counterparts, as upstream did
audio/liteamp||2013-12-15|Has expired: Dead upstream since 2004, does not build with clang
security/opieprint||2013-12-15|Has expired: No more active upstream
security/bubblegum||2013-12-15|Has expired: No more active upstream
security/snortsms||2013-12-15|Has expired: Not active since several years
@ -5503,7 +5499,6 @@ graphics/php52-exif||2014-03-01|PHP 5.2 is end-of-life
graphics/php52-gd||2014-03-01|PHP 5.2 is end-of-life
graphics/php52-ming||2014-03-01|PHP 5.2 is end-of-life
lang/php52||2014-03-01|PHP 5.2 is end-of-life
lang/php52||2014-03-01|PHP 5.2 is end-of-life.ext
lang/php52-extensions||2014-03-01|PHP 5.2 is end-of-life
mail/php52-imap||2014-03-01|PHP 5.2 is end-of-life
math/php52-bcmath||2014-03-01|PHP 5.2 is end-of-life
@ -5844,7 +5839,6 @@ databases/libgda3-ldap||2014-04-11|Ancient version, consider using newer version
databases/libgda3-mdb||2014-04-11|Ancient version, consider using newer versions
databases/libgda3-mysql||2014-04-11|Ancient version, consider using newer versions
databases/libgda3-odbc||2014-04-11|Ancient version, consider using newer versions
databases/libgda3-odbc||2014-04-11|Ancient version, consider using newer versions
databases/libgda3-postgresql||2014-04-11|Ancient version, consider using newer versions
databases/libgnomedb||2014-04-11|Superseded by libgda starting from version 4
databases/libgnomedb-reference||2014-04-11|Superseded by libgda starting from version 4
@ -6554,7 +6548,6 @@ games/avp-demo||2014-09-01|Not staged
games/linux-sof||2014-09-01|Not staged
games/quake3-freezetag||2014-09-01|Not staged
games/rftg||2014-09-01|Not staged
games/rftg||2014-09-01|Not staged
german/manpages||2014-09-01|Not staged
graphics/Cgraph||2014-09-01|Not staged
graphics/glide3||2014-09-01|Not staged
@ -9140,7 +9133,6 @@ accessibility/gnome-speech||2017-04-01|Obsolete and not depend on anymore
accessibility/gok||2017-04-01|Obsolete and not depend on anymore
accessibility/dasher||2017-04-01|Obsolete and not depend on anymore
accessibility/java-access-bridge||2017-04-01|Obsolete and not depend on anymore
accessibility/dasher||2017-04-01|Obsolete and not depend on anymore
accessibility/at-spi||2017-04-01|Obsolete and not depend on anymore
accessibility/at-spi-reference||2017-04-01|Obsolete and not depend on anymore
deskutils/gnome-blog||2017-04-01|Obsolete and not depend on anymore
@ -9836,15 +9828,14 @@ net-mgmt/nrpe-ssl|net-mgmt/nrpe3|2018-01-01|nrpe 2.0 not maintained, use nrpe 3.
security/gnupg20|security/gnupg|2018-01-01|Has expired: Will reach EOL upstream on 2017-12-31
dns/dualserver|dns/dnsmasq|2018-01-01|Has expired: Please migrate to dns/dnsmasq; over the years dualserver has become unmaintainable
devel/p5-Parse-Pidl44|devel/p5-Parse-Pidl|2018-01-01|Has expired: use devel/p5-Parse-Pidl instead
sysutils/DTraceToolkit||2018-01-01|Has expired: Now maintained as part of the base system
www/rubygem-jwt2|www/rubygem-jwt|2018-01-02|www/rubygem-jwt has been updated to 2.x
misc/py-qt5-doc||2018-01-02|No longer shipped by upstream
audio/beast||2018-01-05|Has expired: 4.5 years old version, six versions behind, requires old toolchain, and unmaintained.
audio/beast||2018-01-05|Has expired: 4.5 years old version, six versions behind, requires old toolchain, and unmaintained
devel/p5-MooseX-Role-WithOverloading||2018-01-06|Has expired: deprecated by upstream (obsolete with modern Moose)
devel/p5-Test-Block||2018-01-06|Has expired: Marked as deprecated upstream
x11-toolkits/qt5-declarative-render2d/||2018-01-06|Merged into x11-toolkits/qt5-quick
x11-toolkits/qt5-declarative-render2d||2018-01-06|Merged into x11-toolkits/qt5-quick
editors/vim-lite|editors/vim-console|2018-01-11|Renamed to reflect that it is console-only, not any lighter
devel/py-repl|devel/py-pyrepl|2018-01-10|Rename to match pypi name
devel/py-repl|devel/py-pyrepl|2018-01-11|Rename to match pypi name
devel/lua-bitop-51|devel/lua51-bitop|2018-01-14|Rename to lua51- prefix
astro/boinc-setiathome-v7|astro/boinc-setiathome-v8|2018-01-14|Rename to v8 to reflect current version
astro/boinc-setiathome-v8|astro/boinc-setiathome|2018-01-14|Rename to unversioned per adamw@
@ -9860,3 +9851,5 @@ net/unison-nox11|net/unison@nox11|2018-01-15|Moved to a flavored, generic, versi
audio/hydrogen-devel|audio/hydrogen|2018-01-17|Out of date: use audio/hydrogen for now
graphics/py-rabbyt||2018-01-19|Has expired: Development ceased, no longer used in the ports
deskutils/py-spice-gtk|deskutils/spice-gtk|2018-01-20|Old style Python bindings dropped, no difference from the master port
lang/py-clojure|lang/py-clojure_py|2018-01-26|Rename to match PyPI naming
www/tomcat-devel|www/tomcat9|2018-01-26|Apache Tomcat 9.0.4 is the first stable release of the 9.0.x series

11
Mk/Scripts/do-patch.sh
View file

@ -107,9 +107,14 @@ fi
if [ -n "${dp_EXTRA_PATCHES}" ]; then
for i in ${dp_EXTRA_PATCHES}; do
apply_one_patch "${i}" \
"Applying extra patch" \
${dp_PATCH_ARGS}
if [ -d "${i}" ]; then
patch_from_directory "${i}" \
"extra patch"
else
apply_one_patch "${i}" \
"Applying extra patch" \
${dp_PATCH_ARGS}
fi
done
fi

40
Mk/Uses/python.mk
View file

@ -6,7 +6,7 @@
#
# Feature: python
# Usage: USES=python or USES=python:args
# Valid ARGS: <version>, build, run, test
# Valid ARGS: <version>, patch, build, run, test
#
# version If your port requires only some set of Python versions, you
# can set this to [min]-[max] or min+ or -max or as an
@ -22,6 +22,8 @@
# USES=python # Use the set default Python
# # version
#
# patch Indicates that Python is needed at patch time and adds
# it to PATCH_DEPENDS.
# build Indicates that Python is needed at build time and adds
# it to BUILD_DEPENDS.
# run Indicates that Python is needed at run time and adds
@ -35,8 +37,10 @@
# PYTHON_NO_DEPENDS.
#
# If build, run and test are omitted, Python will be added as BUILD_DEPENDS,
# RUN_DEPENDS and TEST_DEPENDS. PYTHON_NO_DEPENDS can be set to not add any
# dependencies.
# RUN_DEPENDS and TEST_DEPENDS.
# patch is independant, it does not prevent the default build/run/test
# dependency.
# env or PYTHON_NO_DEPENDS can be set to not add any dependencies.
#
# Variables, which can be set by a user:
#
@ -268,6 +272,10 @@ _PYTHON_FEATURE_FLAVORS= yes
.undef _PYTHON_RUN_DEP
.undef _PYTHON_TEST_DEP
_PYTHON_ARGS= ${python_ARGS:S/,/ /g}
.if ${_PYTHON_ARGS:Mpatch}
_PYTHON_PATCH_DEP= yes
_PYTHON_ARGS:= ${_PYTHON_ARGS:Npatch}
.endif
.if ${_PYTHON_ARGS:Mbuild}
_PYTHON_BUILD_DEP= yes
_PYTHON_ARGS:= ${_PYTHON_ARGS:Nbuild}
@ -660,24 +668,14 @@ PY_FUTURES=
.endif
# dependencies
.if defined(_PYTHON_BUILD_DEP)
BUILD_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
.if defined(_WANTS_META_PORT)
BUILD_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT}
.endif
.endif
.if defined(_PYTHON_RUN_DEP)
RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
.if defined(_WANTS_META_PORT)
RUN_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT}
.endif
.endif
.if defined(_PYTHON_TEST_DEP)
TEST_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
.if defined(_WANTS_META_PORT)
TEST_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT}
.endif
.endif
.for _stage in PATCH BUILD RUN TEST
. if defined(_PYTHON_${_stage}_DEP)
${_stage}_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR}
. if defined(_WANTS_META_PORT)
${_stage}_DEPENDS+= python${_WANTS_META_PORT}:${_PYTHON_RELPORTDIR}${_WANTS_META_PORT}
. endif
. endif
.endfor
# set $PREFIX as Python's one
.if defined(_PYTHON_FEATURE_PYTHONPREFIX)

4
Mk/bsd.port.mk
View file

@ -749,7 +749,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# ${WRKDIR}, then point EXTRA_PATCHES to them.
# The patches specified by this variable will be
# applied after the normal distribution patches but
# before those in ${PATCHDIR}.
# before those in ${PATCHDIR}. This can also contain
# directories, all the files named patch-* in those directories
# will be applied.
# EXTRA_PATCH_TREE - where to find extra 'out-of-tree' patches
# Points to a directory hierarchy with the same layout
# as the ports tree, where local patches can be found.

7
Tools/scripts/MOVEDlint.awk
View file

@ -74,6 +74,13 @@ $3 !~ /^20[0-3][0-9]-[01][0-9]-[0-3][0-9]$/ {
}
{
if ($1 in srcs) {
printf "%5d: %s has duplicate entries\n", NR, $1 | sort
error[NR] = 1
next
}
srcs[$1] = 1
if (lastdate > $3) {
printf "%5d: date going backwards from %s to %s\n", NR, lastdate, $3 | sort
error[NR] = 1