Hello, Here is a diff that updates rsnapshot 1.2.9 to 1.3.0. Tested on i386.
I sent this to the maintainer a week ago but, as of yet, got no reaction... Kind regards, Björn Ketelaas
diff -ruN rsnapshot.orig/Makefile rsnapshot/Makefile --- rsnapshot.orig/Makefile Sun Sep 16 00:36:58 2007 +++ rsnapshot/Makefile Fri Jun 6 20:41:03 2008 @@ -2,7 +2,7 @@ COMMENT= remote filesystem snapshot utility -DISTNAME= rsnapshot-1.2.9 +DISTNAME= rsnapshot-1.3.0 CATEGORIES= net HOMEPAGE= http://www.rsnapshot.org/ @@ -17,7 +17,8 @@ MASTER_SITES= http://www.rsnapshot.org/downloads/ BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::net/rsync +RUN_DEPENDS= ::net/rsync \ + ::devel/p5-Lchown PKG_ARCH= * NO_REGRESS= Yes @@ -48,6 +49,7 @@ ${INSTALL_DATA_DIR} ${SAMPLES_DIR}/utils ${INSTALL_DATA_DIR} ${SAMPLES_DIR}/utils/rsnapshotdb ${INSTALL_SCRIPT} ${WRKBUILD}/rsnapshot ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKBUILD}/rsnapshot-diff ${PREFIX}/bin ${INSTALL_MAN} ${WRKBUILD}/rsnapshot.1 ${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKBUILD}/rsnapshot.conf.default ${SAMPLES_DIR} ${INSTALL_DATA} ${WRKBUILD}/README ${SAMPLES_DIR} diff -ruN rsnapshot.orig/distinfo rsnapshot/distinfo --- rsnapshot.orig/distinfo Thu Apr 5 18:20:15 2007 +++ rsnapshot/distinfo Mon Jun 2 19:40:45 2008 @@ -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.0.tar.gz) = hIdRRRfnj+HNEUPKZ8tLYg== +RMD160 (rsnapshot-1.3.0.tar.gz) = UAXIvurkgCD3lREo+aYdqL3ptuo= +SHA1 (rsnapshot-1.3.0.tar.gz) = sFyDMqppNVk4n44rhwBWbCs/lu4= +SHA256 (rsnapshot-1.3.0.tar.gz) = P8GiwERPH6S8UQznEDLbT8kCUYDqSsZI20iNU5kv46Y= +SIZE (rsnapshot-1.3.0.tar.gz) = 195862 diff -ruN rsnapshot.orig/patches/patch-README rsnapshot/patches/patch-README --- rsnapshot.orig/patches/patch-README Tue Aug 1 14:32:36 2006 +++ rsnapshot/patches/patch-README Mon Jun 2 20:28:53 2008 @@ -1,7 +1,6 @@ -$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 Oct 8 07:24:04 2006 ++++ README Mon Jun 2 20:12:48 2008 +@@ -70,13 +70,13 @@ ------------------------------------------------------------------------------ Once you have installed rsnapshot, you will need to configure it. @@ -19,7 +18,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 @@ 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 diff -ruN rsnapshot.orig/patches/patch-configure rsnapshot/patches/patch-configure --- rsnapshot.orig/patches/patch-configure Tue Aug 1 14:32:36 2006 +++ rsnapshot/patches/patch-configure Mon Jun 2 20:29:50 2008 @@ -1,10 +1,12 @@ -$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 - - +--- configure.orig Sun Oct 8 07:41:54 2006 ++++ configure Mon Jun 2 20:10:41 2008 +@@ -3292,61 +3292,4 @@ + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +-fi +- +- -# this is kludgy, but it works -RSNAPSHOT_SYSCONFDIR=`eval echo ${sysconfdir}` - @@ -60,3 +62,5 @@ - echo "" -fi - ++fi +\ No newline at end of file diff -ruN rsnapshot.orig/patches/patch-rsnapshot-program.pl rsnapshot/patches/patch-rsnapshot-program.pl --- rsnapshot.orig/patches/patch-rsnapshot-program.pl Thu Jan 1 01:00:00 1970 +++ rsnapshot/patches/patch-rsnapshot-program.pl Mon Jun 2 20:30:23 2008 @@ -0,0 +1,183 @@ +--- rsnapshot-program.pl.orig Sat Oct 21 08:12:30 2006 ++++ rsnapshot-program.pl Mon Jun 2 20:23:53 2008 +@@ -325,7 +325,7 @@ + diff - Front-end interface to the rsnapshot-diff program. + Accepts two optional arguments which can be either + filesystem paths or interval directories within the +- snapshot_root (e.g., /etc/ daily.0/etc/). The default ++ snapshot_root (e.g., !!SYSCONFDIR!!/ daily.0!!SYSCONFDIR!!/). The default + is to compare the two most recent snapshots. + du - Show disk usage in the snapshot_root. + Accepts an optional destination path for comparison +@@ -363,7 +363,7 @@ + # 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; +@@ -375,7 +375,7 @@ + + # if --sysconfdir was not set explicitly during ./configure, but we did use autoconf + if ($autoconf_sysconfdir eq '${prefix}/etc') { +- $default_config_file = "$autoconf_prefix/etc/rsnapshot.conf"; ++ $default_config_file = "$autoconf_prefix!!SYSCONFDIR!!/rsnapshot.conf"; + + # if --sysconfdir was set explicitly at ./configure, overriding the --prefix setting + } elsif ($autoconf_sysconfdir ne ('@' . 'sysconfdir' . '@')) { +@@ -891,7 +891,7 @@ + # + # in the old way, when rsnapshot detects the snapshot_root is under a backup point, the files and + # directories under that backup point are enumerated and get turned into several distinct rsync calls. +- # for example, if you tried to back up "/", it would do a separate rsync invocation for "/bin/", "/etc/", ++ # for example, if you tried to back up "/", it would do a separate rsync invocation for "/bin/", "!!SYSCONFDIR!!/", + # and so on. this wouldn't be so bad except that it makes certain rsync options like one_fs and the + # include/exclude rules act funny since rsync isn't starting where the user expects (and there is no + # really good way to provide a workaround, either automatically or manually). however, changing this +@@ -5731,7 +5731,7 @@ + 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. + +@@ -5757,12 +5757,12 @@ + + =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 ++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: +@@ -6097,9 +6097,9 @@ + + =back + +-B<backup> /etc/ localhost/ ++B<backup> !!SYSCONFDIR!!/ localhost/ + +-B<backup> [EMAIL PROTECTED]:/etc/ example.com/ ++B<backup> [EMAIL PROTECTED]:!!SYSCONFDIR!!/ example.com/ + + B<backup> rsync://example.com/path2/ example.com/ + +@@ -6111,11 +6111,11 @@ + + Examples: + +-B<backup /etc/ localhost/> ++B<backup !!SYSCONFDIR!!/ localhost/> + + =over 4 + +-Backs up /etc/ to <snapshot_root>/<interval>.0/localhost/etc/ using rsync on ++Backs up !!SYSCONFDIR!!/ to <snapshot_root>/<interval>.0/localhost!!SYSCONFDIR!!/ using rsync on + the local filesystem + + =back +@@ -6129,11 +6129,11 @@ + + =back + +-B<backup [EMAIL PROTECTED]:/etc/ example.com/> ++B<backup [EMAIL PROTECTED]:!!SYSCONFDIR!!/ example.com/> + + =over 4 + +-Backs up [EMAIL PROTECTED]:/etc/ to <snapshot_root>/<interval>.0/example.com/etc/ ++Backs up [EMAIL PROTECTED]:!!SYSCONFDIR!!/ to <snapshot_root>/<interval>.0/example.com!!SYSCONFDIR!!/ + using rsync over ssh + + =back +@@ -6233,11 +6233,11 @@ + interval weekly 7 + interval monthly 3 + +- backup /etc/ localhost/ ++ backup !!SYSCONFDIR!!/ localhost/ + backup /home/ localhost/ + backup_script /usr/local/bin/backup_mysql.sh mysql_backup/ + +- backup [EMAIL PROTECTED]:/etc/ foo.com/ ++ backup [EMAIL PROTECTED]:!!SYSCONFDIR!!/ foo.com/ + backup [EMAIL PROTECTED]:/home/ foo.com/ + backup [EMAIL PROTECTED]:/home/ mail.foo.com/ + backup rsync://example.com/pub/ example.com/pub/ +@@ -6257,7 +6257,7 @@ + a feel for what it's doing. + + Here is an example crontab entry, assuming that intervals 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 + +@@ -6302,7 +6302,7 @@ + + Remember that these are just the times that the program runs. + To set the number of backups stored, set the B<interval> 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. + +@@ -6396,7 +6396,7 @@ + + This command will only sync the files that normally get backed up into example.com. + It will NOT get any other backup points with slightly different values (like +-example.com/etc/, for example). In order to sync example.com/etc, you would need to ++example.com!!SYSCONFDIR!!/, for example). In order to sync example.com/etc, you would need to + run rsnapshot again, using example.com/etc as the optional parameter. + + =back +@@ -6415,7 +6415,7 @@ + + =head1 FILES + +-/etc/rsnapshot.conf ++!!SYSCONFDIR!!/rsnapshot.conf + + =head1 SEE ALSO + +@@ -6444,8 +6444,8 @@ + + =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. +@@ -6461,7 +6461,7 @@ + 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: + +@@ -6508,7 +6508,7 @@ + this option, restoring backups for multiple heterogeneous servers would + be unmanageable. If you are archiving snapshots with GNU tar, you may + want to use the --numeric-owner parameter. Also, keep a copy of the +-archived system's /etc/passwd and /etc/group files handy for the UID/GID ++archived system's !!SYSCONFDIR!!/passwd and !!SYSCONFDIR!!/group files handy for the UID/GID + to name mapping. + + If you remove backup points in the config file, the previously archived diff -ruN rsnapshot.orig/patches/patch-rsnapshot-program_pl rsnapshot/patches/patch-rsnapshot-program_pl --- rsnapshot.orig/patches/patch-rsnapshot-program_pl Tue Aug 1 14:32:36 2006 +++ rsnapshot/patches/patch-rsnapshot-program_pl Thu Jan 1 01:00:00 1970 @@ -1,85 +0,0 @@ -$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@'; -- my $default_config_file = '/etc/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 - 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. - -@@ -5677,12 +5677,12 @@ B<-D> a firehose of diagnostic informati - - =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 -+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 - a feel for what it's doing. - - Here is an example crontab entry, assuming that intervals 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 - -@@ -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 --B</etc/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 - - =head1 FILES - --/etc/rsnapshot.conf -+!!SYSCONFDIR!!/rsnapshot.conf - - =head1 SEE ALSO - -@@ -6342,8 +6342,8 @@ B<http://lists.sourceforge.net/lists/lis - - =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. -@@ -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: - --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: - diff -ruN rsnapshot.orig/patches/patch-rsnapshot.1 rsnapshot/patches/patch-rsnapshot.1 --- rsnapshot.orig/patches/patch-rsnapshot.1 Thu Jan 1 01:00:00 1970 +++ rsnapshot/patches/patch-rsnapshot.1 Mon Jun 2 20:36:41 2008 @@ -0,0 +1,147 @@ +--- rsnapshot.1.orig Sat Oct 21 08:23:30 2006 ++++ rsnapshot.1 Mon Jun 2 20:22:11 2008 +@@ -156,7 +156,7 @@ + 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,12 +179,12 @@ + .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 ++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: +@@ -524,9 +524,9 @@ + .RE + .RS 4 + .Sp +-\&\fBbackup\fR /etc/ localhost/ ++\&\fBbackup\fR !!SYSCONFDIR!!/ localhost/ + .Sp +-\&\fBbackup\fR [EMAIL PROTECTED]:/etc/ example.com/ ++\&\fBbackup\fR [EMAIL PROTECTED]:!!SYSCONFDIR!!/ example.com/ + .Sp + \&\fBbackup\fR rsync://example.com/path2/ example.com/ + .Sp +@@ -537,10 +537,10 @@ + .RS 4 + Examples: + .Sp +-\&\fBbackup /etc/ localhost/\fR ++\&\fBbackup !!SYSCONFDIR!!/ localhost/\fR + .Sp + .RS 4 +-Backs up /etc/ to <snapshot_root>/<interval>.0/localhost/etc/ using rsync on ++Backs up !!SYSCONFDIR!!/ to <snapshot_root>/<interval>.0/localhost!!SYSCONFDIR!!/ using rsync on + the local filesystem + .RE + .RE +@@ -555,10 +555,10 @@ + .RE + .RS 4 + .Sp +-\&\fBbackup [EMAIL PROTECTED]:/etc/ example.com/\fR ++\&\fBbackup [EMAIL PROTECTED]:!!SYSCONFDIR!!/ example.com/\fR + .Sp + .RS 4 +-Backs up [EMAIL PROTECTED]:/etc/ to <snapshot_root>/<interval>.0/example.com/etc/ ++Backs up [EMAIL PROTECTED]:!!SYSCONFDIR!!/ to <snapshot_root>/<interval>.0/example.com!!SYSCONFDIR!!/ + using rsync over ssh + .RE + .RE +@@ -669,13 +669,13 @@ + .Ve + .Sp + .Vb 3 +-\& backup /etc/ localhost/ ++\& backup !!SYSCONFDIR!!/ localhost/ + \& backup /home/ localhost/ + \& backup_script /usr/local/bin/backup_mysql.sh mysql_backup/ + .Ve + .Sp + .Vb 4 +-\& backup [EMAIL PROTECTED]:/etc/ foo.com/ ++\& backup [EMAIL PROTECTED]:!!SYSCONFDIR!!/ foo.com/ + \& backup [EMAIL PROTECTED]:/home/ foo.com/ + \& backup [EMAIL PROTECTED]:/home/ mail.foo.com/ + \& backup rsync://example.com/pub/ example.com/pub/ +@@ -695,7 +695,7 @@ + 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 +@@ -740,7 +740,7 @@ + .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 + .Sp + To check the disk space used by rsnapshot, you can call it with the \*(L"du\*(R" argument. + .Sp +@@ -833,7 +833,7 @@ + .Sp + This command will only sync the files that normally get backed up into example.com. + It will \s-1NOT\s0 get any other backup points with slightly different values (like +-example.com/etc/, for example). In order to sync example.com/etc, you would need to ++example.com!!SYSCONFDIR!!/, for example). In order to sync example.com/etc, you would need to + run rsnapshot again, using example.com/etc as the optional parameter. + .RE + .RE +@@ -851,7 +851,7 @@ + .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) +@@ -876,8 +876,8 @@ + \&\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. +@@ -893,7 +893,7 @@ + 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 +@@ -940,7 +940,7 @@ + this option, restoring backups for multiple heterogeneous servers would + be unmanageable. If you are archiving snapshots with \s-1GNU\s0 tar, you may + want to use the \-\-numeric\-owner parameter. Also, keep a copy of the +-archived system's /etc/passwd and /etc/group files handy for the \s-1UID/GID\s0 ++archived system's !!SYSCONFDIR!!/passwd and !!SYSCONFDIR!!/group files handy for the \s-1UID/GID\s0 + to name mapping. + .Sp + If you remove backup points in the config file, the previously archived diff -ruN rsnapshot.orig/patches/patch-rsnapshot.conf.default.in rsnapshot/patches/patch-rsnapshot.conf.default.in --- rsnapshot.orig/patches/patch-rsnapshot.conf.default.in Thu Jan 1 01:00:00 1970 +++ rsnapshot/patches/patch-rsnapshot.conf.default.in Mon Jun 2 20:31:19 2008 @@ -0,0 +1,33 @@ +--- rsnapshot.conf.default.in.orig Wed Jun 14 07:48:02 2006 ++++ rsnapshot.conf.default.in Mon Jun 2 20:16:39 2008 +@@ -132,8 +132,6 @@ + #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 @@ + # 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 +@@ -186,9 +184,9 @@ + ############################### + + # 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/ diff -ruN rsnapshot.orig/patches/patch-rsnapshot_1 rsnapshot/patches/patch-rsnapshot_1 --- rsnapshot.orig/patches/patch-rsnapshot_1 Tue Aug 1 14:32:36 2006 +++ rsnapshot/patches/patch-rsnapshot_1 Thu Jan 1 01:00:00 1970 @@ -1,76 +0,0 @@ -$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 - 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,12 +179,12 @@ 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 -+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 -@@ -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 - .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 - .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) -@@ -854,8 +854,8 @@ Please report bugs (and other comments) - \&\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. -@@ -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: - .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 diff -ruN rsnapshot.orig/patches/patch-rsnapshot_conf_default_in rsnapshot/patches/patch-rsnapshot_conf_default_in --- rsnapshot.orig/patches/patch-rsnapshot_conf_default_in Tue Aug 1 14:32:36 2006 +++ rsnapshot/patches/patch-rsnapshot_conf_default_in Thu Jan 1 01:00:00 1970 @@ -1,45 +0,0 @@ -$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 - #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/ diff -ruN rsnapshot.orig/pkg/PLIST rsnapshot/pkg/PLIST --- rsnapshot.orig/pkg/PLIST Tue Aug 1 14:32:36 2006 +++ rsnapshot/pkg/PLIST Mon Jun 2 19:54:13 2008 @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.2 2006/08/01 12:32:36 alek Exp $ bin/rsnapshot +bin/rsnapshot-diff @man man/man1/rsnapshot.1 share/examples/rsnapshot/ share/examples/rsnapshot/README @@ -27,7 +28,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
