From ad481afabc88a8415a2eb47792d00dc0e2f2575d Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 7 Jan 2020 11:40:14 +0000 Subject: [PATCH] Update sysutils/rsnapshot to 1.4.3 VERSION 1.4.3 - Restore rsync error code 23 as an important warning. - Non-LVM backup source breaks after LVM backup source. VERSION 1.4.2 - Fix double 8 bit shift regression in #65. VERSION 1.4.1 - Properly capture rsyncs exitcode. VERSION 1.4.0 - Fix --rsh command line option The --rsh option of rsync got errornously quoted (Debian Bug #743310) - Define traps to unmount LVM parts after fail If you use LVM snapshots and rsnapshot fails, rsnapshot will unmount and remove the snapshot, too. - Bail on failing cmd_(pre|post)exec If one of those commands fails, rsnapshot will exit with exit code != 0 - Capture output from rsync and print/log if level is >=4 - rsnapshot-diff: Fixed removed files reported as addition (+ mark) - Introduction of backup_exec resource for running unix commands interspersed with backup and backup_script jobs. - check for SIGPIPE, mainly in case cron fails when trying to mail (this is probably why rsnapshot dies mysteriously if it outputs when called by cron on a system which does not have mail working). - When snapshot_root does not exist, check existence of parent directories. - include_conf `command` now strips backticks before execution (bug fix based on suggestion from David Osborn). - Ignore extraneous output from lvremove command. (patch by Tim Connors) - Allow linux_lvm_cmd_* in config file to have options also. - Allow `backticks with options` in include_conf. - rsnapshot-diff: Add -s option to show size of each file. --- sysutils/rsnapshot/Makefile | 15 +++++++------ sysutils/rsnapshot/PLIST | 6 +++--- sysutils/rsnapshot/distinfo | 12 +++++------ sysutils/rsnapshot/patches/patch-aa | 18 ---------------- .../patches/patch-rsnapshot-program.pl | 21 ------------------- 5 files changed, 15 insertions(+), 57 deletions(-) delete mode 100644 sysutils/rsnapshot/patches/patch-aa delete mode 100644 sysutils/rsnapshot/patches/patch-rsnapshot-program.pl diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile index a7b545f8e179..482710dcde04 100644 --- a/sysutils/rsnapshot/Makefile +++ b/sysutils/rsnapshot/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.21 2019/08/11 13:23:16 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2020/01/07 11:40:14 kim Exp $ -DISTNAME= rsnapshot-1.3.1 -PKGREVISION= 8 +DISTNAME= rsnapshot-1.4.3 CATEGORIES= net -MASTER_SITES= http://www.rsnapshot.org/downloads/ +MASTER_SITES= https://rsnapshot.org/downloads/ -MAINTAINER= kim@tac.nyc.ny.us -HOMEPAGE= http://www.rsnapshot.org/ +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://rsnapshot.org/ COMMENT= Filesystem snapshot utility LICENSE= gnu-gpl-v2 @@ -36,7 +35,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/rsnapshot-diff ${DESTDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/rsnapshot-diff.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA} ${WRKSRC}/rsnapshot.conf.default ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/INSTALL.md ${DESTDIR}${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${DOCDIR} .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rsnapshot/PLIST b/sysutils/rsnapshot/PLIST index 0fdd07b5f9fe..0e4617b54e14 100644 --- a/sysutils/rsnapshot/PLIST +++ b/sysutils/rsnapshot/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2015/02/01 01:48:36 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2020/01/07 11:40:14 kim Exp $ bin/rsnapshot bin/rsnapshot-diff man/man1/rsnapshot-diff.1 man/man1/rsnapshot.1 -share/doc/rsnapshot/INSTALL -share/doc/rsnapshot/README +share/doc/rsnapshot/INSTALL.md +share/doc/rsnapshot/README.md share/examples/rsnapshot/rsnapshot.conf.default diff --git a/sysutils/rsnapshot/distinfo b/sysutils/rsnapshot/distinfo index 15727a05f940..11b663ce948c 100644 --- a/sysutils/rsnapshot/distinfo +++ b/sysutils/rsnapshot/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.9 2015/11/04 01:32:29 agc Exp $ +$NetBSD: distinfo,v 1.10 2020/01/07 11:40:14 kim Exp $ -SHA1 (rsnapshot-1.3.1.tar.gz) = a3aa3560dc389e1b00155a5869558522c4a29e05 -RMD160 (rsnapshot-1.3.1.tar.gz) = 948ee5669c5da0728f607007da4d5fbbcfcdd8c7 -SHA512 (rsnapshot-1.3.1.tar.gz) = a74ad0a21d213dd2e05cb577a47c491af90d8994df8f5a154195515345da438ac9c0d72b563aa02314883a0b3bb86e3c23f8b530a7078c2b55a9547a2d666c10 -Size (rsnapshot-1.3.1.tar.gz) = 215806 bytes -SHA1 (patch-aa) = 3ee93516cd2ccf3e9f608019dd405cde9d3711e2 -SHA1 (patch-rsnapshot-program.pl) = cb3a4cb745bbf1de8e9bd647e6c0b4fcebe583a4 +SHA1 (rsnapshot-1.4.3.tar.gz) = 0596d14bd852114db99f4e441040058b3ebf166f +RMD160 (rsnapshot-1.4.3.tar.gz) = db7e6858e3cd7334b8d6c207dafec7aeb529b5a3 +SHA512 (rsnapshot-1.4.3.tar.gz) = 606b5c195e609197ae6711a9764c07a0f0822fe228aba07014155636bd5caa7ad7dbf8f42316275a71490b5c9dd33bf04c42580b92f4910c38ef871694ae09e3 +Size (rsnapshot-1.4.3.tar.gz) = 370840 bytes diff --git a/sysutils/rsnapshot/patches/patch-aa b/sysutils/rsnapshot/patches/patch-aa deleted file mode 100644 index 4c27ff5bf66a..000000000000 --- a/sysutils/rsnapshot/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2012/08/11 18:30:12 ryoon Exp $ - ---- Makefile.in.orig 2008-08-31 11:20:08.000000000 +0000 -+++ Makefile.in -@@ -549,11 +549,11 @@ doc: man html - man: $(man_MANS) - rsnapshot.1 : rsnapshot - @# perl 5.8 for this -- /usr/bin/pod2man -c '' -n 'rsnapshot' -r '' rsnapshot > rsnapshot.1 -+ pod2man -c '' -n 'rsnapshot' -r '' rsnapshot > rsnapshot.1 - - rsnapshot-diff.1 : rsnapshot-diff - @# perl 5.8 for this -- /usr/bin/pod2man -c '' -n 'rsnapshot-diff' -r '' rsnapshot-diff > rsnapshot-diff.1 -+ pod2man -c '' -n 'rsnapshot-diff' -r '' rsnapshot-diff > rsnapshot-diff.1 - - html: rsnapshot.html - rsnapshot.html: rsnapshot diff --git a/sysutils/rsnapshot/patches/patch-rsnapshot-program.pl b/sysutils/rsnapshot/patches/patch-rsnapshot-program.pl deleted file mode 100644 index d3794ddfcd7a..000000000000 --- a/sysutils/rsnapshot/patches/patch-rsnapshot-program.pl +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-rsnapshot-program.pl,v 1.1 2013/06/04 18:48:48 wiz Exp $ - -Fix -pod2man -c '' -n 'rsnapshot' -r '' rsnapshot > rsnapshot.1 -rsnapshot around line 6723: You forgot a '=back' before '=head1' -POD document had syntax errors at /usr/pkg/bin/pod2man line 71. - -Reported upstream at -https://github.com/DrHyde/rsnapshot/issues/8 - ---- rsnapshot-program.pl.orig 2008-08-31 11:17:07.000000000 +0000 -+++ rsnapshot-program.pl -@@ -6716,6 +6716,8 @@ Putting it all together (an example file - - =back - -+=back -+ - =head1 USAGE - - B can be used by any user, but for system-wide backups