Update to 1.2.9; from Sigfred Haversen <bsdlist@mumak.com>

This commit is contained in:
alek 2006-08-01 12:32:36 +00:00
parent b019a77038
commit ab7a43f99b
8 changed files with 154 additions and 92 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2005/04/11 13:00:08 robert Exp $
# $OpenBSD: Makefile,v 1.3 2006/08/01 12:32:36 alek Exp $
COMMENT= "remote filesystem snapshot utility"
DISTNAME= rsnapshot-1.2.1
DISTNAME= rsnapshot-1.2.9
CATEGORIES= net
HOMEPAGE= http://www.rsnapshot.org/
@ -46,10 +46,15 @@ post-build:
do-install:
${INSTALL_DATA_DIR} ${SAMPLES_DIR}
${INSTALL_DATA_DIR} ${SAMPLES_DIR}/utils
${INSTALL_PROGRAM} ${WRKBUILD}/rsnapshot ${PREFIX}/bin
${INSTALL_DATA_DIR} ${SAMPLES_DIR}/utils/rsnapshotdb
${INSTALL_SCRIPT} ${WRKBUILD}/rsnapshot ${PREFIX}/bin
${INSTALL_MAN} ${WRKBUILD}/rsnapshot.1 ${PREFIX}/man/man1
${INSTALL_DATA} ${WRKBUILD}/rsnapshot.conf.default ${SAMPLES_DIR}
${INSTALL_DATA} ${WRKBUILD}/README ${SAMPLES_DIR}
${INSTALL_DATA} ${WRKSRC}/utils/* ${SAMPLES_DIR}/utils
${INSTALL_DATA} ${WRKSRC}/utils/README ${SAMPLES_DIR}/utils
${INSTALL_DATA} ${WRKSRC}/utils/rsnaptar ${SAMPLES_DIR}/utils
${INSTALL_DATA} ${WRKSRC}/utils/*.pl ${SAMPLES_DIR}/utils
${INSTALL_DATA} ${WRKSRC}/utils/*.sh ${SAMPLES_DIR}/utils
${INSTALL_DATA} ${WRKSRC}/utils/rsnapshotdb/* ${SAMPLES_DIR}/utils/rsnapshotdb
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (rsnapshot-1.2.1.tar.gz) = b126ae490889e5514f4a5d14a1128897
RMD160 (rsnapshot-1.2.1.tar.gz) = 78d365b45c3a7dbe2034d901afe4937b39687946
SHA1 (rsnapshot-1.2.1.tar.gz) = 4e13d6a828012b869fa0709f651e3b11c40d0c91
SIZE (rsnapshot-1.2.1.tar.gz) = 137194
MD5 (rsnapshot-1.2.9.tar.gz) = 68632bc6cdd9c149e0fdeb9e246622d3
RMD160 (rsnapshot-1.2.9.tar.gz) = 8574739936b6e6b802cbf66f0609807e1b60ee11
SHA1 (rsnapshot-1.2.9.tar.gz) = eadf8c68eeba5e75ef84179d54666214ff9e7eb2
SIZE (rsnapshot-1.2.9.tar.gz) = 177971

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-README,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
--- README.orig Wed Feb 2 05:17:47 2005
+++ README Tue Feb 15 19:36:50 2005
@@ -72,13 +72,13 @@ COMPATIBILITY NOTICE (Please read)
$OpenBSD: patch-README,v 1.2 2006/08/01 12:32:36 alek Exp $
--- README.orig Fri Jul 14 18:26:30 2006
+++ README Fri Jul 14 18:29:17 2006
@@ -75,13 +75,13 @@ COMPATIBILITY NOTICES (Please read)
------------------------------------------------------------------------------
Once you have installed rsnapshot, you will need to configure it.
@ -19,3 +19,12 @@ $OpenBSD: patch-README,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
check to make sure everything is ready to go:
rsnapshot configtest
@@ -102,7 +102,7 @@ In the previous example, there will be s
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:

View File

@ -1,19 +1,29 @@
$OpenBSD: patch-configure,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
--- configure.orig Wed Feb 2 05:17:47 2005
+++ configure Tue Feb 15 19:38:14 2005
@@ -3090,7 +3090,7 @@ fi
RSNAPSHOT_SYSCONFDIR=`eval echo ${sysconfdir}`
$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
if test -e "$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"; then
-# 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`
+ RSNAPSHOT_OLD_VERSION=`$PERL rsnapshot -c $RSNAPSHOT_SYSCONFDIR/rsnapshot.conf check-config-version`
# figure out if this is a fresh install or an upgrade
# advise the user accordingly
@@ -3105,15 +3105,6 @@ if test -e "$RSNAPSHOT_SYSCONFDIR/rsnaps
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. |"
-
- # 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 "| |"
@ -23,15 +33,25 @@ $OpenBSD: patch-configure,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
- echo "| |"
- echo "| For more information on the upgrade, read the INSTALL file that came with |"
- echo "| the program. |"
echo "+----------------------------------------------------------------------------+"
exit 0
fi
@@ -3130,13 +3121,4 @@ if test -e "$RSNAPSHOT_SYSCONFDIR/rsnaps
fi
fi
- 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 "Now type \"make install\" to install the program."
- 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
@ -39,4 +59,4 @@ $OpenBSD: patch-configure,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
- echo "$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf.default to $RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"
- echo ""
-fi
-

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-rsnapshot-program_pl,v 1.2 2005/04/11 13:00:08 robert Exp $
--- rsnapshot-program.pl.orig Mon Apr 11 06:23:13 2005
+++ rsnapshot-program.pl Mon Apr 11 06:31:38 2005
@@ -303,7 +303,7 @@ sub find_config_file {
$OpenBSD: patch-rsnapshot-program_pl,v 1.3 2006/08/01 12:32:36 alek Exp $
--- rsnapshot-program.pl.orig Fri Jul 14 18:41:47 2006
+++ rsnapshot-program.pl Fri Jul 14 18:47:25 2006
@@ -355,7 +355,7 @@ sub find_config_file {
# autoconf variables (may have too many slashes)
my $autoconf_sysconfdir = '@sysconfdir@';
my $autoconf_prefix = '@prefix@';
@ -10,7 +10,7 @@ $OpenBSD: patch-rsnapshot-program_pl,v 1.2 2005/04/11 13:00:08 robert Exp $
# consolidate multiple slashes
$autoconf_sysconfdir =~ s/\/+/\//g;
@@ -4489,7 +4489,7 @@ of cron jobs. It is possible, however, t
@@ -5651,7 +5651,7 @@ of cron jobs. It is possible, however, t
with an alternate configuration file.
All important options are specified in a configuration file, which is
@ -19,7 +19,7 @@ $OpenBSD: patch-rsnapshot-program_pl,v 1.2 2005/04/11 13:00:08 robert Exp $
specified on the command line. There are also additional options which
can be passed on the command line.
@@ -4515,12 +4515,12 @@ B<-D> a firehose of diagnostic informati
@@ -5677,12 +5677,12 @@ B<-D> a firehose of diagnostic informati
=head1 CONFIGURATION
@ -36,7 +36,7 @@ $OpenBSD: patch-rsnapshot-program_pl,v 1.2 2005/04/11 13:00:08 robert Exp $
your needs.
Here is a list of allowed parameters:
@@ -4937,7 +4937,7 @@ also want to run it from the command lin
@@ -6164,7 +6164,7 @@ also want to run it from the command lin
a feel for what it's doing.
Here is an example crontab entry, assuming that intervals B<hourly>,
@ -45,7 +45,7 @@ $OpenBSD: patch-rsnapshot-program_pl,v 1.2 2005/04/11 13:00:08 robert Exp $
=over 4
@@ -4973,7 +4973,7 @@ really comes in handy.
@@ -6200,7 +6200,7 @@ really comes in handy.
Remember that these are just the times that the program runs.
To set the number of backups stored, set the B<interval> numbers in
@ -54,7 +54,7 @@ $OpenBSD: patch-rsnapshot-program_pl,v 1.2 2005/04/11 13:00:08 robert Exp $
To check the disk space used by rsnapshot, you can call it with the "du" argument.
@@ -5018,7 +5018,7 @@ B<2> Some warnings occurred, but the ba
@@ -6313,7 +6313,7 @@ B<2> Some warnings occurred, but the ba
=head1 FILES
@ -63,7 +63,7 @@ $OpenBSD: patch-rsnapshot-program_pl,v 1.2 2005/04/11 13:00:08 robert Exp $
=head1 SEE ALSO
@@ -5047,8 +5047,8 @@ B<http://lists.sourceforge.net/lists/lis
@@ -6342,8 +6342,8 @@ B<http://lists.sourceforge.net/lists/lis
=head1 NOTES
@ -74,7 +74,7 @@ $OpenBSD: patch-rsnapshot-program_pl,v 1.2 2005/04/11 13:00:08 robert Exp $
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.
@@ -5064,7 +5064,7 @@ If you would like regular users to be ab
@@ -6359,7 +6359,7 @@ If you would like regular users to be ab
there are a number of ways this can be accomplished. One such scenario
would be:

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-rsnapshot_1,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
--- rsnapshot.1.orig Wed Feb 2 05:17:47 2005
+++ rsnapshot.1 Tue Feb 15 19:41:13 2005
$OpenBSD: patch-rsnapshot_1,v 1.2 2006/08/01 12:32:36 alek Exp $
--- rsnapshot.1.orig Fri Jul 14 18:48:09 2006
+++ rsnapshot.1 Fri Jul 14 18:50:30 2006
@@ -156,7 +156,7 @@ of cron jobs. It is possible, however, t
with an alternate configuration file.
.PP
@ -10,7 +10,7 @@ $OpenBSD: patch-rsnapshot_1,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
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:
@@ -179,12 +179,12 @@ The command line options are as follows:
.RE
.SH "CONFIGURATION"
.IX Header "CONFIGURATION"
@ -22,51 +22,31 @@ $OpenBSD: patch-rsnapshot_1,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
.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
Here is a list of allowed parameters:
.Sp
.RS 4
@@ -408,9 +404,6 @@ Arguments to be passed to ssh. If not sp
.Sp
.RS 4
Arguments to be passed to du. If not specified, the default is \-csh.
-\&\s-1GNU\s0 du supports \-csh, \s-1BSD\s0 du supports \-csk, Solaris du doesn't support
-\&\-c at all. The \s-1GNU\s0 version is recommended, since it offers the most
-features.
.RE
.RE
.RS 4
@@ -614,7 +607,7 @@ also want to run it from the command lin
a feel for what it's doing.
+It is recommended that you copy \fB!!SAMPLES_DIR!!/rsnapshot.conf.default\fR to
+\&\fB!!SYSCONFDIR!!/rsnapshot.conf\fR, and then modify \fB!!SYSCONFDIR!!/rsnapshot.conf\fR to suit
your needs.
.PP
Here is a list of allowed parameters:
@@ -682,7 +682,7 @@ also want to run it from the command lin
a feel for what it's doing.
.Sp
Here is an example crontab entry, assuming that intervals \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
@@ -646,7 +639,7 @@ really comes in handy.
.PP
@@ -718,7 +718,7 @@ really comes in handy.
.Sp
Remember that these are just the times that the program runs.
To set the number of backups stored, set the \fBinterval\fR numbers in
-\&\fB/etc/rsnapshot.conf\fR
+\&\fB!!SYSCONFDIR!!/rsnapshot.conf\fR
.PP
.Sp
To check the disk space used by rsnapshot, you can call it with the \*(L"du\*(R" argument.
.PP
@@ -669,9 +662,6 @@ on a particular file or subdirectory.
\&\fBrsnapshot du localhost/home/\fR
.RE
.PP
-The \s-1GNU\s0 version of \*(L"du\*(R" is preferred. The \s-1BSD\s0 version works well also, but does
-not support the \-h flag (use \-k instead, to see the totals in kilobytes). Other
-versions of \*(L"du\*(R", such as Solaris, may not work at all.
.SH "EXIT VALUES"
.IX Header "EXIT VALUES"
.Sp
@@ -829,7 +829,7 @@ run rsnapshot again, using example.com/e
.RS 4
@@ -683,7 +673,7 @@ versions of \*(L"du\*(R", such as Solari
.RE
.SH "FILES"
.IX Header "FILES"
-/etc/rsnapshot.conf
@ -74,7 +54,7 @@ $OpenBSD: patch-rsnapshot_1,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
.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)
@@ -708,8 +698,8 @@ Please report bugs (and other comments)
@@ -854,8 +854,8 @@ Please report bugs (and other comments)
\&\fBhttp://lists.sourceforge.net/lists/listinfo/rsnapshot\-discuss\fR
.SH "NOTES"
.IX Header "NOTES"
@ -82,15 +62,15 @@ $OpenBSD: patch-rsnapshot_1,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
-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.
.PP
.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.
@@ -725,7 +715,7 @@ If you would like regular users to be ab
@@ -871,7 +871,7 @@ If you would like regular users to be ab
there are a number of ways this can be accomplished. One such scenario
would be:
.PP
.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
.PP
.Sp
Set the file permissions on these directories as follows:
.Sp

View File

@ -1,11 +1,45 @@
$OpenBSD: patch-rsnapshot_conf_default_in,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
--- rsnapshot.conf.default.in.orig Wed Feb 2 05:17:47 2005
+++ rsnapshot.conf.default.in Tue Feb 15 19:29:19 2005
@@ -123,7 +123,6 @@ loglevel 3
$OpenBSD: patch-rsnapshot_conf_default_in,v 1.2 2006/08/01 12:32:36 alek Exp $
--- rsnapshot.conf.default.in.orig Fri Jul 14 18:30:37 2006
+++ rsnapshot.conf.default.in Fri Jul 14 18:35:51 2006
@@ -39,10 +39,6 @@ snapshot_root /.snapshots/
# LINUX USERS: Be sure to uncomment "cmd_cp". This gives you extra features.
# EVERYONE ELSE: Leave "cmd_cp" commented out for compatibility.
#
-# Note: Linux users with gnu cp/coreutils version > 5.3, should leave
-# cmd_cp commented out, since cp fails to create destination directories
-# with a trailing slash for versions 5.3 or later.
-#
# See the README file or the man page for more details.
#
#@CMD_CP@
@@ -136,8 +132,6 @@ loglevel 3
#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
@@ -168,7 +162,7 @@ loglevel 3
# This is the best way to support special files (FIFOs, etc) cross-platform.
# The default is 0 (off).
#
-#link_dest 0
+link_dest 1
# When sync_first is enabled, it changes the default behaviour of rsnapshot.
# Normally, when rsnapshot is called with its lowest interval
@@ -190,9 +184,9 @@ loglevel 3
###############################
# LOCALHOST
-backup /home/ localhost/
-backup /etc/ localhost/
-backup /usr/local/ localhost/
+#backup /home/ localhost/
+#backup /etc/ localhost/
+#backup /usr/local/ localhost/
#backup /var/log/rsnapshot localhost/
#backup /etc/passwd localhost/
#backup /home/foo/My Documents/ localhost/

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/02/21 16:08:06 alek Exp $
@comment $OpenBSD: PLIST,v 1.2 2006/08/01 12:32:36 alek Exp $
bin/rsnapshot
@man man/man1/rsnapshot.1
share/examples/rsnapshot/
@ -14,6 +14,20 @@ share/examples/rsnapshot/utils/backup_rsnapshot_cvsroot.sh
share/examples/rsnapshot/utils/backup_smb_share.sh
share/examples/rsnapshot/utils/debug_moving_files.sh
share/examples/rsnapshot/utils/make_cvs_snapshot.sh
share/examples/rsnapshot/utils/mysqlbackup.pl
share/examples/rsnapshot/utils/random_file_verify.sh
share/examples/rsnapshot/utils/rsnapreport.pl
share/examples/rsnapshot/utils/rsnapshot_if_mounted.sh
share/examples/rsnapshot/utils/rsnapshotdb/
share/examples/rsnapshot/utils/rsnapshotdb/CHANGES.txt
share/examples/rsnapshot/utils/rsnapshotdb/INSTALL.txt
share/examples/rsnapshot/utils/rsnapshotdb/LICENSE.txt
share/examples/rsnapshot/utils/rsnapshotdb/README.txt
share/examples/rsnapshot/utils/rsnapshotdb/TODO.txt
share/examples/rsnapshot/utils/rsnapshotdb/rsnapshotDB.conf.sample
share/examples/rsnapshot/utils/rsnapshotdb/rsnapshotDB.pl
share/examples/rsnapshot/utils/rsnapshotdb/rsnapshotDB.xsd
share/examples/rsnapshot/utils/rsnapshotdb/rsnapshotdb.list
share/examples/rsnapshot/utils/rsnapshotdb/rsnapshotdb.pl
share/examples/rsnapshot/utils/rsnaptar
share/examples/rsnapshot/utils/sign_packages.sh