Merge remote-tracking branch 'freebsd/master'

HardenedBSD · Sep 21, 2018 · 28e30ad · 28e30ad
2 parents ade26e3 + 547c541
commit 28e30ad
Show file tree

Hide file tree

Showing 59 changed files with 576 additions and 307 deletions.
diff --git a/MOVED b/MOVED
@@ -338,7 +338,6 @@ x11-wm/kahakai||2008-12-07|Has expired: Development ceased
 palm/synce-gnomevfs||2008-12-07|Has expired: No longer supported by developers
 palm/synce-kde||2008-12-07|Has expired: No longer supported by developers
 palm/synce-multisync||2008-12-07|Has expired: No longer supported by developers
-shells/ksh93-devel||2008-12-07|Has expired: This port is outdated, please use shells/ksh93
 sysutils/dtc-toaster||2008-12-07|Has expired: Has been broken for more than 6 months
 sysutils/dusage||2008-12-07|Has expired: Has been broken for more than 6 months
 games/linux-alienarena||2008-12-07|Has expired: Has been broken for more than 6 months

diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
@@ -153,6 +153,12 @@ CARGO_ENV+=	LIBGIT2_SYS_USE_PKG_CONFIG=1
 LIB_DEPENDS+=	libgit2.so:devel/libgit2
 .endif
 
+.if ${CARGO_CRATES:Mlibssh2-sys-[0-9]*}
+# Use the system's libssh2 instead of building the bundled version
+CARGO_ENV+=	LIBSSH2_SYS_USE_PKG_CONFIG=1
+LIB_DEPENDS+=	libssh2.so:security/libssh2
+.endif
+
 .if ${CARGO_CRATES:Monig_sys-[0-9]*}
 # onig_sys always prefers the system library but will try to link
 # statically with it.  Since devel/oniguruma doesn't provide a static

diff --git a/benchmarks/stress-ng/Makefile b/benchmarks/stress-ng/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	stress-ng
-PORTVERSION=	0.09.38
+PORTVERSION=	0.09.40
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://kernel.ubuntu.com/~cking/tarballs/stress-ng/
 

diff --git a/benchmarks/stress-ng/distinfo b/benchmarks/stress-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535968468
-SHA256 (stress-ng-0.09.38.tar.xz) = 4cd3c1f24d099e6fe507a9fcddd8aafdf13be447d811db9e37b5e25c952bf20c
-SIZE (stress-ng-0.09.38.tar.xz) = 355252
+TIMESTAMP = 1537518830
+SHA256 (stress-ng-0.09.40.tar.xz) = f27e3678c40f3e4ee7ccc4bf3b7c628f8acab2c3d6cbdc259c65d6a647983143
+SIZE (stress-ng-0.09.40.tar.xz) = 358268
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl
 CMAKE_ARGS=	-DINSTALL_LIBDATA_DIR:PATH=${PREFIX}/libdata \
 		-DINSTALL_MAN_DIR:PATH=${PREFIX}/man
 
-USES=		cmake:outsource gettext iconv pkgconfig shebangfix tar:xz
+USES=		cmake:outsource compiler:c++11-lang gettext iconv pkgconfig shebangfix tar:xz
 SHEBANG_FILES=	utils/jadmaker utils/gammu-config
 bash_CMD=	/bin/sh
 USE_GNOME=	glib20

diff --git a/devel/Makefile b/devel/Makefile
@@ -4590,6 +4590,7 @@
     SUBDIR += py-geotypes
     SUBDIR += py-gevent
     SUBDIR += py-git-up
+    SUBDIR += py-git-url-parse
     SUBDIR += py-git_semver
     SUBDIR += py-gitdb2
     SUBDIR += py-gitless
@@ -4940,6 +4941,7 @@
     SUBDIR += py-pytest-django
     SUBDIR += py-pytest-flake8
     SUBDIR += py-pytest-flakes
+    SUBDIR += py-pytest-helpers-namespace
     SUBDIR += py-pytest-localserver
     SUBDIR += py-pytest-mock
     SUBDIR += py-pytest-pycodestyle
@@ -4955,6 +4957,7 @@
     SUBDIR += py-python-editor
     SUBDIR += py-python-engineio
     SUBDIR += py-python-gflags
+    SUBDIR += py-python-gilt
     SUBDIR += py-python-gist
     SUBDIR += py-python-gitlab
     SUBDIR += py-python-jenkins
@@ -5138,6 +5141,7 @@
     SUBDIR += py-traitlets
     SUBDIR += py-traits
     SUBDIR += py-transaction
+    SUBDIR += py-tree-format
     SUBDIR += py-trollius
     SUBDIR += py-ttystatus
     SUBDIR += py-tvrage

diff --git a/devel/avro-cpp/Makefile b/devel/avro-cpp/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
-USES=		cmake
+USES=		cmake compiler:c++11-lang
 USE_LDCONFIG=	yes
 WRKSRC_SUBDIR=	lang/c++
 

diff --git a/devel/cpp-hocon/Makefile b/devel/cpp-hocon/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cpp-hocon
-PORTVERSION=	0.1.7
-PORTREVISION=	1
+PORTVERSION=	0.2.0
 CATEGORIES=	devel
 
 MAINTAINER=	puppet@FreeBSD.org

diff --git a/devel/cpp-hocon/distinfo b/devel/cpp-hocon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530532762
-SHA256 (puppetlabs-cpp-hocon-0.1.7_GH0.tar.gz) = 1d771de9342e74115a27355c80a81a510c7851cb1269bac1dd2582c84425652c
-SIZE (puppetlabs-cpp-hocon-0.1.7_GH0.tar.gz) = 157921
+TIMESTAMP = 1537283737
+SHA256 (puppetlabs-cpp-hocon-0.2.0_GH0.tar.gz) = 010d19b0d5f1fd305a4947cc1b11ea85b0dd2bdedb9c109711c0779bb248da28
+SIZE (puppetlabs-cpp-hocon-0.2.0_GH0.tar.gz) = 158054
diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	leatherman
-PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 CATEGORIES=	devel
 
 MAINTAINER=	puppet@FreeBSD.org

diff --git a/devel/leatherman/distinfo b/devel/leatherman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530532778
-SHA256 (puppetlabs-leatherman-1.4.2_GH0.tar.gz) = 32ccdb21db3ccc326bac255b35fc6c16b2ddbe39bbd5afdddcadc622e2814fc2
-SIZE (puppetlabs-leatherman-1.4.2_GH0.tar.gz) = 814263
+TIMESTAMP = 1537283687
+SHA256 (puppetlabs-leatherman-1.5.0_GH0.tar.gz) = f7da4432ecaf1c4bfc7cfd398bcf76f9b90c27bce5d4b94111fc07b021407ad8
+SIZE (puppetlabs-leatherman-1.5.0_GH0.tar.gz) = 814292
diff --git a/devel/leatherman/files/patch-json__container_tests_json__container__test.cc b/devel/leatherman/files/patch-json__container_tests_json__container__test.cc
@@ -0,0 +1,16 @@
+--- json_container/tests/json_container_test.cc.orig
++++ json_container/tests/json_container_test.cc
+@@ -22,11 +22,13 @@
+     std::string json_value {};
+
+     SECTION("it should instantiate by passing any JSON value") {
++        json_value = "{}";
+         SECTION("object") {
+             json_value = JSON;
+         }
+
+         SECTION("array") {
++            json_value = "[]";
+             SECTION("of numbers") {
+                 json_value = "[1, 2, 3]";
+             }
diff --git a/devel/py-cookiecutter/Makefile b/devel/py-cookiecutter/Makefile
@@ -31,7 +31,17 @@ USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
+
+# pytest needs a UTF-8 environment, and it will try and write outside
+# ${WRKDIR} unless told not to.  Even so, these tests have failures:
+#
+# cookiecutter/utils.py            50      3    94%
+# cookiecutter/zipfile.py          61      2    97%
+
+TEST_ENV=	TMPDIR=${WRKDIR} HOME=${WRKDIR} LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
+
 do-test:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/tox-${PYTHON_VER}
+	@cd ${WRKSRC} && \
+	env ${TEST_ENV} ${LOCALBASE}/bin/pytest-${PYTHON_VER} --cov=cookiecutter tests
 
 .include <bsd.port.mk>
diff --git a/devel/py-git-url-parse/Makefile b/devel/py-git-url-parse/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+PORTNAME=	git-url-parse
+PORTVERSION=	1.1.0
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	matthew@FreeBSD.org
+COMMENT=	Simple git URL parser
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>0:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yapf>=0.21.0:textproc/py-yapf@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+do-test:
+	@cd ${WRKSRC} && ${LOCALBASE}/bin/py.test-${PYTHON_VER} -vv
+
+.include <bsd.port.mk>
diff --git a/devel/py-git-url-parse/distinfo b/devel/py-git-url-parse/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1537525446
+SHA256 (git-url-parse-1.1.0.tar.gz) = a7d1dba7fc253dff8afb7b683af35834864c9796eb130b44ec63b2584bbc6522
+SIZE (git-url-parse-1.1.0.tar.gz) = 11402
diff --git a/devel/py-git-url-parse/pkg-descr b/devel/py-git-url-parse/pkg-descr
@@ -0,0 +1,3 @@
+A simple GIT URL parser similar to giturlparse.py.
+
+WWW: https://pypi.org/project/git-url-parse/
diff --git a/devel/py-jinja2-time/Makefile b/devel/py-jinja2-time/Makefile
@@ -12,18 +12,21 @@ COMMENT=	Jinja2 Extension for Dates and Times
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 do-test:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/tox-${PYTHON_VER}
+	@cd ${WRKSRC} && \
+	${LOCALBASE}/bin/py.test-${PYTHON_VER} tests
+
+## This results in complaints about flake8 being too modern...
+## ${LOCALBASE}/bin/flake8-${PYTHON_VER} jinja2_time setup.py tests
 
 .include <bsd.port.mk>
diff --git a/devel/py-pytest-helpers-namespace/Makefile b/devel/py-pytest-helpers-namespace/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+PORTNAME=	pytest-helpers-namespace
+PORTVERSION=	2017.11.11
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	matthew@FreeBSD.org
+COMMENT=	Provide a helpers namespace in pytest
+
+LICENSE=	APACHE20
+
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+do-test:
+	@cd ${WRKSRC} && ${LOCALBASE}/bin/tox-${PYTHON_VER}
+
+.include <bsd.port.mk>
diff --git a/devel/py-pytest-helpers-namespace/distinfo b/devel/py-pytest-helpers-namespace/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1537521370
+SHA256 (pytest-helpers-namespace-2017.11.11.tar.gz) = 5e866a0e75fd642a481fa5a9d279d309782dc40a50e383a5250c6e34c9950a46
+SIZE (pytest-helpers-namespace-2017.11.11.tar.gz) = 5021
diff --git a/devel/py-pytest-helpers-namespace/pkg-descr b/devel/py-pytest-helpers-namespace/pkg-descr
@@ -0,0 +1,5 @@
+Provides a helpers pytest namespace which can be used to register
+helper functions without requiring you to import them on your actual
+tests to use them.
+
+WWW: https://pypi.org/project/pytest-helpers-namespace/
diff --git a/devel/py-python-gilt/Makefile b/devel/py-python-gilt/Makefile
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+PORTNAME=	python-gilt
+PORTVERSION=	1.2.1
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	matthew@FreeBSD.org
+COMMENT=	GIT layering tool
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>0:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yapf>=0.16.3:textproc/py-yapf@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fasteners>0:devel/py-fasteners@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}git-url-parse>0:devel/py-git-url-parse@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sh>0:devel/py-sh@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+do-test:
+	@cd ${WRKSRC} && ${LOCALBASE}/bin/tox-${PYTHON_VER} -e py${PYTHON_SUFFIX}
+
+.include <bsd.port.mk>
diff --git a/devel/py-python-gilt/distinfo b/devel/py-python-gilt/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1537527892
+SHA256 (python-gilt-1.2.1.tar.gz) = e23a45a6905e6bb7aec3ff7652b48309933a6991fad4546d9e793ac7e0513f8a
+SIZE (python-gilt-1.2.1.tar.gz) = 444314
diff --git a/devel/py-python-gilt/pkg-descr b/devel/py-python-gilt/pkg-descr
@@ -0,0 +1,4 @@
+Overlay remote repositories and/or files into the destinations
+provided.
+
+WWW: https://pypi.org/project/python-gilt/
diff --git a/devel/py-tree-format/Makefile b/devel/py-tree-format/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+PORTNAME=	tree-format
+PORTVERSION=	0.1.2
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	matthew@FreeBSD.org
+COMMENT=	Generate nicely formatted trees
+
+LICENSE=	APACHE20
+
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}testtools>0:devel/py-testtools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+do-test:
+	cd ${WRKSRC} && \
+	${PYTHON_CMD} setup.py --version && \
+	${PYTHON_CMD} -m unittest discover tree_format.tests
+
+.include <bsd.port.mk>
diff --git a/devel/py-tree-format/distinfo b/devel/py-tree-format/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1537529897
+SHA256 (tree-format-0.1.2.tar.gz) = a538523aa78ae7a4b10003b04f3e1b37708e0e089d99c9d3b9e1c71384c9a7f9
+SIZE (tree-format-0.1.2.tar.gz) = 3969
diff --git a/devel/py-tree-format/pkg-descr b/devel/py-tree-format/pkg-descr
@@ -0,0 +1,4 @@
+Python library to generate nicely formatted trees, like the UNIX `tree`
+command.
+
+WWW: https://pypi.org/project/tree-format/
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rust
 PORTVERSION?=	1.29.0
-PORTREVISION?=
+PORTREVISION?=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/:src \
 		LOCAL/dumbbell/rust:rust_bootstrap \
@@ -31,6 +31,7 @@ LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 BUILD_DEPENDS=		cmake:devel/cmake
 LIB_DEPENDS=		libcurl.so:ftp/curl \
+			libgit2.so:devel/libgit2 \
 			libssh2.so:security/libssh2
 
 ONLY_FOR_ARCHS?=	aarch64 amd64 i386
@@ -97,6 +98,8 @@ PLIST_FILES=		lib/rustlib/components \
 .include <bsd.port.pre.mk>
 
 X_PY_ENV=	HOME="${WRKDIR}" \
+		LIBGIT2_SYS_USE_PKG_CONFIG=1 \
+		LIBSSH2_SYS_USE_PKG_CONFIG=1 \
 		OPENSSL_DIR="${OPENSSLBASE}"
 X_PY_CMD=	${PYTHON_CMD} ${WRKSRC}/x.py
 

diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
@@ -27,7 +27,7 @@ TEST_DEPENDS=	bash:shells/bash \
 		gwc:sysutils/coreutils \
 		${LOCALBASE}/bin/gdb:devel/gdb
 
-USES=		gmake pkgconfig python:build,test
+USES=		compiler:c++11-lang gmake pkgconfig python:build,test
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	1.8.0.a1.20180920
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel