Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Feb 2020 04:58:38 +0000 (UTC)
From:      Ben Woods <woodsb02@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r524757 - in head/sysutils/zrepl: . files
Message-ID:  <202002010458.0114wcvS092029@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: woodsb02
Date: Sat Feb  1 04:58:38 2020
New Revision: 524757
URL: https://svnweb.freebsd.org/changeset/ports/524757

Log:
  sysutils/zrepl: Update to 0.2.1
  
  - Update to 0.2.1 [1]
  - Unbreak build on aarch64, by updating to newer golang:sys [2]
  - Move sample file for syslog.d and newsyslog.conf.d to EXAMPLESDIR [3]
  - Migrate to USES=go:modules to simplify building go dependency list
  - Add new EXAMPLES option to allow installing these to be optional
  
  Changes this release:
    https://github.com/zrepl/zrepl/blob/v0.2.1/docs/changelog.rst
  
  PR:		243354 [1], 242456 [2], 229445 [3]
  Submitted by:	dmgk [2]
  Reported by:	asomers [1], yuri [3]

Added:
  head/sysutils/zrepl/files/newsyslog.conf
     - copied unchanged from r524756, head/sysutils/zrepl/files/newsyslog-zrepl.conf
  head/sysutils/zrepl/files/syslog.conf
     - copied unchanged from r524756, head/sysutils/zrepl/files/syslog-zrepl.conf.sample
  head/sysutils/zrepl/files/zrepl.yml
     - copied unchanged from r524756, head/sysutils/zrepl/files/zrepl.yml.sample
Deleted:
  head/sysutils/zrepl/files/newsyslog-zrepl.conf
  head/sysutils/zrepl/files/syslog-zrepl.conf.sample
  head/sysutils/zrepl/files/zrepl.yml.sample
Modified:
  head/sysutils/zrepl/Makefile
  head/sysutils/zrepl/distinfo
  head/sysutils/zrepl/files/pkg-message.in
  head/sysutils/zrepl/pkg-plist

Modified: head/sysutils/zrepl/Makefile
==============================================================================
--- head/sysutils/zrepl/Makefile	Sat Feb  1 04:43:55 2020	(r524756)
+++ head/sysutils/zrepl/Makefile	Sat Feb  1 04:58:38 2020	(r524757)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	zrepl
-PORTVERSION=	0.1.1
+PORTVERSION=	0.2.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	woodsb02@FreeBSD.org
@@ -13,50 +12,60 @@ COMMENT=	ZFS dataset replication tool
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_i386=	https://github.com/zrepl/zrepl/issues/184
-
-USES=		gmake go
+USES=		gmake go:modules
 USE_RC_SUBR=	zrepl
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+SUB_FILES=	pkg-message
 USE_GITHUB=	yes
-GH_SUBDIR=	src/github.com/zrepl/zrepl
-GH_TUPLE=	beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \
-		fatih:color:v1.7.0:color/vendor/github.com/fatih/color \
-		ftrvxmtrx:fd:c6d8003:fd/vendor/github.com/ftrvxmtrx/fd \
-		gdamore:encoding:b23993c:encoding/vendor/github.com/gdamore/encoding \
-		gdamore:tcell:v1.1.0:tcell/vendor/github.com/gdamore/tcell \
-		go-logfmt:logfmt:v0.4.0:logfmt/vendor/github.com/go-logfmt/logfmt \
-		golang:net:351d144:net/vendor/golang.org/x/net \
-		golang:protobuf:v1.3.1:protobuf/vendor/github.com/golang/protobuf \
-		golang:sync:e225da7:sync/vendor/golang.org/x/sync \
-		golang:sys:4ed8d59:sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.0:go_text/vendor/golang.org/x/text \
-		google:go-genproto:bd91e49:genproto/vendor/google.golang.org/genproto \
-		google:uuid:v1.1.1:uuid/vendor/github.com/google/uuid \
-		grpc:grpc-go:v1.17.0:grpc/vendor/google.golang.org/grpc \
-		jinzhu:copier:db4671f:copier/vendor/github.com/jinzhu/copier \
-		kr:pretty:cfb55aa:pretty/vendor/github.com/kr/pretty \
-		kr:text:7cafcd8:text/vendor/github.com/kr/text \
-		lucasb-eyer:go-colorful:v1.0:go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
-		mattn:go-isatty:v0.0.3:go_isatty/vendor/github.com/mattn/go-isatty \
-		mattn:go-runewidth:v0.0.3:go_runewidth/vendor/github.com/mattn/go-runewidth \
-		matttproud:golang_protobuf_extensions:v1.0.0:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		pkg:errors:v0.8.1:errors/vendor/github.com/pkg/errors \
-		problame:go-netssh:09d6bc4:go_netssh/vendor/github.com/problame/go-netssh \
-		problame:go-rwccmd:391d2c7:go_rwccmd/vendor/github.com/problame/go-rwccmd \
-		prometheus:client_golang:e11c6ff:client_golang/vendor/github.com/prometheus/client_golang \
-		prometheus:client_model:99fa1f4:client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:d0f7cd6:common/vendor/github.com/prometheus/common \
-		prometheus:procfs:8b1c2da:procfs/vendor/github.com/prometheus/procfs \
-		spf13:cobra:b787445:cobra/vendor/github.com/spf13/cobra \
-		spf13:pflag:v1.0.0:pflag/vendor/github.com/spf13/pflag \
-		stretchr:testify:v1.1.4:testify/vendor/github.com/stretchr/testify \
-		theckman:goconstraint:v1.11.0:goconstraint/vendor/github.com/theckman/goconstraint \
-		zrepl:yaml-config:08227ad:yaml_config/vendor/github.com/zrepl/yaml-config
+GH_TUPLE=	\
+		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+		cespare:xxhash:v2.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash/v2 \
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \
+		ftrvxmtrx:fd:c6d800382fff:ftrvxmtrx_fd/vendor/github.com/ftrvxmtrx/fd \
+		gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
+		gdamore:tcell:v1.2.0:gdamore_tcell/vendor/github.com/gdamore/tcell \
+		go-logfmt:logfmt:v0.4.0:go_logfmt_logfmt/vendor/github.com/go-logfmt/logfmt \
+		go-sql-driver:mysql:b2c03bcae3d4:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
+		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		golang:appengine:v1.1.0:golang_appengine/vendor/google.golang.org/appengine \
+		golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
+		google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \
+		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
+		grpc:grpc-go:v1.17.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
+		jinzhu:copier:db4671f3a9b8:jinzhu_copier/vendor/github.com/jinzhu/copier \
+		kr:logfmt:b84e30acd515:kr_logfmt/vendor/github.com/kr/logfmt \
+		kr:pretty:v0.1.0:kr_pretty/vendor/github.com/kr/pretty \
+		kr:text:v0.1.0:kr_text/vendor/github.com/kr/text \
+		lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \
+		lucasb-eyer:go-colorful:v1.0.2:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
+		mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.8:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		montanaflynn:stats:v0.5.0:montanaflynn_stats/vendor/github.com/montanaflynn/stats \
+		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
+		pkg:profile:v1.2.1:pkg_profile/vendor/github.com/pkg/profile \
+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		problame:go-netssh:f34099f4f6b1:problame_go_netssh/vendor/github.com/problame/go-netssh \
+		prometheus:client_golang:v1.2.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:14fe0d1b01d4:prometheus_client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:v0.7.0:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.0.5:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		sergi:go-diff:da645544ed44:sergi_go_diff/vendor/github.com/sergi/go-diff \
+		spf13:cobra:v0.0.2:spf13_cobra/vendor/github.com/spf13/cobra \
+		spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \
+		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
+		theckman:goconstraint:v1.11.0:theckman_goconstraint/vendor/github.com/theckman/goconstraint \
+		yudai:gojsondiff:7b1b7adf999d:yudai_gojsondiff/vendor/github.com/yudai/gojsondiff \
+		yudai:golcs:ecda9a501e82:yudai_golcs/vendor/github.com/yudai/golcs \
+		zrepl:yaml-config:af7ca3f8448f:zrepl_yaml_config/vendor/github.com/zrepl/yaml-config
 
-SUB_FILES=	pkg-message
-
-OPTIONS_DEFINE=		MANPAGES
+OPTIONS_DEFINE=		EXAMPLES MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
 MANPAGES_USES=		python:build
@@ -75,16 +84,19 @@ post-build-MANPAGES-on:
 	@${MAKE_CMD} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} man
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zrepl/samples
-	${INSTALL_DATA} ${WRKSRC}/dist/grafana/grafana-prometheus-zrepl-0.1.json ${STAGEDIR}${PREFIX}/share/zrepl/samples/
-	${INSTALL_DATA} ${WRKSRC}/config/samples/* ${STAGEDIR}${PREFIX}/share/zrepl/samples/
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} \
+		${STAGEDIR}${ETCDIR} \
+		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \
 		${STAGEDIR}${PREFIX}/etc/syslog.d \
-		${STAGEDIR}${PREFIX}/etc/zrepl \
 		${STAGEDIR}/var/run/zrepl
-	${INSTALL_DATA} ${FILESDIR}/newsyslog-zrepl.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/zrepl.conf.sample
-	${INSTALL_DATA} ${FILESDIR}/syslog-zrepl.conf.sample ${STAGEDIR}${PREFIX}/etc/syslog.d/zrepl.conf.sample
-	${INSTALL_DATA} ${FILESDIR}/zrepl.yml.sample ${STAGEDIR}${PREFIX}/etc/zrepl/zrepl.yml.sample
+	${INSTALL_DATA} ${FILESDIR}/newsyslog.conf ${STAGEDIR}${EXAMPLESDIR}/newsyslog.conf
+	${INSTALL_DATA} ${FILESDIR}/syslog.conf ${STAGEDIR}${EXAMPLESDIR}/syslog.conf
+	${INSTALL_DATA} ${FILESDIR}/zrepl.yml ${STAGEDIR}${ETCDIR}/zrepl.yml.sample
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/hooks
+	(cd ${WRKSRC}/config/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+	${INSTALL_DATA} ${WRKSRC}/dist/grafana/grafana-prometheus-zrepl-0.1.json ${STAGEDIR}${EXAMPLESDIR}
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/docs/_build/man/zrepl.1 ${STAGEDIR}${PREFIX}/man/man1

Modified: head/sysutils/zrepl/distinfo
==============================================================================
--- head/sysutils/zrepl/distinfo	Sat Feb  1 04:43:55 2020	(r524756)
+++ head/sysutils/zrepl/distinfo	Sat Feb  1 04:58:38 2020	(r524757)
@@ -1,69 +1,97 @@
-TIMESTAMP = 1555701482
-SHA256 (zrepl-zrepl-v0.1.1_GH0.tar.gz) = 0c16554e4527d14a390d78cf95bce759da425019a83ec63acfed5b4c50d68c9c
-SIZE (zrepl-zrepl-v0.1.1_GH0.tar.gz) = 212913
-SHA256 (beorn7-perks-3a771d9_GH0.tar.gz) = b7a0faebca98ebd5e7546403b4cdea9dc77f865f0623d04efbad33e984297cc9
-SIZE (beorn7-perks-3a771d9_GH0.tar.gz) = 10800
+TIMESTAMP = 1580532734
+SHA256 (zrepl-zrepl-v0.2.1_GH0.tar.gz) = df474e70f5a51d84816ee8a06038ded167a7548e547e2d2822c313f088eeeafd
+SIZE (zrepl-zrepl-v0.2.1_GH0.tar.gz) = 269205
+SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
+SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
+SHA256 (cespare-xxhash-v2.1.0_GH0.tar.gz) = e290af0281cb450d295eafbecdbc3138f94c3ff728f14714af055a1d9a4ce15d
+SIZE (cespare-xxhash-v2.1.0_GH0.tar.gz) = 9198
+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755
 SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449
-SHA256 (ftrvxmtrx-fd-c6d8003_GH0.tar.gz) = cc6ff072f220c819fffde3b35edeba0183c827e8ff76f221acb6a6d71d257e90
-SIZE (ftrvxmtrx-fd-c6d8003_GH0.tar.gz) = 3283
-SHA256 (gdamore-tcell-v1.1.0_GH0.tar.gz) = f2c8d63f24ef1f89abd80f6ee86cdb2af562225405644c0e75d0522b04858443
-SIZE (gdamore-tcell-v1.1.0_GH0.tar.gz) = 719426
-SHA256 (gdamore-encoding-b23993c_GH0.tar.gz) = 7fe1ed858143ba259114120a8a736645ee644b22bece7c09240df6113922f01a
-SIZE (gdamore-encoding-b23993c_GH0.tar.gz) = 10629
+SHA256 (ftrvxmtrx-fd-c6d800382fff_GH0.tar.gz) = 69b71ef7c26bca3b06e9f75d3949a0536b8e0146a9154e8ec999dce6da6d4b0a
+SIZE (ftrvxmtrx-fd-c6d800382fff_GH0.tar.gz) = 3276
+SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
+SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
+SHA256 (gdamore-tcell-v1.2.0_GH0.tar.gz) = 39f3d1fb6c30b911141f6d19d3e3ee1352af7907336910811a8e60b2f10c8d8b
+SIZE (gdamore-tcell-v1.2.0_GH0.tar.gz) = 146485
 SHA256 (go-logfmt-logfmt-v0.4.0_GH0.tar.gz) = eddccc7c8d39a6381f7152e73ebf3c725de317c5b984d8a77282e63915aa834d
 SIZE (go-logfmt-logfmt-v0.4.0_GH0.tar.gz) = 12724
-SHA256 (golang-net-351d144_GH0.tar.gz) = 85e5747e8bb3009cb2f06d70eed9fc468901ea7d5ec05c4e68df1681fe51b599
-SIZE (golang-net-351d144_GH0.tar.gz) = 965968
-SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
-SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
-SHA256 (golang-sync-e225da7_GH0.tar.gz) = 0ca7d229725c37038f50bdd2fc5065eb3fbc7de47a96e8ecfbf2c3da04e671e4
-SIZE (golang-sync-e225da7_GH0.tar.gz) = 16285
-SHA256 (golang-sys-4ed8d59_GH0.tar.gz) = 82a85133e63e18c493fbd2cf4237163364229df2582e85174d683c92a7b72ef3
-SIZE (golang-sys-4ed8d59_GH0.tar.gz) = 1117271
+SHA256 (go-sql-driver-mysql-b2c03bcae3d4_GH0.tar.gz) = 3c2356551b8115a7a2457d0c9a4b7e296d549badfffe06722d34a3d3459ad4e5
+SIZE (go-sql-driver-mysql-b2c03bcae3d4_GH0.tar.gz) = 89452
+SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
+SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
+SHA256 (golang-appengine-v1.1.0_GH0.tar.gz) = 83e0a8b26421bb2701bbd09a19b9242928573d41e912dd56eb331bac6a5c4aa6
+SIZE (golang-appengine-v1.1.0_GH0.tar.gz) = 302553
+SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4
+SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062
+SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
+SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
+SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
+SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
+SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5
+SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659
 SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
 SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
-SHA256 (google-go-genproto-bd91e49_GH0.tar.gz) = a9106ed5286baa7a9062ebc1f3e5a9a0903e243d765737f762d0c0c12268c13e
-SIZE (google-go-genproto-bd91e49_GH0.tar.gz) = 2429145
+SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377
+SIZE (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 2429775
 SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
 SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
 SHA256 (grpc-grpc-go-v1.17.0_GH0.tar.gz) = 891add70cc16c9e2dc07986fd6e8fae44a36921727411f0b652afbc76e0fb169
 SIZE (grpc-grpc-go-v1.17.0_GH0.tar.gz) = 563534
-SHA256 (jinzhu-copier-db4671f_GH0.tar.gz) = 3ae429e4a775545174f89591605f2775e3d52d9942ef1619019c84dfec65552f
-SIZE (jinzhu-copier-db4671f_GH0.tar.gz) = 5039
-SHA256 (kr-pretty-cfb55aa_GH0.tar.gz) = 5c8e2093298c7540a2707a34d283ce37f1b288497786d4f5725647a63ab2ac5c
-SIZE (kr-pretty-cfb55aa_GH0.tar.gz) = 8499
-SHA256 (kr-text-7cafcd8_GH0.tar.gz) = 218bd56a3927283e4c9232b4ee15e0fcc989ace72a2a0be14863ce3795ad3c90
-SIZE (kr-text-7cafcd8_GH0.tar.gz) = 8584
-SHA256 (lucasb-eyer-go-colorful-v1.0_GH0.tar.gz) = 7bad1f3ae46d9f2f4e635e4b3f65424e1be9c131864630c5a99d512bc0bf2266
-SIZE (lucasb-eyer-go-colorful-v1.0_GH0.tar.gz) = 428403
-SHA256 (mattn-go-isatty-v0.0.3_GH0.tar.gz) = daf68970a6506650b05bac72082865f88d582ecdb74418b95ac5621d5392b633
-SIZE (mattn-go-isatty-v0.0.3_GH0.tar.gz) = 3364
-SHA256 (mattn-go-runewidth-v0.0.3_GH0.tar.gz) = 398ec709b006664e527040770056156cb225233d8b44b5a59ba2f5f5f3fa885e
-SIZE (mattn-go-runewidth-v0.0.3_GH0.tar.gz) = 22961
-SHA256 (matttproud-golang_protobuf_extensions-v1.0.0_GH0.tar.gz) = 65fd58d98a7e79fa491808e9bf8315799eff2dae3d4c203dda25560861294115
-SIZE (matttproud-golang_protobuf_extensions-v1.0.0_GH0.tar.gz) = 9586
+SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
+SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
+SHA256 (jinzhu-copier-db4671f3a9b8_GH0.tar.gz) = 82684446197805059b37f348a1489342cb487ee5a8601bec4cd4edcebb9a4dcb
+SIZE (jinzhu-copier-db4671f3a9b8_GH0.tar.gz) = 5036
+SHA256 (kr-logfmt-b84e30acd515_GH0.tar.gz) = bf056ba7960b6846f2aa2c6ec0a217ead3e7259bc6c537f9f3ba3af6eb82cb80
+SIZE (kr-logfmt-b84e30acd515_GH0.tar.gz) = 6411
+SHA256 (kr-pretty-v0.1.0_GH0.tar.gz) = 3aeb5d90b719765781befb9f156d0d0b8e5a7aafbcf15321e9eabbd35df31358
+SIZE (kr-pretty-v0.1.0_GH0.tar.gz) = 8550
+SHA256 (kr-text-v0.1.0_GH0.tar.gz) = b67f2744020b25f9298153af0992db252d195edd7ca5afa3b19d6ac300c2d14e
+SIZE (kr-text-v0.1.0_GH0.tar.gz) = 8686
+SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e
+SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083
+SHA256 (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 9ca738f5e694587af132cdfedefe1c8fbc5e2fe4339286884fe051742d970140
+SIZE (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 430545
+SHA256 (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 157806ad8125e6bef4d9b58c9125ccb98a8343136f93faf442ab0cc6e7c24c11
+SIZE (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 8981
+SHA256 (mattn-go-isatty-v0.0.8_GH0.tar.gz) = 4f40edb394582f49ac6330bc807be93018216ef485eb65f00adcf61b670d4f3e
+SIZE (mattn-go-isatty-v0.0.8_GH0.tar.gz) = 3564
+SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
+SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
+SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
+SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
+SHA256 (montanaflynn-stats-v0.5.0_GH0.tar.gz) = 7013ef675c1836a574e20ae81b71ac4854796cc2a8abf55e176d4643849e3778
+SIZE (montanaflynn-stats-v0.5.0_GH0.tar.gz) = 28893
 SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
 SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
-SHA256 (problame-go-netssh-09d6bc4_GH0.tar.gz) = 3f2619fc542899620c8bd184ba37e366590630e6f4840683f0c3836741a7d818
-SIZE (problame-go-netssh-09d6bc4_GH0.tar.gz) = 10966
-SHA256 (problame-go-rwccmd-391d2c7_GH0.tar.gz) = 9705f2896b56502fb3660b4ee6c731a4f46bec70e3e8637f7f26881b3067f9b3
-SIZE (problame-go-rwccmd-391d2c7_GH0.tar.gz) = 3856
-SHA256 (prometheus-client_golang-e11c6ff_GH0.tar.gz) = 5bf0c58891d0ab8787bdbea9d1672050160af904cbbcfacf904eafe056f73ce7
-SIZE (prometheus-client_golang-e11c6ff_GH0.tar.gz) = 107577
-SHA256 (prometheus-client_model-99fa1f4_GH0.tar.gz) = 11c3da0c9a3e4879aa2de15b8e1f494cd74ce3afca831a759f564edeea232f69
-SIZE (prometheus-client_model-99fa1f4_GH0.tar.gz) = 54653
-SHA256 (prometheus-common-d0f7cd6_GH0.tar.gz) = cab0c7db55faf4d4aad29363668de010874b3b76ef45761bbc7d10b1f28735a8
-SIZE (prometheus-common-d0f7cd6_GH0.tar.gz) = 62987
-SHA256 (prometheus-procfs-8b1c2da_GH0.tar.gz) = 6830f8f6a42018db0820f4d2d1f788a797a61bd6cf8fe79f914d4a33e1337ed8
-SIZE (prometheus-procfs-8b1c2da_GH0.tar.gz) = 56785
-SHA256 (spf13-cobra-b787445_GH0.tar.gz) = 2923b91766a9e68a22f81d3b46768dad963fd4ae3f6a5b2e137e2a7b87b37276
-SIZE (spf13-cobra-b787445_GH0.tar.gz) = 99833
-SHA256 (spf13-pflag-v1.0.0_GH0.tar.gz) = 690b86ae5499fad84ada4644c85215d66d56f31934683e8543f4c57c5048e011
-SIZE (spf13-pflag-v1.0.0_GH0.tar.gz) = 38988
-SHA256 (stretchr-testify-v1.1.4_GH0.tar.gz) = f7a244ad38ee484296e8969356209e0d9fb35bd790f69fc5e7758b4e2a9e1874
-SIZE (stretchr-testify-v1.1.4_GH0.tar.gz) = 83325
+SHA256 (pkg-profile-v1.2.1_GH0.tar.gz) = 21b6541e7cad44e984e9bad1dc700def6e52fa1affa38a867f32ff6a6bec3ac0
+SIZE (pkg-profile-v1.2.1_GH0.tar.gz) = 5789
+SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
+SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
+SHA256 (problame-go-netssh-f34099f4f6b1_GH0.tar.gz) = 35ff3eddff282c4eaa2c54b3d0ab0c87ab7e5b2f2a287c4c5fbf3d3acd2d3cff
+SIZE (problame-go-netssh-f34099f4f6b1_GH0.tar.gz) = 22870
+SHA256 (prometheus-client_golang-v1.2.1_GH0.tar.gz) = fe6a626322d22d8ce9780320fd04a64a90c9a7aa62ec88809651072b30a10e6a
+SIZE (prometheus-client_golang-v1.2.1_GH0.tar.gz) = 142465
+SHA256 (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = e86922566dae5bd684e2b77baabfaee9df34ce11cd7c8bae688b512b3a496f03
+SIZE (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = 57495
+SHA256 (prometheus-common-v0.7.0_GH0.tar.gz) = 71b1dce2afd959f9fcab3b5e097dfa9d398a61749851d290114746a3f8f119ae
+SIZE (prometheus-common-v0.7.0_GH0.tar.gz) = 100520
+SHA256 (prometheus-procfs-v0.0.5_GH0.tar.gz) = 0a28cd42f6c727ccd48878f7506f0a9c87b72e7dba122f8c6884aba3aab7c800
+SIZE (prometheus-procfs-v0.0.5_GH0.tar.gz) = 112152
+SHA256 (sergi-go-diff-da645544ed44_GH0.tar.gz) = b90c77c55769fffabfc555092910960be9481d105b20da510c921da56166f025
+SIZE (sergi-go-diff-da645544ed44_GH0.tar.gz) = 42371
+SHA256 (spf13-cobra-v0.0.2_GH0.tar.gz) = 5703ee865c6e7b11a471889fa05b8a4178b1ff8d98982bcadb46753b305e3d6b
+SIZE (spf13-cobra-v0.0.2_GH0.tar.gz) = 100775
+SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124
+SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002
+SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
+SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
 SHA256 (theckman-goconstraint-v1.11.0_GH0.tar.gz) = 98d95306dc3679374fb954f9a25a01606fc96a166fdcbda5226ff6f50d58dfcf
 SIZE (theckman-goconstraint-v1.11.0_GH0.tar.gz) = 5945
-SHA256 (zrepl-yaml-config-08227ad_GH0.tar.gz) = f83984afbf7da172dccf71f5b95a5143282647dbc5ee0957cf00ad314f1d72d5
-SIZE (zrepl-yaml-config-08227ad_GH0.tar.gz) = 71024
+SHA256 (yudai-gojsondiff-7b1b7adf999d_GH0.tar.gz) = ac06dcedd4af0024cfaa8b9e2195611eecf5ee3ee1361d5186b07f0dea7eba02
+SIZE (yudai-gojsondiff-7b1b7adf999d_GH0.tar.gz) = 578880
+SHA256 (yudai-golcs-ecda9a501e82_GH0.tar.gz) = 080b0331f2d3e1f96446247afdc1c095d2ba2aca63a9b353fc4621e881d1dfa7
+SIZE (yudai-golcs-ecda9a501e82_GH0.tar.gz) = 3700
+SHA256 (zrepl-yaml-config-af7ca3f8448f_GH0.tar.gz) = 80fd4405881bbf649a81f7c70437e9e2739f63d90d01124cb264e9ea5baf77c2
+SIZE (zrepl-yaml-config-af7ca3f8448f_GH0.tar.gz) = 71099

Copied: head/sysutils/zrepl/files/newsyslog.conf (from r524756, head/sysutils/zrepl/files/newsyslog-zrepl.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/zrepl/files/newsyslog.conf	Sat Feb  1 04:58:38 2020	(r524757, copy of r524756, head/sysutils/zrepl/files/newsyslog-zrepl.conf)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+#
+# Newsyslog configuration file for zrepl.
+# See newsyslog.conf(5) for details.
+#
+# logfilename		[owner:group]	mode	count	size	when	flags	[/pid_file]			[sig_num]
+/var/log/zrepl.log			644	7	1000	@T00	JNC

Modified: head/sysutils/zrepl/files/pkg-message.in
==============================================================================
--- head/sysutils/zrepl/files/pkg-message.in	Sat Feb  1 04:43:55 2020	(r524756)
+++ head/sysutils/zrepl/files/pkg-message.in	Sat Feb  1 04:58:38 2020	(r524757)
@@ -18,23 +18,10 @@ SETUP BEFORE FIRST USE:
 Documentation: https://zrepl.github.io/
 Changelog:     https://zrepl.github.io/master/changelog.html
 
-WARNING - BREAKING CHANGES WITH THE ZREPL 0.1.X RELEASE:
-There are a number of breaking changes this release. To ensure zrepl
-continues to function correctly, ensure you read the changelog, and then
-perform the following on both sides of the replication:
-- Stop the zrepl service:    # service zrepl stop
-- Upgrade the zrepl package: # pkg upgrade zrepl
-- Modify the zrepl config:   # vi %%PREFIX%%/etc/zrepl/zrepl.yml
-- Check the configuration:   # service zrepl configtest
-- Start the zrepl service:   # service zrepl start
-- Monitor the zrepl service: # zrepl status
-
 DANGER - SNAPSHOT PRUNING REQUIRES EXPLICIT KEEP RULES:
-For any ZFS snapshot that you want to keep, at least one rule must match. This
-is different from previous releases where pruning only affected snapshots with
-the configured snapshotting prefix. Make sure that snapshots to be kept or
-ignored by zrepl are covered, e.g. by using the regex keep rule.
-This also applies to snapshots taken by means other than zrepl (e.g. manually).
+For any ZFS snapshot that you want to keep, at least one rule must match.
+This also applies to snapshots taken by means other than zrepl
+(e.g. snapshots taken manually or via boot environment tools).
 EOM
 }
 ]

Copied: head/sysutils/zrepl/files/syslog.conf (from r524756, head/sysutils/zrepl/files/syslog-zrepl.conf.sample)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/zrepl/files/syslog.conf	Sat Feb  1 04:58:38 2020	(r524757, copy of r524756, head/sysutils/zrepl/files/syslog-zrepl.conf.sample)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+#
+# Syslog configuration file for zrepl.
+# See syslog.conf(5) for details.
+#
+# SELECTOR					ACTION
+# FACILITY.[!<=>]LEVEL
+local0.info					/var/log/zrepl.log

Copied: head/sysutils/zrepl/files/zrepl.yml (from r524756, head/sysutils/zrepl/files/zrepl.yml.sample)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/zrepl/files/zrepl.yml	Sat Feb  1 04:58:38 2020	(r524757, copy of r524756, head/sysutils/zrepl/files/zrepl.yml.sample)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+#
+# zrepl main configuration file.
+# For documentation, refer to https://zrepl.github.io/
+#
+global:
+  logging:
+    - type: "stdout"
+      level:  "error"
+      format: "human"
+    - type: "syslog"
+      level:  "info"
+      format: "logfmt"
+
+# Add "jobs:" section(s) here for your specific use cases.

Modified: head/sysutils/zrepl/pkg-plist
==============================================================================
--- head/sysutils/zrepl/pkg-plist	Sat Feb  1 04:43:55 2020	(r524756)
+++ head/sysutils/zrepl/pkg-plist	Sat Feb  1 04:58:38 2020	(r524757)
@@ -1,14 +1,17 @@
 bin/zrepl
-@sample etc/newsyslog.conf.d/zrepl.conf.sample
-@sample etc/syslog.d/zrepl.conf.sample
 @sample %%ETCDIR%%/zrepl.yml.sample
-%%DATADIR%%/samples/grafana-prometheus-zrepl-0.1.json
-%%DATADIR%%/samples/local.yml
-%%DATADIR%%/samples/pull.yml
-%%DATADIR%%/samples/pull_ssh.yml
-%%DATADIR%%/samples/push.yml
-%%DATADIR%%/samples/sink.yml
-%%DATADIR%%/samples/snap.yml
-%%DATADIR%%/samples/source.yml
-%%DATADIR%%/samples/source_ssh.yml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hooks/template.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grafana-prometheus-zrepl-0.1.json
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/local.yml
+@sample %%EXAMPLESDIR%%/newsyslog.conf etc/newsyslog.conf.d/zrepl.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pull.yml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pull_ssh.yml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/push.yml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sink.yml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/snap.yml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/source.yml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/source_ssh.yml
+@sample %%EXAMPLESDIR%%/syslog.conf etc/syslog.d/zrepl.conf
+@dir etc/newsyslog.conf.d
+@dir etc/syslog.d
 @dir(root,wheel,0750) /var/run/zrepl



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002010458.0114wcvS092029>