Update rsnapshot to 1.2.1. Changes since 1.1.6

Note that config file format has changed, but rsnapshot will detect an
old config and refuse to run until config is updated.

VERSION 1.2.1 (Apr 09 15:10 2005)
------------------------------------------------------------------------------
- Fixed security bug when neither cmd_cp or link_dest are enabled

VERSION 1.2.0 (Jan 31 21:43 2005)
------------------------------------------------------------------------------
- Turned off buffering ($|=1)
- Changed default lockfile to /var/run/rsnapshot.pid, for FHS compliance
- Clarified man page licensing (GPL)
- Fixed is_real_local_abs_path() to handle dangling symlinks
- Changed utils/backup_smb_share.sh to re-order the smbtar arguments
- Added "-uroot" to utils/backup_mysql.sh example file
- Changed regex in is_blank() subroutine
- Changed rsync include/exclude mode to relative
- Peter Palfrader <weasel@debian.org> enhanced error reporting to include
  command line options
- Bharat Mediratta <bharat@menalto.com> improved the exclusion rules to avoid
  backing up the snapshot root. The old way was also kept for users who can't
  or don't want to upgrade their destination paths in their backup points.
- Bharat Mediratta <bharat@menalto.com> added a "+" feature to the per-backup
  point args to allow additive include/exclude rules.
- Added safe_rename() subroutine to work around a semi-obscure timestamp bug
  in certain Linux kernels
- Clarified error message about local/relative paths in config file parsing
- Added check for leading/trailing spaces in remote (ssh) paths
- Added du(1) and crontab(1) to man page references
- Added config.guess and config.sub for automake
- Changed default destination paths for backup points in example config file
  for compatibility with --relative rsync flag
- Added formatting fix to show one slash only when invoking backup_script
  with link_dest option enabled
- Broke backwards compatibility for the benefit of fixing several outstanding
  issues. The default value for rsync_long_args is now different.
- Changed add_lockfile() verbose message to "echo $$ > /path/to/lockfile.pid"
  which is actually what the code is doing
- Added check to make sure backup_scripts can't share destination path with
  backup points
- Added check to make sure different backup_script destinations don't overlap
  and don't clobber backup point destinations
- Added "cmd_du" parameter to allow specifying the path to "du"
- Nicolas Kaiser <nikai@nikai.net> provided various typo fixes in the program
  and man page
- Fixed "missing rsync/configtest ok" bug
- Added config_version parameter, which is now required
- All autoconf files were updated with the ones from Debian sarge
- Added upgrade-config-file feature for "make upgrade" target and manual use
- Added upgrade feature to RPM spec file
- Added check-config-version feature for use with shell scripts, etc.
- Changed version_only argument to version-only, for consistency with new
  options
- Conditionalized configure script to only advise the user to copy the
  rsnapshot.conf.default file to rsnapshot.conf if it's a new installation
- Added rollback feature to restore interval.0 snapshots when using link_dest
- Added second option for du, to compare subdirectories or files
- Added "du_args" to pass arguments to du
- Relaxed cmd line option validation, but only when du is the command
- Now only show command invocation for logger on verbose level 4
- Added rsync cleanup after native_cp_al() to preserve special files
- Removed warning messages from native_cp_al() about special files
- Modified error printing so full run string is displayed once at the top
  of a list of error messages
- Fixed bug in old method of preventing the snapshot root from being backed
  up, which occurred when snapshot root was more than one level down from a
  backup point
- Added commented out du_args to rsnapshot.conf.default.in
- Added descriptive error if "du" fails

3 files changed, 6 insertions, 60 deletions

diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile
index 5e6e4266aba..7414c4acd7a 100644
--- a/sysutils/rsnapshot/Makefile
+++ b/sysutils/rsnapshot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:23 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/09/13 11:47:49 abs Exp $
 #
 
-DISTNAME=	rsnapshot-1.1.6
-PKGREVISION=	1
+DISTNAME=	rsnapshot-1.2.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.rsnapshot.org/downloads/
 
@@ -11,7 +10,6 @@ HOMEPAGE=	http://www.rsnapshot.org/
 COMMENT=	Filesystem snapshot utility
 
 DEPENDS+=	rsync>=2.3.1:../../net/rsync
-DEPENDS+=	p5-Lchown>=0.07:../../sysutils/p5-Lchown
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	perl:run
diff --git a/sysutils/rsnapshot/distinfo b/sysutils/rsnapshot/distinfo
index 7cc1888422f..12284e6e381 100644
--- a/sysutils/rsnapshot/distinfo
+++ b/sysutils/rsnapshot/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:40:57 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/09/13 11:47:49 abs Exp $
 
-SHA1 (rsnapshot-1.1.6.tar.gz) = 6813c68df1ff82df79682c0aaa6012f189c7eeb5
-RMD160 (rsnapshot-1.1.6.tar.gz) = f70681de3ebd0a390ca812299e8be9d71988dbf0
-Size (rsnapshot-1.1.6.tar.gz) = 88871 bytes
-SHA1 (patch-aa) = 54f91858948e46288fe8d47f825e69db3ef56387
+SHA1 (rsnapshot-1.2.1.tar.gz) = 4e13d6a828012b869fa0709f651e3b11c40d0c91
+RMD160 (rsnapshot-1.2.1.tar.gz) = 78d365b45c3a7dbe2034d901afe4937b39687946
+Size (rsnapshot-1.2.1.tar.gz) = 137194 bytes
diff --git a/sysutils/rsnapshot/patches/patch-aa b/sysutils/rsnapshot/patches/patch-aa
deleted file mode 100644
index 9ae67a29b49..00000000000
--- a/sysutils/rsnapshot/patches/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/10/11 09:44:50 kim Exp $
-
---- rsnapshot-program.pl.orig	2004-07-05 19:43:18.000000000 -0400
-+++ rsnapshot-program.pl	2004-10-11 05:13:15.000000000 -0400
-@@ -32,6 +32,7 @@
- use File::Path;			# mkpath(), rmtree()
- use File::stat;			# stat(), lstat()
- use POSIX qw(locale_h);	# setlocale()
-+use Lchown qw(lchown LCHOWN_AVAILABLE);
- 
- ########################################
- ###     DECLARE GLOBAL VARIABLES     ###
-@@ -2934,7 +2935,11 @@
- 			}
- 		}
- 		
--		$result = chown($st->uid, $st->gid, "$dest");
-+		if (Lchown::LCHOWN_AVAILABLE) {
-+		    $result = lchown($st->uid, $st->gid, "$dest");
-+		} else {
-+		    $result = chown($st->uid, $st->gid, "$dest");
-+		}
- 		if (! $result)	{
- 			print_err("Warning! Could not chown(" . $st->uid . ", " . $st->gid . ", \"$dest\");", 2);
- 			return(0);
-@@ -3284,7 +3289,11 @@
- 	
- 	# CHOWN DEST (if root)
- 	if (0 == $<)	{
--		$result = chown($st->uid, $st->gid, "$dest");
-+		if (Lchown::LCHOWN_AVAILABLE) {
-+		    $result = lchown($st->uid, $st->gid, "$dest");
-+		} else {
-+		    $result = chown($st->uid, $st->gid, "$dest");
-+		}
- 		if (! $result)	{
- 			print_err("Warning! Could not chown(" . $st->uid . ", " . $st->gid . ", \"$dest\");", 2);
- 			return(0);
-@@ -3513,7 +3522,11 @@
- 				}
- 			}
- 			
--			$result = chown($st->uid, $st->gid, "$dest");
-+			if (Lchown::LCHOWN_AVAILABLE) {
-+			    $result = lchown($st->uid, $st->gid, "$dest");
-+			} else {
-+			    $result = chown($st->uid, $st->gid, "$dest");
-+			}
- 			
- 			if (! $result)	{
- 				print_err("Warning! Could not chown(" . $st->uid . ", " . $st->gid . ", \"$dest\")", 2);