cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to rsnapshot-1.4.0.

Browse Source
This commit is contained in:
ajacoutot 2015-07-03 07:29:58 +00:00
parent da46da3bdc
commit 8752e0198f
8 changed files with 21 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
net/rsnapshot/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2015/02/16 22:57:11 naddy Exp $
# $OpenBSD: Makefile,v 1.14 2015/07/03 07:29:58 ajacoutot Exp $
COMMENT= remote filesystem snapshot utility
DISTNAME= rsnapshot-1.3.1
REVISION= 2
DISTNAME= rsnapshot-1.4.0
CATEGORIES= net sysutils
HOMEPAGE= http://www.rsnapshot.org/
@ -16,28 +15,27 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= http://www.rsnapshot.org/downloads/
BUILD_DEPENDS= net/rsync
RUN_DEPENDS= net/rsync \
devel/p5-Lchown
RUN_DEPENDS= devel/p5-Lchown \
net/rsync
PKG_ARCH= *
NO_TEST= Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS+= --sysconfdir=${SYSCONFDIR}
CONFIGURE_STYLE= gnu
SAMPLES_DIR= ${PREFIX}/share/examples/rsnapshot
SUBST_VARS= SAMPLES_DIR
FAKE_FLAGS= sysconfdir=${SAMPLES_DIR}
pre-build:
${SUBST_CMD} ${WRKSRC}/rsnapshot.1 ${WRKSRC}/README \
${WRKSRC}/rsnapshot-program.pl
perl -pi -e 's,/etc/rsnapshot.conf,${SYSCONFDIR}/rsnapshot.conf,g' \
${WRKSRC}/{README.md,rsnapshot-program.pl} \
${WRKSRC}/rsnapshot{,-diff} \
${WRKSRC}/utils/rsnapshotdb/rsnapshotDB.pl
post-install:
${INSTALL_DATA_DIR} ${SAMPLES_DIR}/utils
${INSTALL_DATA_DIR} ${SAMPLES_DIR}/utils/rsnapshotdb
${INSTALL_DATA} ${WRKSRC}/README ${SAMPLES_DIR}
${INSTALL_DATA} ${WRKSRC}/README.md ${SAMPLES_DIR}
${INSTALL_DATA} ${WRKSRC}/utils/README ${SAMPLES_DIR}/utils
${INSTALL_DATA} ${WRKSRC}/utils/rsnapshot-copy ${SAMPLES_DIR}/utils
${INSTALL_DATA} ${WRKSRC}/utils/rsnaptar ${SAMPLES_DIR}/utils

4
net/rsnapshot/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (rsnapshot-1.3.1.tar.gz) = lLbHfkBiiTX0Khkb3Citk7HxMv3kVu527od2Px7dx14=
SIZE (rsnapshot-1.3.1.tar.gz) = 215806
SHA256 (rsnapshot-1.4.0.tar.gz) = IiV0/uL1nQ4+9dpubdD0RSBf7Pp8oS74IeuKic9PLKg=
SIZE (rsnapshot-1.4.0.tar.gz) = 488785

30
net/rsnapshot/patches/patch-README
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-README,v 1.4 2010/12/17 06:35:44 ajacoutot Exp $
--- README.orig Sun Apr 27 12:26:16 2008
+++ README Fri Sep 19 11:07:44 2008
@@ -70,13 +70,13 @@ COMPATIBILITY NOTICES (Please read)
------------------------------------------------------------------------------
Once you have installed rsnapshot, you will need to configure it.
-The default configuration file is /etc/rsnapshot.conf, although the exact path
+The default configuration file is ${SYSCONFDIR}/rsnapshot.conf, although the exact path
may be different depending on how the program was installed. If this
-file does not exist, copy /etc/rsnapshot.conf.default over to
-/etc/rsnapshot.conf and edit it to suit your tastes. See the man page for
+file does not exist, copy ${SAMPLES_DIR}/rsnapshot.conf.default over to
+${SYSCONFDIR}/rsnapshot.conf and edit it to suit your tastes. See the man page for
the full list of configuration options.
-When /etc/rsnapshot.conf contains your chosen settings, do a quick sanity
+When ${SYSCONFDIR}/rsnapshot.conf contains your chosen settings, do a quick sanity
check to make sure everything is ready to go:
rsnapshot configtest
@@ -97,7 +97,7 @@ In the previous example, there will be six "hourly" sn
taken each day (at 0,4,8,12,16, and 20 hours). There will also
be daily snapshots taken every night at 11:50PM. The number of
snapshots that are saved depends on the "interval" settings in
-/etc/rsnapshot.conf.
+${SYSCONFDIR}/rsnapshot.conf.
For example:

62
net/rsnapshot/patches/patch-configure
View File

@ -1,62 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2006/08/01 12:32:36 alek Exp $
--- configure.orig Fri Jul 14 18:19:33 2006
+++ configure Fri Jul 14 18:22:58 2006
@@ -3295,58 +3295,3 @@ if test "$no_create" != yes; then
fi
-# this is kludgy, but it works
-RSNAPSHOT_SYSCONFDIR=`eval echo ${sysconfdir}`
-
-if test -e "$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"; then
- RSNAPSHOT_OLD_VERSION=`$PERL rsnapshot-program.pl -c $RSNAPSHOT_SYSCONFDIR/rsnapshot.conf check-config-version`
-
- # figure out if this is a fresh install or an upgrade
- # advise the user accordingly
- if test "$RSNAPSHOT_OLD_VERSION" = "unknown"; then
- echo ""
- echo "+----------------------------------------------------------------------------+"
- echo "| A previous version of rsnapshot was detected. |"
- echo "| |"
- echo "| If you have not already done so, it is HIGHLY recommended that you upgrade |"
- echo "| your config file for compatibility with this release. |"
- echo "| |"
- echo "| If you don't upgrade your config file, rsnapshot will appear to work, but |"
- echo "| rearrange the relative paths to your backup files when you aren't looking. |"
- echo "| It would be a nasty surprise, which is why we're telling you about it now. |"
- echo "| |"
- echo "| If you would like to automatically upgrade your config file, just type: |"
- echo "| |"
- echo "| \"make upgrade\" |"
- echo "| |"
- echo "| After you have upgraded your config file, type \"make install\". |"
- echo "| |"
- echo "| For more information on the upgrade, read the INSTALL file that came with |"
- echo "| the program. |"
- echo "+----------------------------------------------------------------------------+"
- exit 0
- fi
-
- # this is already the latest version.
- if test "$RSNAPSHOT_OLD_VERSION" = "1.2"; then
- echo "$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf found, and is up to date."
- else
- echo ""
- echo "ERROR: $RSNAPSHOT_SYSCONFDIR/rsnapshot.conf is an unknown version."
- echo "Upgrading is not recommended until you figure out what's wrong."
- echo ""
- exit 1
- fi
-fi
-
-echo ""
-echo "Now type \"make test\" to run the regression test suite."
-echo "Then type \"make install\" to install the program."
-echo ""
-
-if test ! -e "$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"; then
- echo "After rsnapshot is installed, don't forget to copy"
- echo "$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf.default to $RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"
- echo ""
-fi
-

94
net/rsnapshot/patches/patch-rsnapshot-program_pl
View File

@ -1,94 +0,0 @@
$OpenBSD: patch-rsnapshot-program_pl,v 1.6 2014/03/21 10:48:10 espie Exp $
--- rsnapshot-program.pl.orig Sun Aug 31 13:17:07 2008
+++ rsnapshot-program.pl Fri Mar 21 11:45:39 2014
@@ -392,7 +392,7 @@ sub find_config_file {
# autoconf variables (may have too many slashes)
my $autoconf_sysconfdir = '@sysconfdir@';
my $autoconf_prefix = '@prefix@';
- my $default_config_file = '/etc/rsnapshot.conf';
+ my $default_config_file = '${SYSCONFDIR}/rsnapshot.conf';
# consolidate multiple slashes
$autoconf_sysconfdir =~ s/\/+/\//g;
@@ -6093,7 +6093,7 @@ of cron jobs. It is possible, however, to run as any a
with an alternate configuration file.
All important options are specified in a configuration file, which is
-located by default at B</etc/rsnapshot.conf>. An alternate file can be
+located by default at B<${SYSCONFDIR}/rsnapshot.conf>. An alternate file can be
specified on the command line. There are also additional options which
can be passed on the command line.
@@ -6119,14 +6119,10 @@ B<-D> a firehose of diagnostic information
=head1 CONFIGURATION
-B</etc/rsnapshot.conf> is the default configuration file. All parameters
-in this file must be separated by tabs. B</etc/rsnapshot.conf.default>
+B<${SYSCONFDIR}/rsnapshot.conf> is the default configuration file. All parameters
+in this file must be separated by tabs. B<${SAMPLES_DIR}/rsnapshot.conf.default>
can be used as a reference.
-It is recommended that you copy B</etc/rsnapshot.conf.default> to
-B</etc/rsnapshot.conf>, and then modify B</etc/rsnapshot.conf> to suit
-your needs.
-
Long lines may be split over several lines. "Continuation" lines
B<must> begin with a space or a tab character. Continuation lines will
have all leading and trailing whitespace stripped off, and then be appended
@@ -6716,6 +6712,8 @@ Putting it all together (an example file):
=back
+=back
+
=head1 USAGE
B<rsnapshot> can be used by any user, but for system-wide backups
@@ -6729,7 +6727,7 @@ also want to run it from the command line once or twic
a feel for what it's doing.
Here is an example crontab entry, assuming that backup levels B<hourly>,
-B<daily>, B<weekly> and B<monthly> have been defined in B</etc/rsnapshot.conf>
+B<daily>, B<weekly> and B<monthly> have been defined in B<${SYSCONFDIR}/rsnapshot.conf>
=over 4
@@ -6774,7 +6772,7 @@ your hourly snapshot will fail sometimes because the d
Remember that these are just the times that the program runs.
To set the number of backups stored, set the B<retain> numbers in
-B</etc/rsnapshot.conf>
+B<${SYSCONFDIR}/rsnapshot.conf>
To check the disk space used by rsnapshot, you can call it with the "du" argument.
@@ -6887,7 +6885,7 @@ B<2> Some warnings occurred, but the backup still fin
=head1 FILES
-/etc/rsnapshot.conf
+${SYSCONFDIR}/rsnapshot.conf
=head1 SEE ALSO
@@ -6916,8 +6914,8 @@ B<http://lists.sourceforge.net/lists/listinfo/rsnapsho
=head1 NOTES
-Make sure your /etc/rsnapshot.conf file has all elements separated by tabs.
-See /etc/rsnapshot.conf.default for a working example file.
+Make sure your ${SYSCONFDIR}/rsnapshot.conf file has all elements separated by tabs.
+See ${SAMPLES_DIR}/rsnapshot.conf.default for a working example file.
Make sure you put a trailing slash on the end of all directory references.
If you don't, you may have extra directories created in your snapshots.
@@ -6933,7 +6931,7 @@ If you would like regular users to be able to restore
there are a number of ways this can be accomplished. One such scenario
would be:
-Set B<snapshot_root> to B</.private/.snapshots> in B</etc/rsnapshot.conf>
+Set B<snapshot_root> to B</.private/.snapshots> in B<${SYSCONFDIR}/rsnapshot.conf>
Set the file permissions on these directories as follows:

76
net/rsnapshot/patches/patch-rsnapshot_1
View File

@ -1,76 +0,0 @@
$OpenBSD: patch-rsnapshot_1,v 1.3 2008/09/27 11:54:11 ajacoutot Exp $
--- rsnapshot.1.orig Fri Sep 19 11:02:40 2008
+++ rsnapshot.1 Fri Sep 19 11:05:44 2008
@@ -156,7 +156,7 @@ of cron jobs. It is possible, however, to run as any a
with an alternate configuration file.
.PP
All important options are specified in a configuration file, which is
-located by default at \fB/etc/rsnapshot.conf\fR. An alternate file can be
+located by default at \fB${SYSCONFDIR}/rsnapshot.conf\fR. An alternate file can be
specified on the command line. There are also additional options which
can be passed on the command line.
.PP
@@ -179,14 +179,10 @@ The command line options are as follows:
.RE
.SH "CONFIGURATION"
.IX Header "CONFIGURATION"
-\&\fB/etc/rsnapshot.conf\fR is the default configuration file. All parameters
-in this file must be separated by tabs. \fB/etc/rsnapshot.conf.default\fR
+\&\fB${SYSCONFDIR}/rsnapshot.conf\fR is the default configuration file. All parameters
+in this file must be separated by tabs. \fB${SAMPLES_DIR}/rsnapshot.conf.default\fR
can be used as a reference.
.PP
-It is recommended that you copy \fB/etc/rsnapshot.conf.default\fR to
-\&\fB/etc/rsnapshot.conf\fR, and then modify \fB/etc/rsnapshot.conf\fR to suit
-your needs.
-.PP
Long lines may be split over several lines. \*(L"Continuation\*(R" lines
\&\fBmust\fR begin with a space or a tab character. Continuation lines will
have all leading and trailing whitespace stripped off, and then be appended
@@ -807,7 +803,7 @@ also want to run it from the command line once or twic
a feel for what it's doing.
.Sp
Here is an example crontab entry, assuming that backup levels \fBhourly\fR,
-\&\fBdaily\fR, \fBweekly\fR and \fBmonthly\fR have been defined in \fB/etc/rsnapshot.conf\fR
+\&\fBdaily\fR, \fBweekly\fR and \fBmonthly\fR have been defined in \fB${SYSCONFDIR}/rsnapshot.conf\fR
.Sp
.RS 4
\&\fB0 */4 * * * /usr/local/bin/rsnapshot hourly\fR
@@ -852,7 +848,7 @@ your hourly snapshot will fail sometimes because the d
.Sp
Remember that these are just the times that the program runs.
To set the number of backups stored, set the \fBretain\fR numbers in
-\&\fB/etc/rsnapshot.conf\fR
+\&\fB${SYSCONFDIR}/rsnapshot.conf\fR
.Sp
To check the disk space used by rsnapshot, you can call it with the \*(L"du\*(R" argument.
.Sp
@@ -963,7 +959,7 @@ run rsnapshot again, using example.com/etc as the opti
.RS 4
.SH "FILES"
.IX Header "FILES"
-/etc/rsnapshot.conf
+${SYSCONFDIR}/rsnapshot.conf
.SH "SEE ALSO"
.IX Header "SEE ALSO"
\&\fIrsync\fR\|(1), \fIssh\fR\|(1), \fIlogger\fR\|(1), \fIsshd\fR\|(1), \fIssh\-keygen\fR\|(1), \fIperl\fR\|(1), \fIcp\fR\|(1), \fIdu\fR\|(1), \fIcrontab\fR\|(1)
@@ -988,8 +984,8 @@ Please report bugs (and other comments) to the rsnapsh
\&\fBhttp://lists.sourceforge.net/lists/listinfo/rsnapshot\-discuss\fR
.SH "NOTES"
.IX Header "NOTES"
-Make sure your /etc/rsnapshot.conf file has all elements separated by tabs.
-See /etc/rsnapshot.conf.default for a working example file.
+Make sure your ${SYSCONFDIR}/rsnapshot.conf file has all elements separated by tabs.
+See ${SAMPLES_DIR}/rsnapshot.conf.default for a working example file.
.Sp
Make sure you put a trailing slash on the end of all directory references.
If you don't, you may have extra directories created in your snapshots.
@@ -1005,7 +1001,7 @@ If you would like regular users to be able to restore
there are a number of ways this can be accomplished. One such scenario
would be:
.Sp
-Set \fBsnapshot_root\fR to \fB/.private/.snapshots\fR in \fB/etc/rsnapshot.conf\fR
+Set \fBsnapshot_root\fR to \fB/.private/.snapshots\fR in \fB${SYSCONFDIR}/rsnapshot.conf\fR
.Sp
Set the file permissions on these directories as follows:
.Sp

21
net/rsnapshot/patches/patch-rsnapshot_conf_default_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-rsnapshot_conf_default_in,v 1.3 2008/09/27 11:54:11 ajacoutot Exp $
--- rsnapshot.conf.default.in.orig Sun Apr 27 12:26:16 2008
+++ rsnapshot.conf.default.in Fri Sep 19 15:33:52 2008
@@ -54,7 +54,7 @@ snapshot_root /.snapshots/
$OpenBSD: patch-rsnapshot_conf_default_in,v 1.4 2015/07/03 07:29:58 ajacoutot Exp $
--- rsnapshot.conf.default.in.orig Wed Jul 1 23:19:55 2015
+++ rsnapshot.conf.default.in Fri Jul 3 09:29:28 2015
@@ -50,7 +50,7 @@ snapshot_root /.snapshots/
# Uncomment this to enable remote ssh backups over rsync.
#
@ -10,16 +10,7 @@ $OpenBSD: patch-rsnapshot_conf_default_in,v 1.3 2008/09/27 11:54:11 ajacoutot Ex
# Comment this out to disable syslog support.
#
@@ -132,8 +132,6 @@ lockfile /var/run/rsnapshot.pid
#ssh_args -p 22
# Default arguments for the "du" program (for disk space reporting).
-# The GNU version of "du" is preferred. See the man page for more details.
-# If your version of "du" doesn't support the -h flag, try -k flag instead.
#
#du_args -csh
@@ -164,7 +162,7 @@ lockfile /var/run/rsnapshot.pid
@@ -168,7 +168,7 @@ lockfile /var/run/rsnapshot.pid
# This is the best way to support special files (FIFOs, etc) cross-platform.
# The default is 0 (off).
#
@ -28,7 +19,7 @@ $OpenBSD: patch-rsnapshot_conf_default_in,v 1.3 2008/09/27 11:54:11 ajacoutot Ex
# When sync_first is enabled, it changes the default behaviour of rsnapshot.
# Normally, when rsnapshot is called with its lowest interval
@@ -193,9 +191,9 @@ lockfile /var/run/rsnapshot.pid
@@ -217,9 +217,9 @@ lockfile /var/run/rsnapshot.pid
###############################
# LOCALHOST

4
net/rsnapshot/pkg/PLIST
View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.3 2008/09/27 11:54:11 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2015/07/03 07:29:58 ajacoutot Exp $
bin/rsnapshot
bin/rsnapshot-diff
@man man/man1/rsnapshot-diff.1
@man man/man1/rsnapshot.1
share/examples/rsnapshot/
share/examples/rsnapshot/README
share/examples/rsnapshot/README.md
share/examples/rsnapshot/rsnapshot.conf.default
@sample ${SYSCONFDIR}/rsnapshot.conf
share/examples/rsnapshot/utils/