Skip to content

Commit

Permalink
Framework: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: HardenedBSD
  • Loading branch information
fichtner committed Jul 3, 2018
1 parent 8f53568 commit dc018ea
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
4 changes: 2 additions & 2 deletions MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,7 @@ editors/openoffice.org-2-devel||2009-07-21|Removed
games/amy||2009-07-28|Has expired: mastersite disappeared, does not build on recent version
security/hashish||2009-07-28|Has expired: does not compile
security/smtpmap||2009-07-28|Has expired: depends on GCC 2.95 which has not been available for 9+ months
devel/bats|devel/bats-core|2018-07-01|Bats maintainership changed upstream to bats-core team
devel/boost|devel/boost-libs|2009-07-28|Boost ports were split and sliced
devel/boost-python|devel/boost-python-libs|2009-07-28|Boost ports were split and sliced
www/xpi-firegpg||2009-07-31|Removed
Expand Down Expand Up @@ -3678,7 +3679,6 @@ x11-toolkits/gal||2012-10-15|Development ceased, nothing in the ports tree uses
math/octave-forge-physicalconstants||2012-10-15|Incorporated upstream into math/octave-forge-miscellaneous
math/octave-forge-combinatorics||2012-10-15|Incorporated upstream into math/octave-forge-miscellaneous
games/8kingdoms||2012-10-16|Has expired: Broken for more than 6 months
games/freeorion||2012-10-16|Has expired: Broken for more than 6 months
games/rigsofrods||2012-10-16|Has expired: Broken for more than 6 months
sysutils/bacula2-client||2012-10-20|No longer supported upstream and may contain vulnerabilities. Use sysutils/bacula-client instead
sysutils/bacula2-server||2012-10-20|No longer supported upstream and may contain vulnerabilities. Use sysutils/bacula-server instead
Expand Down Expand Up @@ -10287,7 +10287,7 @@ multimedia/qt5-phonon4|multimedia/phonon@qt5|2018-06-21|Moved to a flavored vers
multimedia/qt5-phonon4-designerplugin|multimedia/phonon-designerplugin@qt5|2018-06-21|Moved to a flavored version
multimedia/qt5-phonon4-gstreamer|multimedia/phonon-gstreamer@qt5|2018-06-21|Moved to a flavored version
multimedia/qt5-phonon4-vlc|multimedia/phonon-vlc@qt5|2018-06-21|Moved to a flavored version
net/libproxy-gnome|net/libproxy-gnome2|2018-07-22|Renamed to make slave names consistent
net/libproxy-gnome|net/libproxy-gnome2|2018-06-22|Renamed to make slave names consistent
www/npapi-vlc||2018-06-22|Removed, depends on expired www/libxul
www/libxul||2018-06-22|Has expired: NPAPI are no longer supported
mail/postfix211||2018-06-24|Has expired: Not supported anymore by vendor. Please choose a new one version
Expand Down
5 changes: 3 additions & 2 deletions Mk/bsd.hardening.mk
Original file line number Diff line number Diff line change
Expand Up @@ -253,12 +253,13 @@ OPTIONS_GROUP_HARDENING+=SAFESTACK

.if ${HARDENING_OFF:Mcfi} == ""

.if ${OSVERSION} >= 1200020 && ${ARCH} == "amd64" && \
.if ${OSVERSION} >= 1200020 && \
${LLD_IS_LD} == "yes" && \
${LLVM_AR_IS_AR} == "yes" && \
${LLVM_RANLIB_IS_RANLIB} == "yes" && \
${LLVM_NM_IS_NM} == "yes" && \
${LLVM_OBJDUMP_IS_OBJDUMP} == "yes"
${LLVM_OBJDUMP_IS_OBJDUMP} == "yes" && \
(${ARCH} == "amd64" || ${ARCH} == "aarch64")

cfi_ARGS?=

Expand Down
4 changes: 3 additions & 1 deletion Tools/scripts/MOVEDlint.awk
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ $3 !~ /^20[0-3][0-9]-[01][0-9]-[0-3][0-9]$/ {
srcs[$1] = 1

if (lastdate > $3) {
printf "%5d: date going backwards from %s to %s\n", NR, lastdate, $3 | sort
printf "%5d: date going backwards from %s to %s from this line\n", NR-1, lastdate, $3 | sort
error[NR-1] = 1
printf "%5d: date going backwards from %s to %s to this line\n", NR, lastdate, $3 | sort
error[NR] = 1
}
lastdate = $3
Expand Down
7 changes: 7 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ 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.

20180701:
AFFECTS: users of devel/bats
AUTHOR: [email protected]

The devel/bats port has been renamed to devel/bats-core to match the
new upstream project.

20180630:
AFFECTS: users of net-im/ejabberd
AUTHOR: [email protected]
Expand Down

0 comments on commit dc018ea

Please sign in to comment.