Hi. This diff updates rsnapshot to the latest stable version. Please test.
Index: Makefile =================================================================== RCS file: /cvs/ports/net/rsnapshot/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- Makefile 15 Sep 2007 22:36:58 -0000 1.4 +++ Makefile 19 Sep 2008 09:33:04 -0000 @@ -2,13 +2,13 @@ COMMENT= remote filesystem snapshot utility -DISTNAME= rsnapshot-1.2.9 -CATEGORIES= net +DISTNAME= rsnapshot-1.3.1 +CATEGORIES= net sysutils HOMEPAGE= http://www.rsnapshot.org/ MAINTAINER= Sigfred Haversen <[EMAIL PROTECTED]> -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -22,36 +22,24 @@ PKG_ARCH= * NO_REGRESS= Yes -SEPARATE_BUILD= concurrent CONFIGURE_STYLE= simple CONFIGURE_ARGS+= --sysconfdir=${SYSCONFDIR} SAMPLES_DIR= ${PREFIX}/share/examples/rsnapshot +SUBST_VARS= SAMPLES_DIR -post-build: - sed 's,!!SAMPLES_DIR!!,${SAMPLES_DIR},g; \ - s,!!SYSCONFDIR!!,${SYSCONFDIR},g' \ - < ${WRKSRC}/rsnapshot.1 \ - > ${WRKBUILD}/rsnapshot.1 - sed 's,!!SAMPLES_DIR!!,${SAMPLES_DIR},g; \ - s,!!SYSCONFDIR!!,${SYSCONFDIR},g' \ - < ${WRKSRC}/README \ - > ${WRKBUILD}/README - mv ${WRKBUILD}/rsnapshot ${WRKBUILD}/rsnapshot.tmp - sed 's,!!SAMPLES_DIR!!,${SAMPLES_DIR},g; \ - s,!!SYSCONFDIR!!,${SYSCONFDIR},g' \ - < ${WRKBUILD}/rsnapshot.tmp \ - > ${WRKBUILD}/rsnapshot +FAKE_FLAGS= sysconfdir=${SAMPLES_DIR} -do-install: - ${INSTALL_DATA_DIR} ${SAMPLES_DIR} +pre-build: + ${SUBST_CMD} ${WRKSRC}/rsnapshot.1 ${WRKSRC}/README \ + ${WRKSRC}/rsnapshot-program.pl + +post-install: ${INSTALL_DATA_DIR} ${SAMPLES_DIR}/utils ${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}/README ${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 ${INSTALL_DATA} ${WRKSRC}/utils/*.pl ${SAMPLES_DIR}/utils ${INSTALL_DATA} ${WRKSRC}/utils/*.sh ${SAMPLES_DIR}/utils Index: distinfo =================================================================== RCS file: /cvs/ports/net/rsnapshot/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 5 Apr 2007 16:20:15 -0000 1.4 +++ distinfo 19 Sep 2008 09:33:04 -0000 @@ -1,5 +1,5 @@ -MD5 (rsnapshot-1.2.9.tar.gz) = aGMrxs3ZwUng/eueJGYi0w== -RMD160 (rsnapshot-1.2.9.tar.gz) = hXRzmTa25rgCy/ZvBgmAfhtg7hE= -SHA1 (rsnapshot-1.2.9.tar.gz) = 6t+MaO66XnXvhBedVGZiFP+efrI= -SHA256 (rsnapshot-1.2.9.tar.gz) = NnsYFZ2VRwtb0OfwCYeviV60SA+hRqb2CcdYe6jAMPI= -SIZE (rsnapshot-1.2.9.tar.gz) = 177971 +MD5 (rsnapshot-1.3.1.tar.gz) = WI+SmV3PYKbqbfjZSgF+fg== +RMD160 (rsnapshot-1.3.1.tar.gz) = lI7lZpxdoHKPYHAH2k1fu8/N2Mc= +SHA1 (rsnapshot-1.3.1.tar.gz) = o6o1YNw4nhsAFVpYaVWFIsSingU= +SHA256 (rsnapshot-1.3.1.tar.gz) = lLbHfkBiiTX0Khkb3Citk7HxMv3kVu527od2Px7dx14= +SIZE (rsnapshot-1.3.1.tar.gz) = 215806 Index: patches/patch-README =================================================================== RCS file: /cvs/ports/net/rsnapshot/patches/patch-README,v retrieving revision 1.2 diff -u -r1.2 patch-README --- patches/patch-README 1 Aug 2006 12:32:36 -0000 1.2 +++ patches/patch-README 19 Sep 2008 09:33:04 -0000 @@ -1,7 +1,7 @@ $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) +--- 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. @@ -19,7 +19,7 @@ check to make sure everything is ready to go: rsnapshot configtest -@@ -102,7 +102,7 @@ In the previous example, there will be s +@@ -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 Index: patches/patch-rsnapshot-program_pl =================================================================== RCS file: /cvs/ports/net/rsnapshot/patches/patch-rsnapshot-program_pl,v retrieving revision 1.3 diff -u -r1.3 patch-rsnapshot-program_pl --- patches/patch-rsnapshot-program_pl 1 Aug 2006 12:32:36 -0000 1.3 +++ patches/patch-rsnapshot-program_pl 19 Sep 2008 09:33:04 -0000 @@ -1,85 +1,85 @@ $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 { +--- rsnapshot-program.pl.orig Fri Sep 19 10:57:14 2008 ++++ rsnapshot-program.pl Fri Sep 19 11:02:01 2008 +@@ -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'; ++ my $default_config_file = '${SYSCONFDIR}/rsnapshot.conf'; # consolidate multiple slashes $autoconf_sysconfdir =~ s/\/+/\//g; -@@ -5651,7 +5651,7 @@ of cron jobs. It is possible, however, t +@@ -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 ++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. -@@ -5677,12 +5677,12 @@ B<-D> a firehose of diagnostic informati +@@ -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> ++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 -+It is recommended that you copy B<!!SAMPLES_DIR!!/rsnapshot.conf.default> to -+B<!!SYSCONFDIR!!/rsnapshot.conf>, and then modify B<!!SYSCONFDIR!!/rsnapshot.conf> to suit - your needs. - - Here is a list of allowed parameters: -@@ -6164,7 +6164,7 @@ also want to run it from the command lin +-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 +@@ -6729,7 +6725,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 intervals B<hourly>, + 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> ++B<daily>, B<weekly> and B<monthly> have been defined in B<${SYSCONFDIR}/rsnapshot.conf> =over 4 -@@ -6200,7 +6200,7 @@ really comes in handy. +@@ -6774,7 +6770,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<interval> numbers in + To set the number of backups stored, set the B<retain> numbers in -B</etc/rsnapshot.conf> -+B<!!SYSCONFDIR!!/rsnapshot.conf> ++B<${SYSCONFDIR}/rsnapshot.conf> To check the disk space used by rsnapshot, you can call it with the "du" argument. -@@ -6313,7 +6313,7 @@ B<2> Some warnings occurred, but the ba +@@ -6887,7 +6883,7 @@ B<2> Some warnings occurred, but the backup still fin =head1 FILES -/etc/rsnapshot.conf -+!!SYSCONFDIR!!/rsnapshot.conf ++${SYSCONFDIR}/rsnapshot.conf =head1 SEE ALSO -@@ -6342,8 +6342,8 @@ B<http://lists.sourceforge.net/lists/lis +@@ -6916,8 +6912,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 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. -@@ -6359,7 +6359,7 @@ If you would like regular users to be ab +@@ -6933,7 +6929,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 B<snapshot_root> to B</.private/.snapshots> in B<${SYSCONFDIR}/rsnapshot.conf> Set the file permissions on these directories as follows: Index: patches/patch-rsnapshot_1 =================================================================== RCS file: /cvs/ports/net/rsnapshot/patches/patch-rsnapshot_1,v retrieving revision 1.2 diff -u -r1.2 patch-rsnapshot_1 --- patches/patch-rsnapshot_1 1 Aug 2006 12:32:36 -0000 1.2 +++ patches/patch-rsnapshot_1 19 Sep 2008 09:33:04 -0000 @@ -1,76 +1,76 @@ $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 +--- 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 ++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,12 +179,12 @@ The command line options are as follows: +@@ -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 ++\&\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 -+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 +-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 intervals \fBhourly\fR, + 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 ++\&\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 -@@ -718,7 +718,7 @@ really comes in handy. +@@ -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 \fBinterval\fR numbers in + To set the number of backups stored, set the \fBretain\fR numbers in -\&\fB/etc/rsnapshot.conf\fR -+\&\fB!!SYSCONFDIR!!/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 -@@ -829,7 +829,7 @@ run rsnapshot again, using example.com/e +@@ -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 ++${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) -@@ -854,8 +854,8 @@ Please report bugs (and other comments) +@@ -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. ++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. -@@ -871,7 +871,7 @@ If you would like regular users to be ab +@@ -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 ++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 Index: patches/patch-rsnapshot_conf_default_in =================================================================== RCS file: /cvs/ports/net/rsnapshot/patches/patch-rsnapshot_conf_default_in,v retrieving revision 1.2 diff -u -r1.2 patch-rsnapshot_conf_default_in --- patches/patch-rsnapshot_conf_default_in 1 Aug 2006 12:32:36 -0000 1.2 +++ patches/patch-rsnapshot_conf_default_in 19 Sep 2008 09:33:04 -0000 @@ -1,18 +1,7 @@ $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. - # - [EMAIL PROTECTED]@ -@@ -136,8 +132,6 @@ loglevel 3 +--- rsnapshot.conf.default.in.orig Fri Sep 19 11:05:55 2008 ++++ rsnapshot.conf.default.in Fri Sep 19 11:07:10 2008 +@@ -132,8 +132,6 @@ lockfile /var/run/rsnapshot.pid #ssh_args -p 22 # Default arguments for the "du" program (for disk space reporting). @@ -21,7 +10,7 @@ # #du_args -csh -@@ -168,7 +162,7 @@ loglevel 3 +@@ -164,7 +162,7 @@ lockfile /var/run/rsnapshot.pid # This is the best way to support special files (FIFOs, etc) cross-platform. # The default is 0 (off). # @@ -30,7 +19,7 @@ # 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 +@@ -193,9 +191,9 @@ lockfile /var/run/rsnapshot.pid ############################### # LOCALHOST Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/rsnapshot/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- pkg/PLIST 1 Aug 2006 12:32:36 -0000 1.2 +++ pkg/PLIST 19 Sep 2008 09:33:04 -0000 @@ -1,5 +1,7 @@ @comment $OpenBSD: PLIST,v 1.2 2006/08/01 12:32:36 alek Exp $ bin/rsnapshot +bin/rsnapshot-diff [EMAIL PROTECTED] man/man1/rsnapshot-diff.1 @man man/man1/rsnapshot.1 share/examples/rsnapshot/ share/examples/rsnapshot/README @@ -14,10 +16,13 @@ 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/mkmakefile.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-copy share/examples/rsnapshot/utils/rsnapshot_if_mounted.sh +share/examples/rsnapshot/utils/rsnapshot_invert.sh share/examples/rsnapshot/utils/rsnapshotdb/ share/examples/rsnapshot/utils/rsnapshotdb/CHANGES.txt share/examples/rsnapshot/utils/rsnapshotdb/INSTALL.txt @@ -27,7 +32,5 @@ 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 -- Antoine
