ports/148198: [MAINTAINER UPDATE] sysutils/rdup: update to 1.1.7
Charlie Kester
corky1951 at comcast.net
Mon Jun 28 01:50:02 UTC 2010
>Number: 148198
>Category: ports
>Synopsis: [MAINTAINER UPDATE] sysutils/rdup: update to 1.1.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 28 01:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Charlie Kester
>Release: FreeBSD 8.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD atom.local 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Sun Jun 27 15:45:04 PDT 2010 root at atom.local:/usr/obj/usr/src/sys/ATOM i386
>Description:
Update to version 1.1.7
This is a minor bugfix release. rdup-up has one new feature: it also creates named pipes (fifos).
>How-To-Repeat:
>Fix:
One file deleted from the port (files/patch-rdup-tr.c) since it provided a bugfix which has now been merged into the upstream sourcecode.
files/patch-sh__rdup-simple.in modified to reflect some changes in upstream code.
Makefile and distinfo modified as usual per version update.
--- rdup-1.1.7.diff begins here ---
diff -ruN /usr/ports/sysutils/rdup/Makefile ./rdup/Makefile
--- /usr/ports/sysutils/rdup/Makefile 2010-04-13 17:42:06.000000000 -0700
+++ ./rdup/Makefile 2010-06-27 17:50:16.000000000 -0700
@@ -7,7 +7,7 @@
#
PORTNAME= rdup
-PORTVERSION= 1.1.4
+PORTVERSION= 1.1.7
CATEGORIES= sysutils
MASTER_SITES= http://miek.nl/projects/rdup/
diff -ruN /usr/ports/sysutils/rdup/distinfo ./rdup/distinfo
--- /usr/ports/sysutils/rdup/distinfo 2010-04-13 17:42:06.000000000 -0700
+++ ./rdup/distinfo 2010-06-27 17:50:16.000000000 -0700
@@ -1,3 +1,3 @@
-MD5 (rdup-1.1.4.tar.bz2) = 295acf3674fe891873a95c4cf608b304
-SHA256 (rdup-1.1.4.tar.bz2) = 94a0b6de4aa5b25ba888347acd424c6b97343ff207a9587fc68fc1e4d5710500
-SIZE (rdup-1.1.4.tar.bz2) = 358160
+MD5 (rdup-1.1.7.tar.bz2) = ce0725bee1decb8e986b49a9130905c0
+SHA256 (rdup-1.1.7.tar.bz2) = 3be61803e898191778d641e2079d2fc3142ae5ade4c7f63105b4ccc14bd42725
+SIZE (rdup-1.1.7.tar.bz2) = 358390
diff -ruN /usr/ports/sysutils/rdup/files/patch-rdup-tr.c ./rdup/files/patch-rdup-tr.c
--- /usr/ports/sysutils/rdup/files/patch-rdup-tr.c 2010-04-13 17:42:07.000000000 -0700
+++ ./rdup/files/patch-rdup-tr.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,12 +0,0 @@
---- ./rdup-tr.c.orig 2010-04-04 13:23:22.000000000 -0700
-+++ ./rdup-tr.c 2010-04-08 20:21:36.000000000 -0700
-@@ -100,7 +100,8 @@
- struct archive_entry *entry;
- struct stat *s;
- struct rdup *rdup_entry = NULL;
-- GSList *hlinks, *hl = NULL;
-+ GSList *hlinks = NULL;
-+ GSList *hl = NULL;
- GHashTable *trhash; /* look up for encrypted/decrypted strs */
-
- delim = '\n';
diff -ruN /usr/ports/sysutils/rdup/files/patch-sh__rdup-simple.in ./rdup/files/patch-sh__rdup-simple.in
--- /usr/ports/sysutils/rdup/files/patch-sh__rdup-simple.in 2010-04-13 17:42:07.000000000 -0700
+++ ./rdup/files/patch-sh__rdup-simple.in 2010-06-27 17:50:30.000000000 -0700
@@ -1,34 +1,23 @@
---- ./sh/rdup-simple.in.orig 2010-04-04 13:23:22.000000000 -0700
-+++ ./sh/rdup-simple.in 2010-04-08 20:34:49.000000000 -0700
+--- ./sh/rdup-simple.in.orig 2010-06-21 05:17:06.000000000 -0700
++++ ./sh/rdup-simple.in 2010-06-27 17:05:46.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# updates a hardlinked backup
# licensed under the GPL version 3
-@@ -31,23 +31,24 @@
- TOPDIR="$1"
-
- if $dry; then exit 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
+@@ -38,16 +38,17 @@
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
+ while [ $i -le $LOOKBACK ]; do
+- D=$(date $DATESTR --date "$i days ago")
+ adjust=$(printf %dd $i)
+ D=$(date -v-$adjust $DATESTR)
-+ if [ -d $TOPDIR/$D ]; then
+ if [ -d $TOPDIR/$D ]; then
+- if ! cp -plr $TOPDIR/$D/* $TOPDIR/$TODAY; then
+ if ! cp -plR $TOPDIR/$D/* $TOPDIR/$TODAY; then
exit 2
fi
@@ -39,77 +28,30 @@
done
exit 1
}
-@@ -86,7 +87,7 @@
- }
-
- PROGNAME=$0
--NOW=`date +%Y%m/%d`
-+NOW=$(date +%Y%m/%d)
- DAYS=8
- OPT_DRY=
- ssh=
-@@ -105,7 +106,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,12 +117,12 @@
- pathtrans="-$o $OPTARG";
- ;;
- k)
-- if [[ -z "$OPTARG" ]]; then
-+ if [ -z "$OPTARG" ]; then
- echo2 "-k needs an argument"
+@@ -121,7 +122,7 @@
exit 1
fi
-- if [[ ! -r "$OPTARG" ]]; then
+ if [ ! -r "$OPTARG" ]; then
- echo2 "Cannot read keyfile \`$OPTARG': failed"
-+ if [ ! -r "$OPTARG" ]; then
+ echo2 "Cannot read keyfile \'$OPTARG': failed"
exit 1
fi
trans="$trans -Pmcrypt,-q,-f,$OPTARG"
-@@ -144,7 +145,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 +164,9 @@
done
shift $((OPTIND - 1))
--if [[ ${1:0:1} == "+" ]]; then
+-if [ "${1:0:1}" = "+" ]; then
- DAYS=${1:1}
-- if [[ $DAYS -lt 1 || $DAYS -gt 99 ]]; then
+- 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 +175,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 +185,10 @@
- fi
-
- i=1; last=$#; DIRS=
--while [[ $i -lt $last ]]; do
-+while [ $i -lt $last ]; do
+@@ -187,7 +188,7 @@
+ while [ $i -lt $last ]; do
DIRS="$DIRS $1"
shift
- ((i=$i+1))
@@ -117,49 +59,45 @@
done
# rdup [options] source destination
#dest="ssh://elektron.atoom.net/directory"
-@@ -197,50 +198,50 @@
+@@ -197,8 +198,8 @@
#dest="ssh://miekg@elektron.atoom.net/directory"
dest=$1
--if [[ ${dest:0:6} == "ssh://" ]]; then
+-if [ ${dest:0:6} = "ssh://" ]; then
- rest=${dest/ssh:\/\//}
+if [ "${dest%${dest#??????}}" = "ssh://" ]; then
+ rest=${dest#ssh://}
u=${rest%%@*}
-- if [[ "$u" == "$rest" ]]; then
-+ if [ "$u" = "$rest" ]; then
- # no @ used, nullify $u
+ if [ "$u" = "$rest" ]; then
+@@ -206,9 +207,9 @@
u=
fi
- rest=${rest/$u@/}
-- h=`echo $rest | cut -s -f1 -d/`
-- BACKUPDIR=${rest/$h/}
+ rest=${rest#$u@}
-+ h=$(echo $rest | cut -s -f1 -d/)
+ h=$(echo $rest | cut -s -f1 -d/)
+- BACKUPDIR=${rest/$h/}
+ BACKUPDIR=${rest#$h}
-- if [[ -z $u ]]; then
-+ if [ -z "$u" ]; then
+ if [ -z "$u" ]; then
ssh=" ssh -c blowfish -x $h"
- else
+@@ -216,11 +217,11 @@
ssh=" ssh -c blowfish -x $u@$h"
fi
fi
--if [[ ${dest:0:7} == "file://" ]]; then
+-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:0:1} = "/" ] && BACKUPDIR=$dest
+[ "${dest%${dest#?}}" = "/" ] && BACKUPDIR=$dest
# no hits above, assume relative filename
--[[ -z $BACKUPDIR ]] && BACKUPDIR=$PWD/$dest
-+[ -z "$BACKUPDIR" ] && BACKUPDIR=$PWD/$dest
-
+ [ -z "$BACKUPDIR" ] && BACKUPDIR=$PWD/$dest
+@@ -228,8 +229,8 @@
$link && copy_and_link $DAYS $BACKUPDIR
# change all / to _ to make a valid filename
@@ -168,28 +106,13 @@
+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 $OPT_DRY $STRIP -t $BACKUPDIR/$NOW"
- else
- pipe="$ssh rdup-up$OPT $OPT_DRY $STRIP -t $BACKUPDIR/$NOW"
- fi
- # path encryption
--if [[ -n $pathtrans ]]; then
-+if [ -n "$pathtrans" ]; then
- pipe="rdup-tr $pathtrans | $pipe"
- fi
-
-@@ -248,7 +249,7 @@
+ [ ! -d $etc ] && mkdir $etc
- if ! $force; then
+@@ -250,6 +251,7 @@
# path is set at the top
-- if [[ -z $ssh ]]; then
-+ if [ -z "$ssh" ]; then
+ if [ -z "$ssh" ]; then
$PROGNAME $OPT_DRY -L +$DAYS /dev/null $BACKUPDIR
- # rdup-ln -l $DAYS $BACKUPDIR
++# rdup-ln -l $DAYS $BACKUPDIR
purpose=$?
+ else
+ # You need to set your path so rdup-simple can be found
--- rdup-1.1.7.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list