[26879] trunk/dports/net/librsync
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 10 19:18:46 PDT 2007
Revision: 26879
http://trac.macosforge.org/projects/macports/changeset/26879
Author: boeyms at macports.org
Date: 2007-07-10 19:18:46 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
net/librsync:
* Apply some patches from upstream:
* Improve the documentation (patch-librsync__doc__rdiff.1);
* Fix a failure to handle files larger than 4GB (patch-librsync__mdfour.h and
patch-librsync__patch.c).
Modified Paths:
--------------
trunk/dports/net/librsync/Portfile
Added Paths:
-----------
trunk/dports/net/librsync/files/
trunk/dports/net/librsync/files/patch-librsync__doc__rdiff.1
trunk/dports/net/librsync/files/patch-librsync__mdfour.h
trunk/dports/net/librsync/files/patch-librsync__patch.c
Modified: trunk/dports/net/librsync/Portfile
===================================================================
--- trunk/dports/net/librsync/Portfile 2007-07-11 01:04:37 UTC (rev 26878)
+++ trunk/dports/net/librsync/Portfile 2007-07-11 02:18:46 UTC (rev 26879)
@@ -4,6 +4,7 @@
name librsync
version 0.9.7
+revision 1
categories net devel
maintainers nomaintainer at macports.org
description library that implements the rsync remote-delta algorithm
@@ -15,10 +16,17 @@
the aim of allowing it to be embedded into many different \
applications. librsync is not wire-compatible with rsync 2.x, \
and is not likely to be in the future.
-
homepage http://librsync.sourceforge.net/
master_sites sourceforge
checksums md5 24cdb6b78f45e0e83766903fd4f6bc84
-
+# These patches have been downloaded into the MacPorts repository since it saves
+# having to fetch them from CVS. Respectively, they can be viewed at:
+#
+# http://librsync.cvs.sourceforge.net/librsync/librsync/doc/rdiff.1?r1=1.1&r2=1.2&view=patch
+# http://librsync.cvs.sourceforge.net/librsync/librsync/mdfour.h?r1=1.7&r2=1.8&view=patch
+# http://librsync.cvs.sourceforge.net/librsync/librsync/patch.c?r1=1.30&r2=1.31&view=patch
+patchfiles patch-librsync__doc__rdiff.1 \
+ patch-librsync__mdfour.h \
+ patch-librsync__patch.c
configure.args --mandir=${prefix}/share/man \
--enable-shared
Added: trunk/dports/net/librsync/files/patch-librsync__doc__rdiff.1
===================================================================
--- trunk/dports/net/librsync/files/patch-librsync__doc__rdiff.1 (rev 0)
+++ trunk/dports/net/librsync/files/patch-librsync__doc__rdiff.1 2007-07-11 02:18:46 UTC (rev 26879)
@@ -0,0 +1,38 @@
+--- rdiff.1 2002/01/25 21:25:34 1.1
++++ rdiff.1 2006/02/21 12:21:52 1.2
+@@ -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 at humbug.org.au>
+ .\"
+@@ -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 @@
+ .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
Property changes on: trunk/dports/net/librsync/files/patch-librsync__doc__rdiff.1
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/dports/net/librsync/files/patch-librsync__mdfour.h
===================================================================
--- trunk/dports/net/librsync/files/patch-librsync__mdfour.h (rev 0)
+++ trunk/dports/net/librsync/files/patch-librsync__mdfour.h 2007-07-11 02:18:46 UTC (rev 26879)
@@ -0,0 +1,20 @@
+--- mdfour.h 2003/10/17 16:15:21 1.7
++++ mdfour.h 2006/03/10 10:44:10 1.8
+@@ -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 at samba.org>
+ * Copyright (C) 2002, 2003 by Donovan Baarda <abo at minkirri.apana.org.au>
+@@ -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
Property changes on: trunk/dports/net/librsync/files/patch-librsync__mdfour.h
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/dports/net/librsync/files/patch-librsync__patch.c
===================================================================
--- trunk/dports/net/librsync/files/patch-librsync__patch.c (rev 0)
+++ trunk/dports/net/librsync/files/patch-librsync__patch.c 2007-07-11 02:18:46 UTC (rev 26879)
@@ -0,0 +1,25 @@
+--- patch.c 2004/09/10 02:48:58 1.30
++++ patch.c 2006/03/10 10:44:10 1.31
+@@ -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 at samba.org>
+ *
+@@ -214,12 +214,9 @@
+ 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;
Property changes on: trunk/dports/net/librsync/files/patch-librsync__patch.c
___________________________________________________________________
Name: svn:eol-style
+ native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070710/5e778ec3/attachment.html
More information about the macports-changes
mailing list