FreeBSD Bugzilla – Attachment 105184 Details for
Bug 145588
[MAINTAINER] sysutils/rdup: update to 1.1.4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
rdup-1.1.4.diff
rdup-1.1.4.diff (text/plain), 8.70 KB, created by
Charlie Kester
on 2010-04-09 18:40:05 UTC
(
hide
)
Description:
rdup-1.1.4.diff
Filename:
MIME Type:
Creator:
Charlie Kester
Created:
2010-04-09 18:40:05 UTC
Size:
8.70 KB
patch
obsolete
>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-04-06 20:05:11.000000000 -0700 >@@ -7,7 +7,7 @@ > # > > PORTNAME= rdup >-PORTVERSION= 1.1.2 >+PORTVERSION= 1.1.4 > 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-04-06 20:05:39.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.4.tar.bz2) = 295acf3674fe891873a95c4cf608b304 >+SHA256 (rdup-1.1.4.tar.bz2) = 94a0b6de4aa5b25ba888347acd424c6b97343ff207a9587fc68fc1e4d5710500 >+SIZE (rdup-1.1.4.tar.bz2) = 358160 >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-04-08 20:34: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-04-04 13:23:22.000000000 -0700 >++++ ./GNUmakefile.in 2010-04-08 20:21:36.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 1969-12-31 16:00:00.000000000 -0800 >@@ -1,11 +0,0 @@ >---- 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 @@ >- } >- >- PROGNAME=$0 >--NOW=`date +%Y%m/%d` >-+NOW=`gdate +%Y%m/%d` >- DAYS=8 >- ssh= >- trans= >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 1969-12-31 16:00:00.000000000 -0800 >+++ ./rdup/files/patch-rdup-tr.c 2010-04-08 20:34:59.000000000 -0700 >@@ -0,0 +1,12 @@ >+--- ./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 1969-12-31 16:00:00.000000000 -0800 >+++ ./rdup/files/patch-sh__rdup-simple.in 2010-04-08 20:34:59.000000000 -0700 >@@ -0,0 +1,195 @@ >+--- ./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 >+@@ -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 >+ 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 >+ } >+@@ -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" >+ exit 1 >+ fi >+- 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 >+- 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 +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 >+ DIRS="$DIRS $1" >+ shift >+- ((i=$i+1)) >++ i=$((i+1)) >+ done >+ # rdup [options] source destination >+ #dest="ssh://elektron.atoom.net/directory" >+@@ -197,50 +198,50 @@ >+ #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%%@*} >+ >+- if [[ "$u" == "$rest" ]]; then >++ if [ "$u" = "$rest" ]; then >+ # no @ used, nullify $u >+ 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/) >++ 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 $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 @@ >+ >+ if ! $force; then >+ # path is set at the top >+- if [[ -z $ssh ]]; then >++ if [ -z "$ssh" ]; then >+ $PROGNAME $OPT_DRY -L +$DAYS /dev/null $BACKUPDIR >+ # rdup-ln -l $DAYS $BACKUPDIR >+ purpose=$? >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-04-06 20:03:48.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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 145588
: 105184