forked from Lainports/opnsense-ports
Framework: sync with upstream
Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner
parent
c0826e3616
commit
113daf85bd
5 changed files with 105 additions and 17 deletions
24
MOVED
24
MOVED
|
|
@ -10328,3 +10328,27 @@ textproc/kibana46|textproc/kibana5|2018-07-10|Has expired: End of Life was 2018-
|
|||
print/cups-connector|print/cloud-print-connector|2018-07-11|Project renamed upstream
|
||||
net/wpa_gui|net/wpa_supplicant_gui|2018-07-12|Rename to wpa_supplicant_gui for ease of search
|
||||
lang/gcc47|lang/gcc6|2018-07-15|Has expired: Unsupported by upstream. Use GCC 6 or newer instead.
|
||||
net-p2p/transmission-qt4|net-p2p/transmission-qt@qt4|2018-07-15|Moved into flavored version
|
||||
net-p2p/transmission-qt5|net-p2p/transmission-qt@qt5|2018-07-15|Moved into flavored version
|
||||
java/jaf||2018-07-16|Included in JRE since 1.6 version
|
||||
net/p5-ZConf-Bookmarks||2018-07-16|Has expired: Unmaintained
|
||||
net/p5-ZConf||2018-07-16|Has expired: Unmaintained
|
||||
textproc/p5-Text-SpellChecker-GUI||2018-07-16|Has expired: Unmaintained
|
||||
deskutils/p5-ZConf-Runner-GUI-GTK||2018-07-16|Has expired: Unmaintained
|
||||
deskutils/p5-ZConf-BGSet||2018-07-16|Has expired: Unmaintained
|
||||
deskutils/p5-ZConf-Runner||2018-07-16|Has expired: Unmaintained
|
||||
graphics/p5-Image-Size-FillFullSelect||2018-07-16|Has expired: Unmaintained
|
||||
graphics/p5-Imager-AverageGray||2018-07-16|Has expired: Unmaintained
|
||||
mail/p5-Mail-IMAPTalk-MailCache||2018-07-16|Has expired: Unmaintained
|
||||
mail/p5-ZConf-Mail||2018-07-16|Has expired: Unmaintained
|
||||
mail/p5-Mail-Cache||2018-07-16|Has expired: Unmaintained
|
||||
www/p5-ZConf-RSS||2018-07-16|Has expired: Unmaintained
|
||||
www/p5-ZConf-RSS-GUI-GTK||2018-07-16|Has expired: Unmaintained
|
||||
devel/p5-ZConf-GUI||2018-07-16|Has expired: Unmaintained
|
||||
net-im/mastodon||2018-07-16|Has expired: Breaks too frequently
|
||||
x11-fm/p5-PerlFM||2018-07-16|Has expired: Unmaintained
|
||||
astro/p5-ZConf-Weather||2018-07-16|Has expired: Unmaintained
|
||||
sysutils/p5-ZConf-Cron||2018-07-16|Has expired: Unmaintained
|
||||
misc/artikulate-kde4||2018-07-17|Has expired: broken for more than three years
|
||||
vietnamese/kde4-l10||2018-07-17|Has expired: broken for more than three years
|
||||
graphics/projectm-libvisual|graphics/libprojectm|2018-07-17|Code of projectm-libvisual was merged into graphics/libprojectm
|
||||
|
|
|
|||
|
|
@ -914,9 +914,34 @@ flavors()
|
|||
return ${rc}
|
||||
}
|
||||
|
||||
license()
|
||||
{
|
||||
local autoaccept pkgmirror #distsell distmirror pkgsell
|
||||
|
||||
if [ -n "$LICENSE" ]; then
|
||||
case "$LICENSE_PERMS" in
|
||||
auto-accept) autoaccept=1 ;;
|
||||
#dist-mirror) distmirror=1 ;;
|
||||
#dist-sell) distsell=1 ;;
|
||||
pkg-mirror) pkgmirror=1 ;;
|
||||
#pkg-sell) pkgsell=1 ;;
|
||||
esac
|
||||
|
||||
if [ -z "$autoaccept" ]; then
|
||||
warn "License is not auto-accepted, packages will not be built, ports depending on this one will be ignored."
|
||||
fi
|
||||
if [ -z "$pkgmirror" ]; then
|
||||
warn "License does not allow package to be distributed, ports depending on this one will be ignored"
|
||||
fi
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo"
|
||||
checks="$checks suidfiles libtool libperl prefixvar baselibs terminfo"
|
||||
checks="$checks proxydeps sonames perlcore no_arch gemdeps gemfiledeps flavors"
|
||||
checks="$checks license"
|
||||
|
||||
ret=0
|
||||
cd ${STAGEDIR} || exit 1
|
||||
|
|
|
|||
|
|
@ -24,7 +24,15 @@ IGNORE= Invalid lua version ${LUA_DEFAULT}
|
|||
#
|
||||
.if ${lua_ARGS:M*+}
|
||||
_LUA_MIN_VERSION:= ${lua_ARGS:M*+:S/+//}
|
||||
_LUA_WANTED_VERSION:= ${_LUA_DEFAULT_VERSION}
|
||||
#
|
||||
# Resolve minimum versions (ver+). Append anything greater or equal than the
|
||||
# specified minimum version to the list of wanted versions.
|
||||
#
|
||||
. for _v in ${_LUA_VALID_VERSIONS}
|
||||
. if ${_LUA_MIN_VERSION} <= ${_v}
|
||||
_LUA_WANTED_VERSIONS+=${_v}
|
||||
. endif
|
||||
. endfor
|
||||
.endif
|
||||
|
||||
#
|
||||
|
|
@ -42,18 +50,6 @@ _LUA_WANTED_VERSIONS:= ${lua_ARGS:M5[1-3]}
|
|||
_LUA_WANTED_VERSIONS= ${_LUA_DEFAULT_VERSION}
|
||||
.endif
|
||||
|
||||
#
|
||||
# Resolve minimum versions (ver+). Append anything greater or equal than the
|
||||
# specified minimum version to the list of wanted versions.
|
||||
#
|
||||
.if defined(_LUA_MIN_VERSION)
|
||||
. for _v in ${_LUA_VALID_VERSIONS}
|
||||
. if ${_LUA_MIN_VERSION} <= ${_v}
|
||||
_LUA_WANTED_VERSIONS+=${_v}
|
||||
. endif
|
||||
. endfor
|
||||
.endif
|
||||
|
||||
#
|
||||
# Right now we have built a list of potential versions that we may depend on.
|
||||
# Let's sort them and remove any duplicates. We then locate the highest one
|
||||
|
|
@ -62,14 +58,20 @@ _LUA_WANTED_VERSIONS+=${_v}
|
|||
.for _v in ${_LUA_WANTED_VERSIONS:O:u}
|
||||
_LUA_HIGHEST_VERSION:=${_v}
|
||||
. if exists(${LOCALBASE}/bin/lua${_v})
|
||||
_LUA_WANTED_VERSION:= ${_v}
|
||||
_LUA_HIGHEST_INSTALLED_VERSION:= ${_v}
|
||||
. endif
|
||||
.endfor
|
||||
|
||||
#
|
||||
# If we couldn't find any wanted version installed, depend on the highest one.
|
||||
.if !defined(_LUA_WANTED_VERSION)
|
||||
_LUA_WANTED_VERSION:= ${_LUA_HIGHEST_VERSION}
|
||||
# Depend on the default version if it fits, or the highest installed version,
|
||||
# or the highest version.
|
||||
#
|
||||
.if ${_LUA_WANTED_VERSIONS:M${_LUA_DEFAULT_VERSION}}
|
||||
_LUA_WANTED_VERSION:= ${_LUA_DEFAULT_VERSION}
|
||||
.elif defined(_LUA_HIGHEST_INSTALLED_VERSION)
|
||||
_LUA_WANTED_VERSION:= ${_LUA_HIGHEST_INSTALLED_VERSION}
|
||||
.else
|
||||
_LUA_WANTED_VERSION:= ${_LUA_HIGHEST_VERSION}
|
||||
.endif
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -575,6 +575,36 @@ clean-for-cdrom-list:
|
|||
IGNORE= License ${_LICENSE} needs confirmation, but BATCH is defined
|
||||
.endif
|
||||
|
||||
# This should probably be incrementally done while parsing all the license
|
||||
# possibilities.
|
||||
debug-license: check-license
|
||||
.if ${_LICENSE_PERMS:Mdist-mirror}
|
||||
@${ECHO_MSG} "===> License allows mirroring distribution files"
|
||||
.else
|
||||
@${ECHO_MSG} "===> License does not allows mirroring distribution files"
|
||||
.endif
|
||||
.if ${_LICENSE_PERMS:Mdist-sell}
|
||||
@${ECHO_MSG} "===> License allows selling distribution files"
|
||||
.else
|
||||
@${ECHO_MSG} "===> License does not allows selling distribution files"
|
||||
.endif
|
||||
.if ${_LICENSE_PERMS:Mpkg-mirror}
|
||||
@${ECHO_MSG} "===> License allows mirroring pre-built packages"
|
||||
.else
|
||||
@${ECHO_MSG} "===> License does not allows selling pre-build packages"
|
||||
.endif
|
||||
.if ${_LICENSE_PERMS:Mpkg-sell}
|
||||
@${ECHO_MSG} "===> License allows selling pre-build packages"
|
||||
.else
|
||||
@${ECHO_MSG} "===> License does not allows selling pre-build packages"
|
||||
.endif
|
||||
.if ${_LICENSE_PERMS:Mauto-accept}
|
||||
@${ECHO_MSG} "===> License allows being auto-accepted"
|
||||
.else
|
||||
@${ECHO_MSG} "===> License does not allows being auto-accepted"
|
||||
.endif
|
||||
|
||||
|
||||
check-license:
|
||||
.if defined(_LICENSE_ERROR)
|
||||
@${ECHO_MSG} "===> License not correctly defined: ${_LICENSE_ERROR}"
|
||||
|
|
@ -772,6 +802,11 @@ install-license:
|
|||
|
||||
.else # !LICENSE
|
||||
|
||||
debug-license:
|
||||
. if defined(LICENSE_VERBOSE)
|
||||
@${ECHO_MSG} "===> License debug empty, port has not defined LICENSE"
|
||||
. endif
|
||||
|
||||
check-license:
|
||||
. if defined(LICENSE_VERBOSE)
|
||||
@${ECHO_MSG} "===> License check disabled, port has not defined LICENSE"
|
||||
|
|
|
|||
|
|
@ -1678,6 +1678,8 @@ QA_ENV+= STAGEDIR=${STAGEDIR} \
|
|||
LIB_RUN_DEPENDS='${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}' \
|
||||
UNIFIED_DEPENDS=${_UNIFIED_DEPENDS:C,([^:]*:[^:]*):?.*,\1,:O:u:Q} \
|
||||
PKGBASE=${PKGBASE} \
|
||||
LICENSE="${LICENSE}" \
|
||||
LICENSE_PERMS="${_LICENSE_PERMS}" \
|
||||
PORTNAME=${PORTNAME} \
|
||||
NO_ARCH=${NO_ARCH} \
|
||||
"NO_ARCH_IGNORE=${NO_ARCH_IGNORE}" \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue