From corky1951@comcast.net  Wed Mar 24 06:23:39 2010
Return-Path: <corky1951@comcast.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AE7D0106566B
	for <freebsd-gnats-submit@freebsd.org>; Wed, 24 Mar 2010 06:23:39 +0000 (UTC)
	(envelope-from corky1951@comcast.net)
Received: from qmta07.westchester.pa.mail.comcast.net (qmta07.westchester.pa.mail.comcast.net [76.96.62.64])
	by mx1.freebsd.org (Postfix) with ESMTP id 612AF8FC1B
	for <freebsd-gnats-submit@freebsd.org>; Wed, 24 Mar 2010 06:23:38 +0000 (UTC)
Received: from omta09.westchester.pa.mail.comcast.net ([76.96.62.20])
	by qmta07.westchester.pa.mail.comcast.net with comcast
	id wuP41d0010SCNGk57uPfCz; Wed, 24 Mar 2010 06:23:39 +0000
Received: from comcast.net ([98.203.142.76])
	by omta09.westchester.pa.mail.comcast.net with comcast
	id wuPd1d0021f6R9u3VuPdp1; Wed, 24 Mar 2010 06:23:39 +0000
Received: by comcast.net (sSMTP sendmail emulation); Tue, 23 Mar 2010 23:23:36 -0700
Message-Id: <20100324062339.AE7D0106566B@hub.freebsd.org>
Date: Tue, 23 Mar 2010 23:23:36 -0700
From: Charlie Kester <corky1951@comcast.net>
Reply-To: Charlie Kester <corky1951@comcast.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] sysutils/rdup: update to 1.1.3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         144998
>Category:       ports
>Synopsis:       [MAINTAINER] sysutils/rdup: update to 1.1.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 24 06:30:02 UTC 2010
>Closed-Date:    Wed Apr 14 00:42:27 UTC 2010
>Last-Modified:  Wed Apr 14 00:42:27 UTC 2010
>Originator:     Charlie Kester <corky1951@comcast.net>
>Release:        FreeBSD 8.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD atom.local 8.0-STABLE FreeBSD 8.0-STABLE #0: Sun Mar 21 21:26:40 PDT 2010 ckester@atom.local:/usr/obj/usr/src/sys/ATOM i386


>Description:
Update to 1.1.3
This is a bug-fix release addressing the following issues:
* rdup: fix reset atime (-a)
* rdup-simple: add -a (reset atime flag)
* documentation bugfixes

>How-To-Repeat:
>Fix:

Portfiles modified (minor changes only):
- Makefile
- distinfo
- files/patch-GNUmakefile.in
- files/patch-rdup-simple.in

Portfiles added/removed:
- None


--- rdup-1.1.3.diff begins here ---
diff -ruN /usr/ports/sysutils/rdup/Makefile ./rdup/Makefile
--- /usr/ports/sysutils/rdup/Makefile	2010-03-15 00:10:46.000000000 -0700
+++ ./rdup/Makefile	2010-03-23 22:56:24.000000000 -0700
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	rdup
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://miek.nl/projects/rdup/
 
diff -ruN /usr/ports/sysutils/rdup/distinfo ./rdup/distinfo
--- /usr/ports/sysutils/rdup/distinfo	2010-03-15 00:10:46.000000000 -0700
+++ ./rdup/distinfo	2010-03-23 22:41:14.000000000 -0700
@@ -1,3 +1,3 @@
-MD5 (rdup-1.1.2.tar.bz2) = 4e543871c6178d5edc597fcb628a24e7
-SHA256 (rdup-1.1.2.tar.bz2) = d5b2c4e7a4df62909a18ae70c241fb4bf3c405afa369dbd1259efd22eed9b327
-SIZE (rdup-1.1.2.tar.bz2) = 357713
+MD5 (rdup-1.1.3.tar.bz2) = bb6cc5b8a3e5915a91d31f2bb90607ec
+SHA256 (rdup-1.1.3.tar.bz2) = 2e1df6f7bf1a8eaea477e3cb81eada10cfa486206ba02e3d173241b88a08c531
+SIZE (rdup-1.1.3.tar.bz2) = 357994
diff -ruN /usr/ports/sysutils/rdup/files/patch-GNUmakefile.in ./rdup/files/patch-GNUmakefile.in
--- /usr/ports/sysutils/rdup/files/patch-GNUmakefile.in	2010-03-15 00:10:46.000000000 -0700
+++ ./rdup/files/patch-GNUmakefile.in	2010-03-23 22:55:59.000000000 -0700
@@ -1,5 +1,5 @@
---- GNUmakefile.in.orig	2010-03-02 11:04:44.000000000 -0800
-+++ GNUmakefile.in	2010-03-02 11:06:56.000000000 -0800
+--- ./GNUmakefile.in.orig	2010-03-21 10:17:54.000000000 -0700
++++ ./GNUmakefile.in	2010-03-23 22:54:12.000000000 -0700
 @@ -19,7 +19,7 @@
  sbindir=@sbindir@
  mandir=@mandir@
diff -ruN /usr/ports/sysutils/rdup/files/patch-rdup-simple.in ./rdup/files/patch-rdup-simple.in
--- /usr/ports/sysutils/rdup/files/patch-rdup-simple.in	2009-12-02 05:48:23.000000000 -0800
+++ ./rdup/files/patch-rdup-simple.in	2010-03-23 22:55:59.000000000 -0700
@@ -1,6 +1,27 @@
---- sh/rdup-simple.in.orig	2009-10-09 23:37:15.000000000 -0700
-+++ sh/rdup-simple.in	2009-10-09 23:44:36.000000000 -0700
-@@ -41,7 +41,7 @@
+--- ./sh/rdup-simple.in.orig	2010-03-23 22:54:39.000000000 -0700
++++ ./sh/rdup-simple.in	2010-03-23 22:55:39.000000000 -0700
+@@ -27,7 +27,7 @@
+ 
+     LOOKBACK=$1; shift
+     DATESTR='+%Y%m/%d'
+-    TODAY=$(date $DATESTR)
++    TODAY=$(gdate $DATESTR)
+     TOPDIR="$1"
+ 
+     if $dry; then return 1; fi
+@@ -40,9 +40,9 @@
+ 
+     let i=1
+     while [[ $i -le $LOOKBACK ]]; do
+-	    D=$(date $DATESTR --date "$i days ago")
++	    D=$(gdate $DATESTR --date "$i days ago")
+ 	    if [[ -d $TOPDIR/$D ]]; then
+-		if ! cp -plr $TOPDIR/$D/* $TOPDIR/$TODAY; then
++		if ! gcp -plr $TOPDIR/$D/* $TOPDIR/$TODAY; then
+ 		    exit 2
+ 		fi
+ 		exit 0
+@@ -87,7 +87,7 @@
  }
  
  PROGNAME=$0
--- rdup-1.1.3.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: amdmi3 
Responsible-Changed-When: Fri Mar 26 17:00:39 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144998 
State-Changed-From-To: open->feedback 
State-Changed-By: amdmi3 
State-Changed-When: Mon Mar 29 14:36:03 UTC 2010 
State-Changed-Why:  
If you use bash and gdate/gcp, you should depend on shells/bash & 
sysutils/coreutils; much better would be to patch it to work with 
standard bsd utils 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144998 

From: Charlie Kester <corky1951@comcast.net>
To: amdmi3@FreeBSD.org, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/144998: [MAINTAINER] sysutils/rdup: update to 1.1.3
Date: Mon, 29 Mar 2010 09:17:47 -0700

 On Mon 29 Mar 2010 at 07:36:04 PDT amdmi3@FreeBSD.org wrote:
 >Synopsis: [MAINTAINER] sysutils/rdup: update to 1.1.3
 >
 >State-Changed-From-To: open->feedback
 >State-Changed-By: amdmi3
 >State-Changed-When: Mon Mar 29 14:36:03 UTC 2010
 >State-Changed-Why:
 >If you use bash and gdate/gcp, you should depend on shells/bash &
 >sysutils/coreutils; much better would be to patch it to work with
 >standard bsd utils
 >
 >http://www.freebsd.org/cgi/query-pr.cgi?pr=144998
 
 The main part of rdup does not depend on bash or coreutils, and is
 usable without them.
 
 rdup-simple provides an example of how to use rdup, but is not an
 essential component. It uses features of gdate and gcp which would be
 difficult to replicate using the BSD utilities.  It's probably not worth
 the time to try.
 
 Rather than force all rdup users to install bash and coreutils, I'd
 rather add an OPTION to install rdup-simple, and only trigger the bash
 and coreutils dependencies when it is selected.
 
 If you agree that this makes more sense, I'll get to work on revising
 the port.  
 

From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: Charlie Kester <corky1951@comcast.net>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/144998: [MAINTAINER] sysutils/rdup: update to 1.1.3
Date: Mon, 29 Mar 2010 20:40:07 +0400

 * Charlie Kester (corky1951@comcast.net) wrote:
 
 > >Synopsis: [MAINTAINER] sysutils/rdup: update to 1.1.3
 > >
 > >State-Changed-From-To: open->feedback
 > >State-Changed-By: amdmi3
 > >State-Changed-When: Mon Mar 29 14:36:03 UTC 2010
 > >State-Changed-Why:
 > >If you use bash and gdate/gcp, you should depend on shells/bash &
 > >sysutils/coreutils; much better would be to patch it to work with
 > >standard bsd utils
 > >
 > >http://www.freebsd.org/cgi/query-pr.cgi?pr=144998
 > 
 > The main part of rdup does not depend on bash or coreutils, and is
 > usable without them.
 > 
 > rdup-simple provides an example of how to use rdup, but is not an
 > essential component. It uses features of gdate and gcp which would be
 > difficult to replicate using the BSD utilities.  It's probably not worth
 > the time to try.
 > 
 > Rather than force all rdup users to install bash and coreutils, I'd
 > rather add an OPTION to install rdup-simple, and only trigger the bash
 > and coreutils dependencies when it is selected.
 
 That is acceptable. However, please converting the script to use
 system tools - I don't think it would be hard.
 
 For example, the first and the last change from the patch work fine
 with system date; cp should work as well after changing -r to -R.
 Remaining date invocation looks like it can be reworked using -v option
 of our system date.
 
 Also looks that the script can be pretty easily converted to plain sh,
 by replacing [[...]] with [...]. 
 
 If these changes are possible, it'll solve the problem in a clearer way
 not requiring any extra options and/or depends.
 
 -- 
 Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
 amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru

From: Charlie Kester <corky1951@comcast.net>
To: Dmitry Marakasov <amdmi3@amdmi3.ru>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/144998: [MAINTAINER] sysutils/rdup: update to 1.1.3
Date: Mon, 29 Mar 2010 09:54:53 -0700

 On Mon 29 Mar 2010 at 09:40:07 PDT Dmitry Marakasov wrote:
 >However, please converting the script to use system tools - I don't
 >think it would be hard.
 >
 >For example, the first and the last change from the patch work fine
 >with system date; cp should work as well after changing -r to -R.
 >Remaining date invocation looks like it can be reworked using -v option
 >of our system date.
 >
 >Also looks that the script can be pretty easily converted to plain sh,
 >by replacing [[...]] with [...].
 >
 >If these changes are possible, it'll solve the problem in a clearer way
 >not requiring any extra options and/or depends.
 
 OK, I'll take another look at the rdup-simple script.
 
 When I prepared the patch for this PR, I did a global search and replace
 to change date to gdate.  I agree, that picked up some instances where
 gdate is not really needed.
 
 -- Charlie
 
 

From: Charlie Kester <corky1951@comcast.net>
To: bug-followup@FreeBSD.org, amdmi3@FreeBSD.org
Cc: Dmitry Marakasov <amdmi3@amdmi3.ru>, corky1951@comcast.net
Subject: Re: ports/144998: [MAINTAINER] sysutils/rdup: update to 1.1.3
Date: Tue, 30 Mar 2010 12:51:12 -0700

 --xHFwDpU9dbj6ez1V
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Disposition: inline
 
 Attached is a revised diff to upgrade this port to vesion 1.1.3
 
 Per your suggestion, I have converted the rdup-simple script to use
 /bin/sh rather than bash, and have also removed the dependencies on
 coreutils.
 
 While testing the revised script, I discovered a nasty crashing bug in
 rdup-up.  Fixing this requires reverting to mkpath.c from rdup-1.1.1,
 and this is what the new files/patch-mkpath.c does.  (I have reported
 this bug to the upstream author.)
 
 -- Charlie
 
 
 --xHFwDpU9dbj6ez1V
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="rdup-1.1.3.diff"
 
 diff -ruN /usr/ports/sysutils/rdup/Makefile ./rdup/Makefile
 --- /usr/ports/sysutils/rdup/Makefile	2010-03-15 00:10:46.000000000 -0700
 +++ ./rdup/Makefile	2010-03-30 12:25:12.000000000 -0700
 @@ -7,7 +7,7 @@
  #
  
  PORTNAME=	rdup
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.1.3
  CATEGORIES=	sysutils
  MASTER_SITES=	http://miek.nl/projects/rdup/
  
 @@ -39,7 +39,5 @@
  
  MAN7=		rdup-backups.7
  
 -post-patch:
 -	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' ${WRKSRC}/sh/rdup-simple.in
  
  .include <bsd.port.mk>
 diff -ruN /usr/ports/sysutils/rdup/distinfo ./rdup/distinfo
 --- /usr/ports/sysutils/rdup/distinfo	2010-03-15 00:10:46.000000000 -0700
 +++ ./rdup/distinfo	2010-03-23 22:41:14.000000000 -0700
 @@ -1,3 +1,3 @@
 -MD5 (rdup-1.1.2.tar.bz2) = 4e543871c6178d5edc597fcb628a24e7
 -SHA256 (rdup-1.1.2.tar.bz2) = d5b2c4e7a4df62909a18ae70c241fb4bf3c405afa369dbd1259efd22eed9b327
 -SIZE (rdup-1.1.2.tar.bz2) = 357713
 +MD5 (rdup-1.1.3.tar.bz2) = bb6cc5b8a3e5915a91d31f2bb90607ec
 +SHA256 (rdup-1.1.3.tar.bz2) = 2e1df6f7bf1a8eaea477e3cb81eada10cfa486206ba02e3d173241b88a08c531
 +SIZE (rdup-1.1.3.tar.bz2) = 357994
 diff -ruN /usr/ports/sysutils/rdup/files/patch-GNUmakefile.in ./rdup/files/patch-GNUmakefile.in
 --- /usr/ports/sysutils/rdup/files/patch-GNUmakefile.in	2010-03-15 00:10:46.000000000 -0700
 +++ ./rdup/files/patch-GNUmakefile.in	2010-03-30 11:45:50.000000000 -0700
 @@ -1,5 +1,5 @@
 ---- GNUmakefile.in.orig	2010-03-02 11:04:44.000000000 -0800
 -+++ GNUmakefile.in	2010-03-02 11:06:56.000000000 -0800
 +--- ./GNUmakefile.in.orig	2010-03-21 10:17:54.000000000 -0700
 ++++ ./GNUmakefile.in	2010-03-30 11:42:33.000000000 -0700
  @@ -19,7 +19,7 @@
   sbindir=@sbindir@
   mandir=@mandir@
 diff -ruN /usr/ports/sysutils/rdup/files/patch-mkpath.c ./rdup/files/patch-mkpath.c
 --- /usr/ports/sysutils/rdup/files/patch-mkpath.c	1969-12-31 16:00:00.000000000 -0800
 +++ ./rdup/files/patch-mkpath.c	2010-03-30 11:45:50.000000000 -0700
 @@ -0,0 +1,52 @@
 +--- ./mkpath.c.orig	2010-03-30 11:43:00.000000000 -0700
 ++++ ./mkpath.c	2010-03-30 11:44:22.000000000 -0700
 +@@ -14,34 +14,31 @@
 + 
 +         if (strcmp(s, ".") == 0 || strcmp(s, "/") == 0)
 +                 return 0;
 +-
 +-#ifdef DEBUG
 +-	msgd(__func__, __LINE__, _("Path ele '%s\'"), s);
 +-#endif /* DEBUG */
 +  
 +-        path = g_strdup(s);
 +-        q = g_strdup(s);
 ++        if ((path = g_strdup(s)) == NULL)
 ++                return -1;
 ++ 
 ++        if ((q = g_strdup(s)) == NULL)
 ++                return -1;
 +  
 +         if ((r = dirname(q)) == NULL)
 +                 goto out;
 +  
 +-	up = g_strdup(q);
 ++        if ((up = g_strdup(r)) == NULL)
 ++                return -1;
 +  
 +-	if ((mkpath(up, mode) == -1) && (errno != EEXIST)) {
 +-		msgd(__func__, __LINE__, _("Failed or exists '%s\': %s"), up, strerror(errno));
 +-		goto out;
 +-	}
 ++        if ((mkpath(up, mode) == -1) && (errno != EEXIST)) 
 ++                goto out;
 +  
 +-        if ((mkdir(path, mode) == -1) && (errno != EEXIST)) {
 +-		msgd(__func__, __LINE__, _("Failed to create directory '%s\': %s"), path, strerror(errno));
 ++        if ((mkdir(path, mode) == -1) && (errno != EEXIST))
 +                 rv = -1;
 +-	} else {
 ++        else
 +                 rv = 0;
 +-	}
 +  
 + out:
 +-        if (up) g_free(up);
 +-        if (q) g_free(q);
 +-        if (path) g_free(path);
 ++        if (up)
 ++                free(up);
 ++        free(q);
 ++        free(path);
 +         return (rv);
 + }
 diff -ruN /usr/ports/sysutils/rdup/files/patch-rdup-simple.in ./rdup/files/patch-rdup-simple.in
 --- /usr/ports/sysutils/rdup/files/patch-rdup-simple.in	2009-12-02 05:48:23.000000000 -0800
 +++ ./rdup/files/patch-rdup-simple.in	2010-03-30 11:45:50.000000000 -0700
 @@ -1,11 +1,199 @@
 ---- sh/rdup-simple.in.orig	2009-10-09 23:37:15.000000000 -0700
 -+++ sh/rdup-simple.in	2009-10-09 23:44:36.000000000 -0700
 -@@ -41,7 +41,7 @@
 +--- ./sh/rdup-simple.in.orig	2010-03-21 10:17:54.000000000 -0700
 ++++ ./sh/rdup-simple.in	2010-03-30 11:42:33.000000000 -0700
 +@@ -1,16 +1,19 @@
 +-#!/bin/bash
 ++#!/bin/sh
 + 
 + # updates a hardlinked backup
 + # licensed under the GPL version 3
 + # Copyright Miek Gieben, 2007 - 2010
 + # rewritten for rdup-up and rdup-tr
 ++#
 ++# Revised 29 Mar 2010 by corky1951 AT comcast.net
 ++# to use /bin/sh rather than bash
 + 
 + echo2() {
 +     echo "** $PROGNAME: $@" >&2
 + }
 + 
 + version() {
 +-    echo "rdup @PACKAGE_VERSION@"
 ++    echo "@PACKAGE_VERSION@"
   }
   
 - PROGNAME=$0
 --NOW=`date +%Y%m/%d`
 -+NOW=`gdate +%Y%m/%d`
 - DAYS=8
 - ssh=
 - trans=
 + copy_and_link() {
 +@@ -31,23 +34,24 @@
 +     TOPDIR="$1"
 + 
 +     if $dry; then return 1; fi
 +-    [[ -z $TOPDIR ]] && exit 2
 +-    [[ -d $TOPDIR/$TODAY ]] && exit 0
 ++    [ -z "$TOPDIR" ] && exit 2
 ++    [ -d $TOPDIR/$TODAY ] && exit 0
 + 
 +     if ! mkdir -p $TOPDIR/$TODAY; then
 + 	exit 2
 +     fi
 + 
 +-    let i=1
 +-    while [[ $i -le $LOOKBACK ]]; do
 +-	    D=$(date $DATESTR --date "$i days ago")
 +-	    if [[ -d $TOPDIR/$D ]]; then
 +-		if ! cp -plr $TOPDIR/$D/* $TOPDIR/$TODAY; then
 ++    i=1
 ++    while [ $i -le $LOOKBACK ]; do
 ++	    adjust=`printf %dd $i`
 ++	    D=$(date -v-$adjust $DATESTR)
 ++	    if [ -d $TOPDIR/$D ]; then
 ++		if ! cp -plR $TOPDIR/$D/* $TOPDIR/$TODAY; then
 + 		    exit 2
 + 		fi
 + 		exit 0
 + 	    fi
 +-	    let i=i+1
 ++	    i=$((i+1))
 +     done
 +     exit 1
 + }
 +@@ -105,7 +109,7 @@
 +         case $o in
 + 		a) atime=" -a " ;;
 + 		E)
 +-                if [[ -z "$OPTARG" ]]; then
 ++                if [ -z "$OPTARG" ]; then
 +                         echo2 "-E needs an argument"
 +                         exit 1
 +                 fi
 +@@ -116,11 +120,11 @@
 + 		pathtrans="-$o $OPTARG";
 + 		;;
 +                 k)
 +-                if [[ -z "$OPTARG" ]]; then
 ++                if [ -z "$OPTARG" ]; then
 +                         echo2 "-k needs an argument"
 +                         exit 1
 +                 fi
 +-                if [[ ! -r "$OPTARG" ]]; then
 ++                if [ ! -r "$OPTARG" ]; then
 +                         echo2 "Cannot read keyfile \`$OPTARG': failed"
 +                         exit 1
 +                 fi
 +@@ -144,7 +148,7 @@
 + 			exit 1
 + 		fi
 + 		# if there a no key, this will fail
 +-		if [[ $(gpg --list-keys | wc -l) -eq "0" ]]; then
 ++		if [ $(gpg --list-keys | wc -l) -eq "0" ]; then
 + 			echo2 "No gpg keys found"
 + 			exit 1
 + 		fi
 +@@ -163,9 +167,9 @@
 + done
 + shift $((OPTIND - 1))
 + 
 +-if [[ ${1:0:1} == "+" ]]; then
 +-        DAYS=${1:1}
 +-        if [[ $DAYS -lt 1 || $DAYS -gt 99 ]]; then
 ++if [ "${1%${1#?}}" = "+" ]; then
 ++        DAYS=${1#?}
 ++        if [ $DAYS -lt 1 ] || [ $DAYS -gt 99 ]; then
 +                 echo2 "+N needs to be a number [1..99]"
 +                 exit 1
 +         fi
 +@@ -174,7 +178,7 @@
 +         DAYS=8
 + fi
 + 
 +-[[ $# -lt 2 ]] && usage && exit
 ++[ $# -lt 2 ] && usage && exit
 + 
 + if $mcrypt; then
 +     if ! which mcrypt 2>/dev/null 1>&2; then
 +@@ -184,10 +188,10 @@
 + fi
 + 
 + i=1; last=$#; DIRS=
 +-while [[ $i -lt $last ]]; do
 ++while [ $i -lt $last ]; do
 + 	DIRS="$DIRS $1"
 + 	shift
 +-	((i=$i+1))
 ++	i=$((i+1))
 + done
 + # rdup [options] source destination
 + #dest="ssh://elektron.atoom.net/directory"
 +@@ -197,44 +201,44 @@
 + #dest="ssh://miekg@elektron.atoom.net/directory"
 + 
 + dest=$1
 +-if [[ ${dest:0:6} == "ssh://" ]]; then
 +-	rest=${dest/ssh:\/\//}
 ++if [ "${dest%${dest#??????}}" = "ssh://" ]; then
 ++	rest=${dest#ssh://}
 + 	u=${rest%%@*}
 +-	rest=${rest/$u@/}
 ++	rest=${rest#$u@}
 + 	h=`echo $rest | cut -s -f1 -d/`
 +-	BACKUPDIR=${rest/$h/}
 ++	BACKUPDIR=${rest#$h}
 + 
 +-	if [[ -z $u ]]; then
 ++	if [ -z "$u" ]; then
 + 		ssh=" ssh -c blowfish -x $h"
 + 	else
 + 		ssh=" ssh -c blowfish -x $u@$h"
 + 	fi
 + fi
 +-if [[ ${dest:0:7} == "file://" ]]; then
 +-	rest=${dest/file:\/\//}
 ++if [ "${dest%${dest#???????}}" = "file://" ]; then
 ++	rest=${dest#file://}
 + 	BACKUPDIR=$rest
 + fi
 +-[[ ${dest:0:1} == "/" ]] && BACKUPDIR=$dest
 ++[ "${dest%${dest#?}}" = "/" ] && BACKUPDIR=$dest
 + 
 + # no hits above, assume relative filename
 +-[[ -z $BACKUPDIR ]] && BACKUPDIR=$PWD/$dest
 ++[ -z "$BACKUPDIR" ] && BACKUPDIR=$PWD/$dest
 + 
 + $link && copy_and_link $DAYS $BACKUPDIR
 + 
 + # change all / to _ to make a valid filename
 +-STAMP=$etc/timestamp.${HOSTNAME}.${dest//\//_}
 +-LIST=$etc/list.${HOSTNAME}.${dest//\//_}
 ++STAMP=$etc/timestamp.${HOSTNAME}.`echo $dest | tr / _`
 ++LIST=$etc/list.${HOSTNAME}.`echo $dest | tr / _`
 + 
 +-[[ ! -d $etc ]] && mkdir $etc
 ++[ ! -d $etc ] && mkdir $etc
 + 
 + # remote or not
 +-if [[ -z $ssh ]]; then
 ++if [ -z "$ssh" ]; then
 +         pipe="rdup-up$OPT $STRIP -t $BACKUPDIR/$NOW"
 + else
 +         pipe="$ssh rdup-up$OPT $STRIP -t $BACKUPDIR/$NOW"
 + fi
 + # path encryption
 +-if [[ -n $pathtrans ]]; then
 ++if [ -n "$pathtrans" ]; then
 + 	pipe="rdup-tr $pathtrans | $pipe"
 + fi
 + 
 +@@ -242,7 +246,7 @@
 + 
 + if ! $force; then
 + 	# path is set at the top
 +-        if [[ -z $ssh ]]; then
 ++        if [ -z "$ssh" ]; then
 + 		$PROGNAME -L +$DAYS /dev/null $BACKUPDIR
 + #		rdup-ln -l $DAYS $BACKUPDIR
 +                 purpose=$?
 +@@ -269,5 +273,5 @@
 + if $dry; then
 +     echo "${cmd}"
 + else
 +-    eval ${cmd}
 ++    eval "${cmd}"
 + fi
 diff -ruN /usr/ports/sysutils/rdup/pkg-descr ./rdup/pkg-descr
 --- /usr/ports/sysutils/rdup/pkg-descr	2010-03-15 00:10:46.000000000 -0700
 +++ ./rdup/pkg-descr	2010-03-29 13:02:39.000000000 -0700
 @@ -5,8 +5,6 @@
  removed, allowing for correct incremental backups.
  
  An example script named rdup-simple is included to show how to 
 -implement a simple snapshot-style backup strategy.  This bash script requires 
 -GNU date and cp, which are not installed by this FreeBSD port. If you want to 
 -use the script, you should also install the sysutils/coreutils port.
 +implement a simple snapshot-style backup strategy.
  
  WWW: http://miek.nl/projects/rdup
 
 --xHFwDpU9dbj6ez1V--

From: Charlie Kester <corky1951@comcast.net>
To: bug-followup@FreeBSD.org, corky1951@comcast.net, amdmi3@FreeBSD.org
Cc:  
Subject: Re: ports/144998: [MAINTAINER] sysutils/rdup: update to 1.1.3
Date: Mon, 5 Apr 2010 15:58:48 -0700

 Unless you're ready to commit it, you might as well stop work on this
 PR.  The upstream author has just released version 1.1.4, incorporating
 my reversion of mkpath.c and some other bugfixes.
 
 (He also promises less frequent updates in the foreseeable future.)
 
 -- Charlie

From: Charlie Kester <corky1951@comcast.net>
To: bug-followup@FreeBSD.org, amdmi3@FreeBSD.org
Cc: corky1951@comcast.net, Dmitry Marakasov <amdmi3@amdmi3.ru>
Subject: Re: ports/144998: [MAINTAINER] sysutils/rdup: update to 1.1.3
Date: Fri, 9 Apr 2010 10:52:51 -0700

 Please close this PR.  I've submitted another one, 145588, to update
 rdup from version 1.1.2 to 1.1.4.   
 
 (It incorporates the changes you suggested while working on this one.)
 
 
State-Changed-From-To: feedback->closed 
State-Changed-By: amdmi3 
State-Changed-When: Wed Apr 14 00:42:26 UTC 2010 
State-Changed-Why:  
Superceded by ports/145588 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144998 
>Unformatted:
