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

Framework: partially sync with upstream

Browse source 
Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2017-08-08 12:36:06 +02:00
parent 0ce7697a76
commit 67fe5c149c
7 changed files with 62 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
MOVED
View file

@ -1274,7 +1274,6 @@ www/xpi-statusbarclock||2010-10-01|Has expired: Development has been ceased and
devel/cego-base|devel/lfc|2010-10-02|Project was renamed
devel/cego-xml|devel/lfcxml|2010-10-02|Project was renamed
www/p5-WWW-Pastebin-RafbNet-Create||2010-10-02|http://rafb.net service is dead
devel/maven||2010-10-03|Has expired: Development has been ceased, superseded by devel/maven2
games/daimonin-client|games/daimonin|2010-10-04|Renamed
sysutils/rsyslog55|sysutils/rsyslog5|2010-10-05|Renamed
sysutils/rsyslog55-dbi|sysutils/rsyslog5-dbi|2010-10-05|Renamed
@ -8771,7 +8770,6 @@ sysutils/gosa||2016-11-20|Has expired: this version of gosa cannot be fixed (req
security/krb5-112||2016-11-20|Has expired: EOL twelve months after release of krb5-1.14
astro/osmium|astro/libosmium|2016-11-23|Rename according to upstream
deskutils/xfce4-notification-daemon|deskutils/xfce4-notifyd|2016-11-23|Has expired: No longer supported by upstream, replaced with deskutils/xfce4-notifyd
archivers/brotli|archivers/py-brotli|2016-11-24|Brotli is a python module
textproc/clucene-qt5||2016-11-25|Reintegrated into devel/qt5-help
devel/go-shellwords||2016-11-26|Integrated into textproc/fzf build procedure
www/gecko-sharp20||2016-11-27|Has expired: Broken, no upstream found and no release in 8 years
@ -8931,7 +8929,6 @@ www/rubygem-activeresource||2017-01-07|Has expired: Upstream support ended
www/rubygem-responders-rails3||2017-01-07|Has expired: Depends on deprecated www/rubygem-railties
www/rubygem-jquery-ui-rails||2017-01-07|Has expired: Depends on deprecated www/rubygem-railties
www/rubygem-haml-rails||2017-01-07|Has expired: Depends on deprecated www/rubygem-actionpack
www/rubygem-jquery-rails||2017-01-07|Has expired: Depends on deprecated www/rubygem-railties
www/rubygem-railties||2017-01-07|Has expired: Upstream support ended
www/rubygem-actionpack||2017-01-07|Has expired: Upstream support ended
databases/rubygem-rubyrep||2017-01-07|Has expired: Depends on deprecated databases/rubygem-activerecord
@ -9474,10 +9471,10 @@ devel/ffcall|devel/libffcall|2017-07-28|Project was renamed
databases/grass|databases/grass6|2017-07-30|Project was renamed to allow for grass7
net/rubygem-oauth212|net/rubygem-oauth2|2017-07-31|Has expired: Only created for www/gitlab; please use net/rubygem-oauth2 instead
textproc/rubygem-liquid3|textproc/rubygem-liquid|2017-07-31|Has expired: Use textproc/rubygem-liquid instead
mail/dovecot2-antispam-plugin|mail/dovecot2-pigeonhole|2017-07-31|Has expired: Use pigeonhole instead. See https://wiki2.dovecot.org/HowTo/AntispamWithSieve
mail/dovecot-antispam|mail/dovecot2-antispam-plugin|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot2-antispam-plugin instead
mail/dovecot-sieve|mail/dovecot2-pigeonhole|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot-pigeonhole instead
mail/dovecot-managesieve|mail/dovecot2-pigeonhole|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot-pigeonhole instead
mail/dovecot2-antispam-plugin|mail/dovecot-pigeonhole|2017-07-31|Has expired: Use pigeonhole instead. See https://wiki2.dovecot.org/HowTo/AntispamWithSieve
mail/dovecot-antispam|mail/dovecot-pigeonhole|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot2-antispam-plugin instead
mail/dovecot-sieve|mail/dovecot-pigeonhole|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot-pigeonhole instead
mail/dovecot-managesieve|mail/dovecot-pigeonhole|2017-07-31|Has expired: Dovecot-1.x is deprecated. Use dovecot2 and dovecot-pigeonhole instead
www/rubygem-jquery-ui-rails5-rails4|www/rubygem-jquery-ui-rails-rails4|2017-07-31|Has expired: Only created for www/gitlab; please use www/rubygem-jquery-ui-rails-rails4 instead
security/rubygem-omniauth13|security/rubygem-omniauth|2017-07-31|Has expired: Only created for www/gitlab; please use security/rubygem-omniauth instead
devel/rubygem-health_check22|devel/rubygem-health_check|2017-07-31|Has expired: Only created for www/gitlab; please use devel/rubygem-health_check instead
@ -9490,7 +9487,6 @@ multimedia/avbin||2017-07-31|Has expired: Unfetchable for more than six months (
games/gondola||2017-07-31|Depends on expired multimedia/avbin
sysutils/flyback||2017-07-31|Unfetchable for more than six months (google code has gone away)
multimedia/py-ffmpeg||2017-07-31|Has expired: Depreciated upstream in favour of ffpyplayer
mail/dovecot|mail/dovecot2|2017-07-31|Has expired: Deprecated by upstream years ago. Use mail/dovecot2 instead
devel/cloudabi-binutils-aarch64|devel/cloudabi-toolchain|2017-07-31|ELF-toolchain based tools should be used instead
devel/cloudabi-binutils-x86_64|devel/cloudabi-toolchain|2017-07-31|ELF-toolchain based tools should be used instead
security/openvas-libraries|security/openvas8-libraries|2017-08-03|Renamed to include openvas 9 ports
@ -9499,3 +9495,5 @@ security/openvas-manager|security/openvas8-manager|2017-08-03|Renamed to include
security/openvas-scanner|security/openvas8-scanner|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name
security/greenbone-security-assistant|security/greenbone-security-assistant8|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name
sysutils/consolekit|sysutils/consolekit2|2017-08-05|Continuation of the consolekit project
mail/dovecot2|mail/dovecot|2017-08-07|Renamed to mail/dovecot
mail/dovecot2-pigeonhole|mail/dovecot-pigeonhole|2017-08-07|Renamed to mail/dovecot-pigeonhole

37
Mk/Scripts/qa.sh
View file

@ -830,10 +830,45 @@ no_arch() {
return $rc
}
gemdeps()
{
rc=0
if [ "${PKGBASE%%-*}" = "rubygem" ]; then
while read -r l; do
if [ -n "${l}" ]; then
name=${l%% *}
vers=${l#* }
while read -r v; do
if ! while read -r p; do
${LOCALBASE}/bin/ruby -e "puts 'OK' if Gem::Dependency.new('${name}','${v}').match?('${name}','${p}')"
done | grep -qFx OK; then
err RubyGem dependency ${name} ${v} is not satisfied.
rc=1
fi <<-EOF
$(${LOCALBASE}/bin/gem list -e "${name}" \
| sed "s|.*(\(.*\))|\1|" \
| tr -d ' ' \
| tr , '\n')
EOF
done <<-EOF
$(while echo "${vers}" | grep -q '"'; do
echo "${vers}" | cut -d '"' -f2
vers=$(echo "${vers}"|cut -d '"' -f3-)
done)
EOF
fi
done <<-EOF
$(grep -a 'add_runtime_dependency' ${STAGEDIR}${PREFIX}/lib/ruby/gems/*/specifications/${PORTNAME}-*.gemspec \
| sed 's|.*<\(.*\)>.*\[\(.*\)\])|\1 \2|' \
| sort -u)
EOF
fi
return $rc
}
checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo"
checks="$checks suidfiles libtool libperl prefixvar baselibs terminfo"
checks="$checks proxydeps sonames perlcore no_arch"
checks="$checks proxydeps sonames perlcore no_arch gemdeps"
ret=0
cd ${STAGEDIR}

4
Mk/Uses/gecko.mk
View file

@ -37,12 +37,12 @@ RUN_DEPENDS+= libxul>=45:www/libxul
.elif ${gecko_ARGS:Mfirefox}
_GECKO_DEFAULT_VERSION= 52
_GECKO_VERSIONS= 52 54
_GECKO_VERSIONS= 52 55
_GECKO_TYPE= firefox
# Dependence lines for different Firefox versions
52_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
54_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox
55_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox
.if exists(${LOCALBASE}/bin/firefox)
_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null

3
Mk/Uses/shebangfix.mk
View file

@ -94,7 +94,8 @@ fix-shebang:
.endif
.if defined(SHEBANG_FILES)
@cd ${WRKSRC}; \
${ECHO_CMD} ${SHEBANG_FILES} | ${XARGS} ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS}
${FIND} ${SHEBANG_FILES} -type f \
-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
.endif
.endif

1
Mk/bsd.port.mk
View file

@ -1547,6 +1547,7 @@ QA_ENV+= STAGEDIR=${STAGEDIR} \
LIB_RUN_DEPENDS='${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}' \
UNIFIED_DEPENDS=${_UNIFIED_DEPENDS:C,([^:]*:[^:]*):?.*,\1,:O:u:Q} \
PKGBASE=${PKGBASE} \
PORTNAME=${PORTNAME} \
NO_ARCH=${NO_ARCH} \
"NO_ARCH_IGNORE=${NO_ARCH_IGNORE}"
.if !empty(USES:Mssl)

7
Tools/scripts/MOVEDlint.awk
View file

@ -77,11 +77,12 @@ $3 !~ /^20[0-3][0-9]-[01][0-9]-[0-3][0-9]$/ {
else
resurrected[$1] = NR
if ($2)
if ($2) {
if (system("test -f " portsdir "/" $2 "/Makefile"))
missing[$2] = NR
else
delete resurrected[$2]
# else
# delete resurrected[$2]
}
# Produces too many false positives
# if ($4 ~ /^[a-z].*/)

11
UPDATING
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.
20170807:
AFFECTS: users of mail/dovecot2 and mail/dovecot2-pigeonhole
AUTHOR: adamw@FreeBSD.org
Now that dovecot1 has been removed from the ports tree, dovecot2
and dovecot2-pigeonhole have been renamed to simply dovecot and
dovecot-pigeonhole.
Depending upon your local setup, you may need to manually run
'pkg delete dovecot2' and 'pkg install dovecot' (or -pigeonhole).
20170806:
AFFECTS: users of mail/dovecot2-antispam-plugin
AUTHOR: adamw@FreeBSD.org