Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit librsync
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sun, 02 Sep 2007 10:30:12 +0200
- Message-id: <20070902083012.D246F678331@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package librsync
checked in at Sun Sep 2 10:30:12 CEST 2007.
--------
--- librsync/librsync.changes 2007-08-26 01:03:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/librsync/librsync.changes 2007-09-02 10:25:30.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Sep 2 10:17:37 CEST 2007 - crrodriguez@xxxxxxx
+
+- library was unable to handle files larger than 4GB properly (librsync-0.9.7-largefiles.patch)
+- fix build dependencies
+-------------------------------------------------------------------
New:
----
librsync-0.9.7-largefiles.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ librsync.spec ++++++
--- /var/tmp/diff_new_pack.T31307/_old 2007-09-02 10:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.T31307/_new 2007-09-02 10:29:41.000000000 +0200
@@ -11,16 +11,17 @@
# norootforbuild
Name: librsync
-BuildRequires: libbz2-devel popt-devel rsync zlib-devel
+BuildRequires: libbz2-devel popt-devel zlib-devel
License: LGPL v2 or later
Group: Development/Libraries/C and C++
Autoreqprov: on
Summary: A Library for Generating Network Deltas
Version: 0.9.7
-Release: 99
+Release: 102
URL: http://librsync.sourceforge.net/
Source: http://prdownloads.sourceforge.net/rproxy/%{name}-%{version}.tar.bz2
Patch0: %{name}-%{version}-strictalias.diff
+Patch1: librsync-0.9.7-largefiles.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -39,7 +40,8 @@
%prep
%setup -q
-%patch -p1
+%patch0
+%patch1
%build
autoreconf -fi
@@ -68,6 +70,9 @@
%doc AUTHORS COPYING NEWS README THANKS TODO
%changelog
+* Sun Sep 02 2007 - crrodriguez@xxxxxxx
+- library was unable to handle files larger than 4GB properly (librsync-0.9.7-largefiles.patch)
+- fix build dependencies
* Sun Aug 26 2007 - crrodriguez@xxxxxxx
- spec cleanup
- stop using bundled popt library, use system one
++++++ librsync-0.9.7-largefiles.patch ++++++
RCS file: /cvsroot/librsync/librsync/mdfour.h,v
retrieving revision 1.7
retrieving revision 1.8
Index: mdfour.h
===================================================================
--- mdfour.h.orig 2004-02-08 00:17:57.000000000 +0100
+++ mdfour.h 2007-09-02 10:10:50.000000000 +0200
@@ -1,7 +1,7 @@
/*= -*- c-basic-offset: 4; indent-tabs-mode: nil; -*-
*
* librsync -- the library for network deltas
- * $Id: mdfour.h,v 1.7 2003/10/17 16:15:21 abo Exp $
+ * $Id: mdfour.h,v 1.8 2006/03/10 10:44:10 abo Exp $
*
* Copyright (C) 2000, 2001 by Martin Pool <mbp@xxxxxxxxx>
* Copyright (C) 2002, 2003 by Donovan Baarda <abo@xxxxxxxxxxxxxxxxxxxxx>
@@ -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
Index: patch.c
===================================================================
--- patch.c.orig 2004-09-17 23:35:50.000000000 +0200
+++ patch.c 2007-09-02 10:10:50.000000000 +0200
@@ -1,7 +1,7 @@
/*= -*- c-basic-offset: 4; indent-tabs-mode: nil; -*-
*
* librsync -- the library for network deltas
- * $Id: patch.c,v 1.30 2004/09/10 02:48:58 mbp Exp $
+ * $Id: patch.c,v 1.31 2006/03/10 10:44:10 abo Exp $
*
* Copyright (C) 2000, 2001 by Martin Pool <mbp@xxxxxxxxx>
*
@@ -214,12 +214,9 @@ 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)
- len = buffs->avail_out;
+ len = (buffs->avail_out < job->basis_len) ? buffs->avail_out : job->basis_len;
if (!len)
return RS_BLOCKED;
Index: doc/rdiff.1
===================================================================
--- doc/rdiff.1.orig 2004-02-08 00:17:57.000000000 +0100
+++ doc/rdiff.1 2007-09-02 10:10:50.000000000 +0200
@@ -1,6 +1,6 @@
.\"
.\" librsync -- dynamic caching and delta update in HTTP
-.\" $Id: rdiff.1,v 1.1 2002/01/25 21:25:34 bje Exp $
+.\" $Id: rdiff.1,v 1.2 2006/02/21 12:21:52 abo Exp $
.\"
.\" Copyright (C) 2000 by Martin Pool <mbp@xxxxxxxxxxxxx>
.\"
@@ -18,7 +18,7 @@
.\" License along with this program; if not, write to the Free Software
.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
.\"
-.TH rdiff 1 "$Date: 2002/01/25 21:25:34 $"
+.TH rdiff 1 "$Date: 2006/02/21 12:21:52 $"
.SH NAME
rdiff \- compute and apply signature-based file differences
.SH SYNOPSYS
@@ -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
++++++ librsync-0.9.7-strictalias.diff ++++++
--- /var/tmp/diff_new_pack.T31307/_old 2007-09-02 10:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.T31307/_new 2007-09-02 10:29:41.000000000 +0200
@@ -1,7 +1,8 @@
-diff -uNr librsync-0.9.6/netint.c librsync-0.9.6.strictalias/netint.c
---- librsync-0.9.6/netint.c 2003-08-05 10:28:21.000000000 +0200
-+++ librsync-0.9.6.strictalias/netint.c 2004-02-06 19:36:59.000000000 +0100
-@@ -121,7 +121,7 @@
+Index: netint.c
+===================================================================
+--- netint.c.orig 2004-09-17 23:35:50.000000000 +0200
++++ netint.c 2007-09-02 10:10:50.000000000 +0200
+@@ -121,7 +121,7 @@ rs_squirt_n4(rs_job_t *job, int val)
rs_result
rs_suck_netint(rs_job_t *job, rs_long_t *v, int len)
{
@@ -10,7 +11,7 @@
int i;
rs_result result;
-@@ -130,13 +130,13 @@
+@@ -130,13 +130,13 @@ rs_suck_netint(rs_job_t *job, rs_long_t
return RS_INTERNAL_ERROR;
}
@@ -26,10 +27,11 @@
}
return RS_DONE;
-diff -uNr librsync-0.9.6/readsums.c librsync-0.9.6.strictalias/readsums.c
---- librsync-0.9.6/readsums.c 2003-07-22 16:35:08.000000000 +0200
-+++ librsync-0.9.6.strictalias/readsums.c 2004-02-06 19:37:41.000000000 +0100
-@@ -111,15 +111,15 @@
+Index: readsums.c
+===================================================================
+--- readsums.c.orig 2004-02-08 00:17:57.000000000 +0100
++++ readsums.c 2007-09-02 10:10:50.000000000 +0200
+@@ -111,15 +111,15 @@ static rs_result rs_loadsig_s_weak(rs_jo
static rs_result rs_loadsig_s_strong(rs_job_t *job)
{
rs_result result;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |