From owner-svn-ports-all@freebsd.org Sat Jul 27 11:41:14 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 05D24B6F7F; Sat, 27 Jul 2019 11:41:14 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DAC28778F0; Sat, 27 Jul 2019 11:41:13 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B88AE26B2C; Sat, 27 Jul 2019 11:41:13 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6RBfD9v065527; Sat, 27 Jul 2019 11:41:13 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6RBfDcm065523; Sat, 27 Jul 2019 11:41:13 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201907271141.x6RBfDcm065523@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sat, 27 Jul 2019 11:41:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507396 - in head/sysutils/acts: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: in head/sysutils/acts: . files X-SVN-Commit-Revision: 507396 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DAC28778F0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.91 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.91)[-0.910,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jul 2019 11:41:14 -0000 Author: adamw Date: Sat Jul 27 11:41:12 2019 New Revision: 507396 URL: https://svnweb.freebsd.org/changeset/ports/507396 Log: acts: Fix excessive message spewing - Add upstream patch to fix a case where tarsnap messages are repeated multiple times in acts output - Bump PORTREVISION - Take maintainership. Thank you to Mark, who looked after this port for over 4 years! Approved by: feld Added: head/sysutils/acts/files/patch-acts (contents, props changed) Modified: head/sysutils/acts/Makefile head/sysutils/acts/pkg-descr Modified: head/sysutils/acts/Makefile ============================================================================== --- head/sysutils/acts/Makefile Sat Jul 27 09:02:22 2019 (r507395) +++ head/sysutils/acts/Makefile Sat Jul 27 11:41:12 2019 (r507396) @@ -4,9 +4,10 @@ PORTNAME= acts PORTVERSION= 1.4.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= sysutils archivers -MAINTAINER= feld@FreeBSD.org +MAINTAINER= adamw@FreeBSD.org COMMENT= Another Calendar-based Tarsnap Script LICENSE= PD @@ -20,7 +21,7 @@ NO_BUILD= yes NO_ARCH= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/acts ${STAGEDIR}${PREFIX}/bin/acts - ${INSTALL_DATA} ${WRKSRC}/acts.conf.sample ${STAGEDIR}${PREFIX}/etc/acts.conf.sample + ${INSTALL_SCRIPT} ${WRKSRC}/acts ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/acts.conf.sample ${STAGEDIR}${PREFIX}/etc .include Added: head/sysutils/acts/files/patch-acts ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/acts/files/patch-acts Sat Jul 27 11:41:12 2019 (r507396) @@ -0,0 +1,33 @@ +From 8230c749dd92ce6d5fd7b742525e8c9701f4bacb Mon Sep 17 00:00:00 2001 +From: Adam Weinberger +Date: Tue, 16 Jul 2019 06:16:27 -0600 +Subject: [PATCH] Wrap the archive deletion tarsnap call + +With it unwrapped, if you call tarsnap with --print-stats, or if that +is in your tarsnap.conf, you'll get the stats printed after every +archive deletion. + +While the information is great to have, if you have many targets, +you get 5n lines of output, with nothing indicating which target it's +referring to. It might be worth exploring a better way to show how +much data got added and/or removed for each target, given that tarsnap +can automatically give that info right back to acts. +--- + acts | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/acts b/acts +index 4dc1803..63f35cb 100755 +--- acts.orig ++++ acts +@@ -238,7 +238,9 @@ prune_backups() { + log_verbose "message=\"Deleting backup prefix $archiveprefixtodel*\"" + echo "$archives" | grep -E "^$archiveprefixtodel" | while read -r archivetodel; do + log_debug "message=\"Deleting backup $archivetodel\"" +- $tarsnap -d -f "$archivetodel" ++ if ! output="$($tarsnap -d -f "$archivetodel" 2>&1)"; then ++ log_message "delete-error type=$backuplevel output=\"$(echo $output | tr '\n' " ")\"" ++ fi + done + done + else Modified: head/sysutils/acts/pkg-descr ============================================================================== --- head/sysutils/acts/pkg-descr Sat Jul 27 09:02:22 2019 (r507395) +++ head/sysutils/acts/pkg-descr Sat Jul 27 11:41:12 2019 (r507396) @@ -5,7 +5,7 @@ Some design goals: Calendar-based (daily, monthly, yearly) backup schedule Portable, small code footprint. -One Tarsnap archive is created per-target per-run. 31 daily, 12 monthly, -and indefinite yearly backups are kept. +By default, 31 daily, 12 monthly, and indefinite yearly backups +are kept. WWW: https://github.com/alexjurkiewicz/acts