Merge remote-tracking branch 'upstream/master'master

21 files changed, 109 insertions, 42 deletions

diff --git a/net/Makefile b/net/Makefile
index 9043af582e6d..3dc6c23b2409 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -10,6 +10,7 @@
     SUBDIR += Sockets
     SUBDIR += activemq
     SUBDIR += adasockets
+    SUBDIR += addrwatch
     SUBDIR += afpfs-ng
     SUBDIR += aget
     SUBDIR += akonadi-calendar
diff --git a/net/addrwatch/Makefile b/net/addrwatch/Makefile
new file mode 100644
index 000000000000..cf579660cba0
--- /dev/null
+++ b/net/addrwatch/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME=	addrwatch
+DISTVERSIONPREFIX=v
+DISTVERSION=	1.0.2
+CATEGORIES=	net
+
+MAINTAINER=	m.muenz@gmail.com
+COMMENT=	Supports IP/Ethernet pairing for IPv4 and IPv6
+
+LICENSE=	GPLv3
+
+LIB_DEPENDS=	libevent.so:devel/libevent \
+		libpcap.so:net/libpcap \
+		libargp.so:devel/argp-standalone
+
+USES=		autoreconf gmake pkgconfig
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+USE_GITHUB=	yes
+GH_ACCOUNT=	fln
+
+PLIST_FILES=	bin/addrwatch \
+		bin/addrwatch_stdout \
+		bin/addrwatch_syslog \
+		man/man8/addrwatch.8.gz
+
+.include <bsd.port.mk>
diff --git a/net/addrwatch/distinfo b/net/addrwatch/distinfo
new file mode 100644
index 000000000000..6d1bc7101cde
--- /dev/null
+++ b/net/addrwatch/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1582621254
+SHA256 (fln-addrwatch-v1.0.2_GH0.tar.gz) = 56a2180305e95adde584bd9502771269b9a216419b49631046b368502d5d5fba
+SIZE (fln-addrwatch-v1.0.2_GH0.tar.gz) = 44584
diff --git a/net/addrwatch/pkg-descr b/net/addrwatch/pkg-descr
new file mode 100644
index 000000000000..449d7168cb14
--- /dev/null
+++ b/net/addrwatch/pkg-descr
@@ -0,0 +1,11 @@
+addrwatch is a similar software to arpwatch. It main purpose is to
+monitor network and log ethernet/ip pairings.
+
+To simply try out addrwatch start it without any arguments. When
+started without arguments it will open first non loopback interface and
+start logging events to the console without writing anything to disk.
+All discovered ethernet/ip address pairings will be printed to stdout.
+All debug, warning, and err messages will be sent to syslog and printed
+to stderr.
+
+WWW: https://github.com/fln/addrwatch
diff --git a/net/proby/Makefile b/net/proby/Makefile
index cd2fe4eb1e60..0980a4f729c7 100644
--- a/net/proby/Makefile
+++ b/net/proby/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	proby
 DISTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net/py-python-designateclient/Makefile b/net/py-python-designateclient/Makefile
index d80851779ec0..04d32b52d0da 100644
--- a/net/py-python-designateclient/Makefile
+++ b/net/py-python-designateclient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	python-designateclient
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +19,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.6.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.8.0:devel/py-osc-lib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
@@ -31,4 +31,12 @@ USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}osc-lib1>=1.8.0:devel/py-osc-lib1@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}osc-lib>=1.8.0:devel/py-osc-lib@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/py-python-heatclient/Makefile b/net/py-python-heatclient/Makefile
index 0d6bd58112e2..92fa8442b786 100644
--- a/net/py-python-heatclient/Makefile
+++ b/net/py-python-heatclient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	python-heatclient
 PORTVERSION=	1.18.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +19,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.8.0:devel/py-osc-lib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
@@ -36,4 +36,12 @@ NO_ARCH=	yes
 
 SHEBANG_GLOB=	*.sh
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}osc-lib1>=1.8.0:devel/py-osc-lib1@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}osc-lib>=1.8.0:devel/py-osc-lib@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/py-python-neutronclient/Makefile b/net/py-python-neutronclient/Makefile
index 86c14ae8897a..e3d4757e9021 100644
--- a/net/py-python-neutronclient/Makefile
+++ b/net/py-python-neutronclient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	python-neutronclient
 PORTVERSION=	6.14.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +22,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.18:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}os-client-config>=1.28.0:devel/py-os-client-config@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.8.0:devel/py-osc-lib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
@@ -39,4 +39,12 @@ NO_ARCH=	yes
 
 SHEBANG_GLOB=	*.sh
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}osc-lib1>=1.8.0:devel/py-osc-lib1@${PY_FLAVOR}
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}osc-lib>=1.8.0:devel/py-osc-lib@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/py-python-openstackclient/Makefile b/net/py-python-openstackclient/Makefile
index 04bd81515920..639dcd870fa3 100644
--- a/net/py-python-openstackclient/Makefile
+++ b/net/py-python-openstackclient/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	python-openstackclient
-PORTVERSION=	4.0.0
-PORTREVISION=	1
+PORTVERSION=	5.0.0
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,16 +18,16 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cliff>=2.8.0:devel/py-cliff@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.6.2:devel/py-keystoneauth1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.17.0:devel/py-openstacksdk@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}osc-lib>=1.14.0:devel/py-osc-lib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}osc-lib>=2.0.0:devel/py-osc-lib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.8.0:net/py-python-glanceclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.17.0:net/py-python-keystoneclient@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-novaclient>=15.0.0:net/py-python-novaclient@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.22.0:net/py-python-keystoneclient@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-novaclient>=15.1.0:net/py-python-novaclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
 
-USES=		python shebangfix
+USES=		python:3.6+ shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/net/py-python-openstackclient/distinfo b/net/py-python-openstackclient/distinfo
index 6a2143e8dae2..a77296979285 100644
--- a/net/py-python-openstackclient/distinfo
+++ b/net/py-python-openstackclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578501175
-SHA256 (python-openstackclient-4.0.0.tar.gz) = 3b11c423a38074b0b58ba66d5f6e5334759f50e99fe19c3dfc662a6299dc2e16
-SIZE (python-openstackclient-4.0.0.tar.gz) = 725178
+TIMESTAMP = 1582642149
+SHA256 (python-openstackclient-5.0.0.tar.gz) = ec883c96ce7adf0f819f8a20b918d5ac8fad1f3ebed6d8a753b81b5ea98bac0c
+SIZE (python-openstackclient-5.0.0.tar.gz) = 720890
diff --git a/net/rabbiteer/Makefile b/net/rabbiteer/Makefile
index 54034e5c9093..1100e673022a 100644
--- a/net/rabbiteer/Makefile
+++ b/net/rabbiteer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rabbiteer
 DISTVERSION=	1.4.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	net
 
 MAINTAINER=	dch@FreeBSD.org
diff --git a/net/rclone/Makefile b/net/rclone/Makefile
index af560cb88fd6..24d7a60f8cca 100644
--- a/net/rclone/Makefile
+++ b/net/rclone/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rclone
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.50.2
+DISTVERSION=	1.51.0
 CATEGORIES=	net
 
 MAINTAINER=	wg@FreeBSD.org
diff --git a/net/rclone/distinfo b/net/rclone/distinfo
index edfde2e6ab1b..93fe4a8a6273 100644
--- a/net/rclone/distinfo
+++ b/net/rclone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575171415
-SHA256 (ncw-rclone-v1.50.2_GH0.tar.gz) = 86401e3d3db2c98df3103dd3e787ac9cea5ba2570c89063e57f17d87231a305c
-SIZE (ncw-rclone-v1.50.2_GH0.tar.gz) = 18556334
+TIMESTAMP = 1581802104
+SHA256 (ncw-rclone-v1.51.0_GH0.tar.gz) = 5777976745ecd32b8fa355fda1ba45c445d1c6b7ffbda5ac126479a937887b11
+SIZE (ncw-rclone-v1.51.0_GH0.tar.gz) = 18835242
diff --git a/net/routinator/Makefile b/net/routinator/Makefile
index 19ba3485dd15..564a61941a85 100644
--- a/net/routinator/Makefile
+++ b/net/routinator/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	routinator
 PORTVERSION=	0.6.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	jaap@NLnetLabs.nl
diff --git a/net/rubygem-apollo_upload_server/Makefile b/net/rubygem-apollo_upload_server/Makefile
index 8dea5814a82e..465ddc28aa2b 100644
--- a/net/rubygem-apollo_upload_server/Makefile
+++ b/net/rubygem-apollo_upload_server/Makefile
@@ -3,18 +3,18 @@
 
 PORTNAME=	apollo_upload_server
 DISTVERSION=	2.0.0.beta.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Apollo-pload-server middleware for rails
+COMMENT=	Apollo-upload-server middleware for rails
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-graphql>=1.7:devel/rubygem-graphql \
-		rubygem-rails52>=5.0:www/rubygem-rails52
+		rubygem-rails60>=5.0:www/rubygem-rails60
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile
index 6e98cb9094a4..88215b922869 100644
--- a/net/rubygem-gitaly/Makefile
+++ b/net/rubygem-gitaly/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-PORTVERSION=	1.81.0
+PORTVERSION=	1.86.0
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -13,7 +13,7 @@ LICENSE=	MIT
 #BUILD_DEPENDS=	rubygem-bundler>=1.12:sysutils/rubygem-bundler \
 #		rubygem-rake>=10.0:devel/rubygem-rake
 RUN_DEPENDS=	rubygem-grpc>=1.0<2.0:net/rubygem-grpc \
-		gitaly>=0.82.0:devel/gitaly
+		gitaly>=0.86.0:devel/gitaly
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo
index 9150c38ac48c..b921c83cd824 100644
--- a/net/rubygem-gitaly/distinfo
+++ b/net/rubygem-gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580547659
-SHA256 (rubygem/gitaly-1.81.0.gem) = b1ac0d6a67b79859f4c8793731767cbfd98f33c4685022d57683663dd2451a11
-SIZE (rubygem/gitaly-1.81.0.gem) = 18944
+TIMESTAMP = 1582615360
+SHA256 (rubygem/gitaly-1.86.0.gem) = e7f8e32e8ca97a85c943751df4fe0e03c3a9b4ca8aaf4ae63d7964dd078f3092
+SIZE (rubygem/gitaly-1.86.0.gem) = 18944
diff --git a/net/rubygem-google-cloud-logging/Makefile b/net/rubygem-google-cloud-logging/Makefile
index 761a948aa03a..9454e0c8a38f 100644
--- a/net/rubygem-google-cloud-logging/Makefile
+++ b/net/rubygem-google-cloud-logging/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	google-cloud-logging
-PORTVERSION=	1.9.4
+PORTVERSION=	1.9.5
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
diff --git a/net/rubygem-google-cloud-logging/distinfo b/net/rubygem-google-cloud-logging/distinfo
index c207172708f3..5c80da9c8bc9 100644
--- a/net/rubygem-google-cloud-logging/distinfo
+++ b/net/rubygem-google-cloud-logging/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580018173
-SHA256 (rubygem/google-cloud-logging-1.9.4.gem) = 0c3e380b619f5bb71ba991aeef0dd528fcfc673575fa5e87690e92aa065522f1
-SIZE (rubygem/google-cloud-logging-1.9.4.gem) = 103424
+TIMESTAMP = 1582642173
+SHA256 (rubygem/google-cloud-logging-1.9.5.gem) = 314d6b5da128fbb9b433d10fc5d4f497e6c14d2adc624943170120711dac0be6
+SIZE (rubygem/google-cloud-logging-1.9.5.gem) = 105472
diff --git a/net/rubygem-omniauth-github/Makefile b/net/rubygem-omniauth-github/Makefile
index fd43dec8dca8..dd61a01cc7c6 100644
--- a/net/rubygem-omniauth-github/Makefile
+++ b/net/rubygem-omniauth-github/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	omniauth-github
-PORTVERSION=	1.3.0
+PORTVERSION=	1.4.0
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -10,11 +10,12 @@ COMMENT=	Official OmniAuth strategy for GitHub
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-omniauth>=1.5:security/rubygem-omniauth \
-		rubygem-omniauth-oauth2>=1.4.0:net/rubygem-omniauth-oauth2
+RUN_DEPENDS=	rubygem-omniauth>=1.5<2:security/rubygem-omniauth \
+		rubygem-omniauth-oauth2>=1.4.0<2.0:net/rubygem-omniauth-oauth2
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-github/distinfo b/net/rubygem-omniauth-github/distinfo
index 748ba3eef289..c300a3dd1b59 100644
--- a/net/rubygem-omniauth-github/distinfo
+++ b/net/rubygem-omniauth-github/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495561762
-SHA256 (rubygem/omniauth-github-1.3.0.gem) = 0c2ff7be10895142b9592a8535019edfdd8c6856f8ea1362d46cf9922e99e779
-SIZE (rubygem/omniauth-github-1.3.0.gem) = 8704
+TIMESTAMP = 1582614356
+SHA256 (rubygem/omniauth-github-1.4.0.gem) = 8b42ae988b967efe46703ea370b320c4d4f169dee6c337c672fe3adc57037375
+SIZE (rubygem/omniauth-github-1.4.0.gem) = 9216