From c6bde446830f2297fd654b3bcd3e32012accbdbf Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Wed, 9 Mar 2011 11:23:29 +0100 Subject: [PATCH] librsync: integrated debian patchset (see note) Note: - 01-manpage.patch improving/correcting the rdiff(1) and librsync(3) manpage - 02-4gb.patch Fixes problem when transfering >4GB from a 32bit to 64bit host - 03-getopt.patch makes rdiff aware of the -i and -z shortcuts for --gzip and --bzip2 options --- network/librsync/01-manpage.patch | 53 +++++++++++++++++++++++++++++++ network/librsync/02-4gb.patch | 52 ++++++++++++++++++++++++++++++ network/librsync/03-getopt.patch | 35 ++++++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 network/librsync/01-manpage.patch create mode 100644 network/librsync/02-4gb.patch create mode 100644 network/librsync/03-getopt.patch diff --git a/network/librsync/01-manpage.patch b/network/librsync/01-manpage.patch new file mode 100644 index 000000000..10bcc273f --- /dev/null +++ b/network/librsync/01-manpage.patch @@ -0,0 +1,53 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../librsync/01-manpage.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Author: n/a +Descriptioin: Improving manpage. + +diff -Naurp librsync.orig/doc/rdiff.1 librsync/doc/rdiff.1 +--- librsync.orig/doc/rdiff.1 2008-06-20 11:10:01.000000000 +0000 ++++ librsync/doc/rdiff.1 2008-06-20 11:29:58.000000000 +0000 +@@ -29,10 +29,17 @@ rdiff \- compute and apply signature-bas + .PP + \fBrdiff\fP [\fIoptions\fP] \fBpatch\fP \fIbasis-file delta-file new-file\fP + .fi ++.SH USAGE ++You can use \fBrdiff\fP to update files, much like \fBrsync\fP does. ++However, unlike \fBrsync\fP, \fBrdiff\fP puts you in control. There ++are three steps to updating a file: \fBsignature\fP, \fBdelta\fP, and ++\fBpatch\fP. + .SH DESCRIPTION + In every case where a filename must be specified, \- may be used + instead to mean either standard input or standard output as +-appropriate. ++appropriate. Be aware that if you do this, you'll need to terminate your ++\fIoptions\fP with \-\- or \fBrdiff\fP will think you are passing it ++an empty option. + .SH "RETURN VALUE" + 0 for successful completion, 1 for environmental problems (file not + found, invalid options, IO error, etc), 2 for a corrupt file and 3 for +diff -Naurp librsync.orig/doc/librsync.3 librsync/doc/librsync.3 +--- librsync.orig/doc/librsync.3 2008-06-21 14:50:55.000000000 +0200 ++++ librsync/doc/librsync.3 2008-06-24 10:22:49.000000000 +0200 +@@ -53,7 +53,7 @@ scriptable access to rsync functions. + .PP + .I rdiff and librsync Manual + .PP +-\fIhttp://rproxy.sourceforge.net/\fP or \fIhttp://linuxcare.com.au/rproxy/\fP. ++\fIhttp://rproxy.sourceforge.net/\fP. + .PP + \fIdraft-pool-rsync\fP + .SH BUGS diff --git a/network/librsync/02-4gb.patch b/network/librsync/02-4gb.patch new file mode 100644 index 000000000..5f803d2c4 --- /dev/null +++ b/network/librsync/02-4gb.patch @@ -0,0 +1,52 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../librsync/02-4gb.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Author: n/a +Description: + Fixes problem when transfering >4GB from a 32bit to 64bit host + (Closes: #355178). + +diff -Naurp librsync.orig/mdfour.h librsync/mdfour.h +--- librsync.orig/mdfour.h 2008-06-21 14:50:55.000000000 +0200 ++++ librsync/mdfour.h 2008-06-24 10:26:49.000000000 +0200 +@@ -24,7 +24,7 @@ + #include "types.h" + + struct rs_mdfour { +- int A, B, C, D; ++ unsigned int A, B, C, D; + #if HAVE_UINT64 + uint64_t totalN; + #else +diff -Naurp librsync.orig/patch.c librsync/patch.c +--- librsync.orig/patch.c 2008-06-21 14:50:55.000000000 +0200 ++++ librsync/patch.c 2008-06-24 10:26:49.000000000 +0200 +@@ -214,12 +214,12 @@ static rs_result rs_patch_s_copying(rs_j + void *buf, *ptr; + rs_buffers_t *buffs = job->stream; + +- len = job->basis_len; +- + /* copy only as much as will fit in the output buffer, so that we + * don't have to block or store the input. */ +- if (len > buffs->avail_out) ++ if (job->basis_len > buffs->avail_out) + len = buffs->avail_out; ++ else ++ len = job->basis_len; + + if (!len) + return RS_BLOCKED; diff --git a/network/librsync/03-getopt.patch b/network/librsync/03-getopt.patch new file mode 100644 index 000000000..51c18c47f --- /dev/null +++ b/network/librsync/03-getopt.patch @@ -0,0 +1,35 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../librsync/03-getopt.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Author: Daniel Baumann +Description: + Makes rdiff aware of the -i and -z shortcuts for --gzip and --bzip2 options + (Closes: #435894). + +diff -Naurp librsync.orig/rdiff.c librsync/rdiff.c +--- librsync.orig/rdiff.c 2008-07-01 15:29:15.000000000 +0200 ++++ librsync/rdiff.c 2008-07-01 15:25:17.000000000 +0200 +@@ -97,8 +97,8 @@ const struct poptOption opts[] = { + { "sum-size", 'S', POPT_ARG_INT, &strong_len }, + { "statistics", 's', POPT_ARG_NONE, &show_stats }, + { "stats", 0, POPT_ARG_NONE, &show_stats }, +- { "gzip", 0, POPT_ARG_NONE, 0, OPT_GZIP }, +- { "bzip2", 0, POPT_ARG_NONE, 0, OPT_BZIP2 }, ++ { "gzip", 'z', POPT_ARG_NONE, 0, OPT_GZIP }, ++ { "bzip2", 'i', POPT_ARG_NONE, 0, OPT_BZIP2 }, + { "paranoia", 0, POPT_ARG_NONE, &rs_roll_paranoia }, + { 0 } + };