FreeBSD Bugzilla – Attachment 104775 Details for
Bug 144998
[MAINTAINER] sysutils/rdup: update to 1.1.3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
rdup-1.1.3.diff
rdup-1.1.3.diff (text/plain; charset=us-ascii), 9.45 KB, created by
Charlie Kester
on 2010-03-30 20:51:12 UTC
(
hide
)
Description:
rdup-1.1.3.diff
Filename:
MIME Type:
Creator:
Charlie Kester
Created:
2010-03-30 20:51:12 UTC
Size:
9.45 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-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
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=104775">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 144998
:
104774
| 104775