debian/0000755000000000000000000000000012164606434007174 5ustar debian/changelog0000644000000000000000000001546612163111601011044 0ustar librsync (0.9.7-10) unstable; urgency=low * Fix tests with new automake (Closes: #713443). * Do not overwrite LDFLAGS from dpkg-buildflags. * Add debian/watch. * Make the debug subpackage Multi-Arch: same. * Use canonical URLs in Vcs-*. * Remove the dependency on -dev from -dbg. * Bump Standards-Version to 3.9.4. -- Andrey Rahmatullin Thu, 27 Jun 2013 00:38:54 +0600 librsync (0.9.7-9) unstable; urgency=low * Switch to debhelper v9. * Use dh_autoreconf --as-needed instead of autotools-dev to fix rpath build issue with the multiarch path and reduce librsync1 deps. * Fix a format-security warning. * Fix an implicit-function-declaration warning in the test suite. * Set Multi-Arch: same for librsync1. -- Andrey Rahmatullin Sun, 05 Feb 2012 14:56:17 +0600 librsync (0.9.7-8) unstable; urgency=low * Adopt the package (Closes: #543849). * Bump Standards-Version to 3.9.2 (no change needed). * Change source format to 3.0 (quilt). * Use autotools_dev debhelper addon instead of manual file copying. * Enable -Wl,--as-needed. * Remove unused compression-related rdiff options (Closes: #608470). * Do not build and install the static library. * Do not install librsync.la (Closes: #622495) -- Andrey Rahmatullin Wed, 13 Apr 2011 12:37:41 +0600 librsync (0.9.7-7) unstable; urgency=low * Updating package to standards version 3.8.3. * Removing vcs fields. * Orphaning package. -- Daniel Baumann Thu, 27 Aug 2009 07:58:27 +0200 librsync (0.9.7-6) unstable; urgency=low * Updating vcs fields in control file. * Replacing obsolete dh_clean -k with dh_prep. * Updating section of the debug package. * Using correct rfc-2822 date formats in changelog. * Wrapping build-depends. * Updating to standards version 3.8.2. * Adding misc depends. * Updating section of the source package. * Updating year in copyright file. * Using quilt rather than dpatch. * Minimizing rules file. -- Daniel Baumann Sun, 02 Aug 2009 18:41:09 +0200 librsync (0.9.7-5) unstable; urgency=medium * Adding patch to make rdiff aware of -i and -z (Closes: #435894). -- Daniel Baumann Tue, 01 Jul 2008 15:33:00 +0200 librsync (0.9.7-4) unstable; urgency=high * Adding patch from upstream to fix problem when transfering >4GB from a 32bit to 64bit host (Closes: #355178). * Updating manpage patch to remove dead link to Linuxcare Australia (Closes: #288758). -- Daniel Baumann Tue, 24 Jun 2008 10:29:00 +0200 librsync (0.9.7-3) unstable; urgency=medium * Adding debug package. -- Daniel Baumann Fri, 20 Jun 2008 13:59:00 +0200 librsync (0.9.7-2) unstable; urgency=low * New maintainer (Closes: #487131). * Redone debian packaging from scratch. -- Daniel Baumann Fri, 20 Jun 2008 13:14:00 +0200 librsync (0.9.7-1) unstable; urgency=low * New upstream release. - Large files are now supported. (Closes: Bug#277032) * Fix description of librsync1. (Closes: Bug#230839) * Describe how to use rdiff. (Closes: Bug#228005, Bug#156457) * Trust upstream's autoconfiscation. -- Simon Law Sun, 28 Nov 2004 18:54:00 -0500 librsync (0.9.6-13) unstable; urgency=high * Fix FTBFS with a patch from Steinar H. Gunderston. (Closes: Bug#262463) -- Simon Law Sat, 28 Aug 2004 11:48:05 -0400 librsync (0.9.6-12) unstable; urgency=low * librsync-dev should be in libdevel -- Simon Law Fri, 30 Jul 2004 20:19:20 -0400 librsync (0.9.6-11) unstable; urgency=low * New Maintainer. (Closes: Bug#261580) -- Simon Law Fri, 30 Jul 2004 09:21:47 -0400 librsync (0.9.6-10) unstable; urgency=low * Orphaning this package. -- John Goerzen Mon, 26 Jul 2004 14:58:38 -0500 librsync (0.9.6-9) unstable; urgency=low * Made autoconf build-dep versioned. Closes: #252959. -- John Goerzen Mon, 26 Jul 2004 09:09:45 -0500 librsync (0.9.6-8) unstable; urgency=low * Try using just autoconf now, and drop the other build-deps. Was still seeing some errors after -7. -- John Goerzen Tue, 21 Oct 2003 16:41:41 -0500 librsync (0.9.6-7) unstable; urgency=low * Added build-dep on libbz2-dev. * Add -a to many debhelper calls. * Tightened dh_makeshlibs call in debian/rules. -- John Goerzen Sat, 11 Oct 2003 22:59:25 -0500 librsync (0.9.6-6) unstable; urgency=low * Backed out calls to aclocal, autoconf, automake since they somehow caused files to be generated without the .so extension sometimes. Closes: #215289. -- John Goerzen Sat, 11 Oct 2003 22:47:28 -0500 librsync (0.9.6-5) unstable; urgency=low * Fixed clean target so that the Debian diff doesn't have so much junk. * Update build-deps on autoconf and automake. -- John Goerzen Fri, 10 Oct 2003 22:31:53 -0500 librsync (0.9.6-4) unstable; urgency=low * Extended description for dev package. Closes: #210136. * configure target runs aclocal, preventing errors. -- John Goerzen Thu, 09 Oct 2003 16:58:23 -0500 librsync (0.9.6-3) unstable; urgency=low * Add CFLAGS=-D_LARGEFILE_SOURCE to configure command line per suggestion from upstream to fix tests on hppa. Closes: #207457. -- John Goerzen Fri, 29 Aug 2003 08:20:02 -0500 librsync (0.9.6-2) unstable; urgency=low * Manually install the rdiff bin because it wasn't anymore. Closes: #205469. * Fixed description. Closes: #191658. -- John Goerzen Mon, 18 Aug 2003 11:25:03 -0500 librsync (0.9.6-1) unstable; urgency=low * New upstream release -- John Goerzen Mon, 11 Aug 2003 17:36:26 -0500 librsync (0.9.5.1-3) unstable; urgency=low * Ran autoreconf --force, then rebuilt. Should make mips even happier now. Closes: #180005. -- John Goerzen Fri, 07 Feb 2003 14:06:35 -0600 librsync (0.9.5.1-2) unstable; urgency=low * Copied /usr/share/misc/config.{guess,sub} over the package defaults. This is apparently needed for the mips arch. Closes: #172497. -- John Goerzen Wed, 05 Feb 2003 15:00:55 -0600 librsync (0.9.5.1-1) unstable; urgency=low * New upstream release -- John Goerzen Tue, 03 Dec 2002 15:04:04 -0600 librsync (0.9.5-2) unstable; urgency=low * Applied patch from Mark van Walraven. Closes: #149267. -- John Goerzen Fri, 26 Jul 2002 15:05:42 -0500 librsync (0.9.5-1) unstable; urgency=low * Initial Release, lintian-clean. Closes: #133441. -- John Goerzen Mon, 11 Feb 2002 13:03:19 -0500 debian/compat0000644000000000000000000000000212163111601010354 0ustar 9 debian/control0000644000000000000000000000541512163111601010566 0ustar Source: librsync Section: libs Priority: optional Maintainer: Andrey Rahmatullin Build-Depends: debhelper (>= 9), dh-autoreconf (>= 4~), libbz2-dev, libpopt-dev, zlib1g-dev Standards-Version: 3.9.4 Homepage: http://librsync.sourceforge.net/ Vcs-Git: git://anonscm.debian.org/collab-maint/librsync.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/librsync.git;a=summary Package: librsync1 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: rsync remote-delta algorithm library librsync implements the rsync remote-delta algorithm, which allows for efficient remote updates of a file, without requiring the old and new versions to both be present at the transmitter. The library uses a stream-based designed so that it can be easily embedded into network applications. . librsync is used by rdiff-backup and duplicity backup applications. Package: librsync-dev Section: libdevel Architecture: any Depends: ${misc:Depends}, librsync1 (= ${binary:Version}), libbz2-dev, libpopt-dev, zlib1g-dev Description: rsync remote-delta algorithm library (development) librsync implements the rsync remote-delta algorithm, which allows for efficient remote updates of a file, without requiring the old and new versions to both be present at the transmitter. The library uses a stream-based designed so that it can be easily embedded into network applications. . This package contains the development files. Package: librsync-dbg Section: debug Priority: extra Architecture: any Multi-Arch: same Depends: ${misc:Depends}, librsync1 (= ${binary:Version}) Description: rsync remote-delta algorithm library (debug) librsync implements the rsync remote-delta algorithm, which allows for efficient remote updates of a file, without requiring the old and new versions to both be present at the transmitter. The library uses a stream-based designed so that it can be easily embedded into network applications. . This package contains the debugging symbols. Package: rdiff Section: utils Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: Binary diff tool for signature-based differences rdiff is a little like diff and patch all rolled into one, with support for binary files. Since it takes advantage of the rsync remote-delta algorithm, you do not need the source file in the same place as your destination file. . To use it, you generate a "signature" of the original file and copy the signature (which is very small) to the same location as the modified file. Then you generate a "delta" which describes the changes required to turn the source file into the modified file. The small delta file can then be used to "patch" the original file, to transform it into the modified file. debian/copyright0000644000000000000000000000260612163111601011115 0ustar Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174 Upstream-Name: librsync Upstream-Contact: Martin Pool Andrew Tridgell Donovan Baarda Source: http://librsync.sourceforge.net/ Files: * Copyright: (C) 1997-2004 Martin Pool (C) 1997-2004 Andrew Tridgell License: LGPL-2.1+ Files: debian/* Copyright: (C) 2008-2009 Daniel Baumann (C) 2011 Andrey Rahmatullin License: LGPL-2.1+ License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. . This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. . You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the complete text of the GNU Library General Public License can be found in /usr/share/common-licenses/LGPL-2.1 file. debian/gbp.conf0000644000000000000000000000003612163111601010574 0ustar [DEFAULT] pristine-tar = True debian/librsync-dev.install0000644000000000000000000000003712163111601013147 0ustar /usr/include/* /usr/lib/*/*.so debian/librsync1.docs0000644000000000000000000000004112163111601011731 0ustar NEWS THANKS TODO libversions.txt debian/librsync1.install0000644000000000000000000000004612163111601012454 0ustar /usr/lib/*/*.so.* /usr/share/man/man3 debian/librsync1.shlibs0000644000000000000000000000004012163111601012264 0ustar librsync 1 librsync1 (>= 0.9.6) debian/patches/0000755000000000000000000000000012163111601010605 5ustar debian/patches/01-manpage.patch0000644000000000000000000000301712163111601013455 0ustar 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 debian/patches/02-4gb.patch0000644000000000000000000000216112163111601012521 0ustar 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; debian/patches/03-getopt.patch0000644000000000000000000000203412163111601013347 0ustar Description: Remove unused compression-related rdiff options. Author: Andrey Rahmatullin Bug-Debian: http://bugs.debian.org/608470 Last-Update: 2011-02-08 diff --git a/rdiff.c b/rdiff.c index 264005e..3e4223d 100644 --- a/rdiff.c +++ b/rdiff.c @@ -97,8 +97,6 @@ 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 }, { "paranoia", 0, POPT_ARG_NONE, &rs_roll_paranoia }, { 0 } }; @@ -150,8 +148,6 @@ static void help(void) { "IO options:\n" " -I, --input-size=BYTES Input buffer size\n" " -O, --output-size=BYTES Output buffer size\n" - " -z, --gzip[=LEVEL] gzip-compress deltas\n" - " -i, --bzip2[=LEVEL] bzip2-compress deltas\n" ); } debian/patches/04-format-security.patch0000644000000000000000000000124712163111601015210 0ustar Description: Always use a format string in printf Fix the warning: buf.c:216:9: error: format not a string literal and no format arguments [-Werror=format-security] Author: Andrey Rahmatullin Forwarded: no Last-Update: 2012-02-05 diff --git a/buf.c b/buf.c index 7f4e7a0..3a83f2b 100644 --- a/buf.c +++ b/buf.c @@ -213,7 +213,7 @@ rs_result rs_file_copy_cb(void *arg, rs_long_t pos, size_t *len, void **buf) got = fread(*buf, 1, *len, f); if (got == -1) { - rs_error(strerror(errno)); + rs_error("%s", strerror(errno)); return RS_IO_ERROR; } else if (got == 0) { rs_error("unexpected eof on fd%d", fileno(f)); debian/patches/05-implicit-declaration.patch0000644000000000000000000000107012163111601016143 0ustar Description: Fix -Wimplicit-function-declaration warning in the test suite Fix the warning: isprefix.driver.c:43:5: warning: implicit declaration of function ‘strcmp’ [-Wimplicit-function-declaration] Author: Andrey Rahmatullin Forwarded: no Last-Update: 2012-02-05 diff --git a/testsuite/isprefix.driver.c b/testsuite/isprefix.driver.c index a9fd77b..df558c2 100644 --- a/testsuite/isprefix.driver.c +++ b/testsuite/isprefix.driver.c @@ -21,6 +21,7 @@ #include #include +#include #include "isprefix.h" debian/patches/06-fix-tests.patch0000644000000000000000000000103212163111601013773 0ustar Description: Fix running tests with the parallel harness Author: Andrey Rahmatullin Last-Update: 2013-06-26 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -29,7 +29,7 @@ isprefix_driver_LDADD = ../isprefix.o # XXX: should link replaced functions # failed. Generally these tests should be ordered so that more basic # tests are run first. -TESTS_ENVIRONMENT = $(SH) $(srcdir)/driver.sh +TEST_LOG_COMPILER = $(SH) $(srcdir)/driver.sh TESTS = \ signature.test mutate.test sources.test isprefix.test \ debian/patches/series0000644000000000000000000000017012163111601012020 0ustar 01-manpage.patch 02-4gb.patch 03-getopt.patch 04-format-security.patch 05-implicit-declaration.patch 06-fix-tests.patch debian/rdiff.install0000644000000000000000000000003512163111601011636 0ustar /usr/bin /usr/share/man/man1 debian/rules0000755000000000000000000000120712163111601010236 0ustar #!/usr/bin/make -f DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed %: dh ${@} --with autoreconf override_dh_autoreconf: dh_autoreconf --as-needed override_dh_auto_configure: dh_auto_configure -- --enable-shared --disable-static CFLAGS="$(CFLAGS) -D_LARGEFILE_SOURCE" override_dh_auto_install: $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la install -D -m 0755 .libs/rdiff debian/tmp/usr/bin/rdiff override_dh_install: dh_install --fail-missing override_dh_strip: dh_strip --dbg-package=librsync-dbg debian/source/0000755000000000000000000000000012163111601010456 5ustar debian/source/format0000644000000000000000000000001412163111601011664 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000032512163111601010207 0ustar version=3 opts=dversionmangle=s/\+dfsg\d*$//,uversionmangle=s/_/./g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \ http://sf.net/librsync/librsync-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))