Skip to content

Commit

Permalink
Framework: partially sync with upstream
Browse files Browse the repository at this point in the history
Taken from: HardenedBSD
  • Loading branch information
fichtner committed May 25, 2019
1 parent 42d2556 commit 034ad43
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 3 deletions.
4 changes: 3 additions & 1 deletion MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -10663,7 +10663,6 @@ math/vtk5-data||2018-12-05|Removed
devel/py-interface|devel/py-py_interface|2018-12-05|Rename to match upstream naming
graphics/drm-stable-kmod|graphics/drm-fbsd11.2-kmod|2018-12-09|Cleaning up DRM ports nomenclature
graphics/drm-next-kmod|graphics/drm-fbsd12.0-kmod|2018-12-09|Cleaning up DRM ports nomenclature
graphics/drm-devel-kmod|graphics/drm-current-kmod|2018-12-09|Cleaning up DRM ports nomenclature
deskutils/multisync-backup||2018-12-11|Has expired: GNOME 2 application
deskutils/multisync-syncml||2018-12-11|Has expired: GNOME 2 application
net/g2ipmsg||2018-12-11|Has expired: GNOME 2 application
Expand Down Expand Up @@ -12758,3 +12757,6 @@ databases/py-pg_pqueue||2019-05-16|Has expired: Upstream no longer maintained
math/py-symeig|science/py-scipy|2019-05-16|Has expired: Consider using science/py-scipy as this library is included in py-scipy since 0.7 and onwards
databases/py-mysql-connector-python2|databases/py-mysql-connector-python|2019-05-16|Has expired: Please consider using databases/py-mysql-connector-python which has been updated to latest upstream version
www/py-requests1||2019-05-19|Temporary port while port consumers moved to requests 2.x support and the www/py-requests port. No longer depended on by any ports
lang/spidermonkey170|lang/spidermonkey52|2019-05-23|Not depended on, use newer version
lang/spidermonkey38|lang/spidermonkey52|2019-05-23|Not depended on, use newer version
security/titan|security/ylva|2019-05-24|Project renamed by the developer
6 changes: 5 additions & 1 deletion Mk/Uses/cargo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:cargo_${_crate:S/-//g:S/.//g}

CARGO_BUILDDEP?= yes
.if ${CARGO_BUILDDEP:tl} == "yes"
BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.34.2:lang/${RUST_DEFAULT}
BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.35.0:lang/${RUST_DEFAULT}
.endif

# Location of cargo binary (default to lang/rust's Cargo binary)
Expand Down Expand Up @@ -198,6 +198,10 @@ cargo-extract:
@${PRINTF} '{"package":"%s","files":{}}' \
$$(${SHA256} -q ${DISTDIR}/${CARGO_DIST_SUBDIR}/${_crate}.tar.gz) \
> ${CARGO_VENDOR_DIR}/${_crate}/.cargo-checksum.json
@if [ -r ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig ]; then \
${MV} ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig \
${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig-cargo; \
fi
.endfor

_CARGO_GIT_PATCH_CARGOTOML=
Expand Down
1 change: 0 additions & 1 deletion Mk/Uses/php.mk
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,6 @@ mcrypt_DEPENDS= security/php${PHP_VER}-mcrypt
memcache_DEPENDS= databases/php-memcache@${PHP_FLAVOR}
memcached_DEPENDS= databases/pecl-memcached@${PHP_FLAVOR}
mssql_DEPENDS= databases/php${PHP_VER}-mssql
mysql_DEPENDS= databases/php${PHP_VER}-mysql
mysqli_DEPENDS= databases/php${PHP_VER}-mysqli
odbc_DEPENDS= databases/php${PHP_VER}-odbc
opcache_DEPENDS= www/php${PHP_VER}-opcache
Expand Down
19 changes: 19 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,25 @@ 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.

20190522:
AFFECTS: users of sysutils/graylog
AUTHOR: [email protected]

The port has been updated to the latest stable version 3.0.2, which
includes more plugins by default, but also requires manual changes to
graylog's configuration files, possibly port and URL changes, such as
X-Graylog-Server-URL settings, and elasticsearch must be >= 5.

The location of configuration files has been amended to align with the
official distribution files and locations.

After upgrading, manually review and merge changes from your
/usr/local/etc/graylog/server/server.conf into
/usr/local/etc/graylog/graylog.conf

Consult https://www.graylog.org/post/announcing-graylog-v3-0-ga for
further details.

20190506:
AFFECTS: users of www/gitea
AUTHOR: [email protected]
Expand Down

0 comments on commit 034ad43

Please sign in to comment.