librsync-2.3.4

This commit is contained in:
uglyside
2025-02-07 09:20:52 +03:00
parent 264f1337b6
commit f769f0c38b
4 changed files with 34 additions and 147 deletions
+15 -19
View File
@@ -1,30 +1,26 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 2
# See the file http://www.gnu.org/copyleft/gpl.txt
# Licensed under the GNU General Public License, version 3.
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import cmaketools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
from pisi.actionsapi import cmaketools, mesontools, pisitools
i = ''.join([
' -DCMAKE_BUILD_TYPE=Release',
' -DCMAKE_INSTALL_PREFIX=/usr',
' -DCMAKE_INSTALL_LIBDIR=lib',
' -DENABLE_{COMPRESSION,TRACE}=ON',
' -Bbuild -G Ninja -L '
])
def setup():
shelltools.makedirs("build")
shelltools.cd("build")
cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib", sourceDir="..")
cmaketools.configure(i)
def build():
shelltools.cd("build")
cmaketools.make()
mesontools.build()
def install():
shelltools.cd("build")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
shelltools.cd("..")
pisitools.dodoc("README*", "TODO*", "NEWS*", "COPYING")
mesontools.install()
pisitools.dodoc("AUTHORS", "COPYING")
@@ -1,92 +0,0 @@
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@samba.org>
* Copyright (C) 2002, 2003 by Donovan Baarda <abo@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
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@samba.org>
*
@@ -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@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 @@ 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
@@ -1,26 +0,0 @@
--- librsync-0.9.7/configure.ac.orig 2004-10-10 11:52:26.000000000 +0200
+++ librsync-0.9.7/configure.ac 2004-10-18 22:39:40.600385603 +0200
@@ -27,9 +27,9 @@
AC_PROG_LIBTOOL
# Checks for libraries.
-AC_CHECK_LIB(z, deflate)
-AC_CHECK_LIB(bz2, BZ2_bzCompress)
-AC_CHECK_LIB(popt, poptGetContext,,[BUILD_POPT='popt/libpopt.a'; CFLAGS="$CFLAGS -I$srcdir/popt"])
+dnl AC_CHECK_LIB(z, deflate) -- unused
+dnl AC_CHECK_LIB(bz2, BZ2_bzCompress) -- unused
+AC_CHECK_LIB(popt, poptGetContext,[BUILD_POPT=-lpopt],[BUILD_POPT='popt/libpopt.a'; CFLAGS="$CFLAGS -I$srcdir/popt"])
# Checks for header files.
AC_FUNC_ALLOCA
--- librsync-0.9.7/Makefile.am.orig 2004-02-08 00:17:57.000000000 +0100
+++ librsync-0.9.7/Makefile.am 2004-10-18 22:36:07.967024276 +0200
@@ -60,7 +60,7 @@
rdiff_LDADD = @BUILD_POPT@ librsync.la
-rdiff_DEPENDENCIES = @BUILD_POPT@ librsync.la
+rdiff_DEPENDENCIES = librsync.la
# this script is used to build prototab.[ch]
noinst_SCRIPTS = mkprototab.pl
+19 -10
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>librsync</Name>
<Homepage>http://librsync.sourceforge.net/</Homepage>
<Homepage>https://github.com/librsync/librsync</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
@@ -11,29 +11,31 @@
<License>LGPLv2.1</License>
<IsA>library</IsA>
<IsA>app:console</IsA>
<Summary>librsync implements the rolling-checksum algorithm of remote file synchronization that was popularized by the rsync utility and is used in rproxy</Summary>
<Description>librsync implements the rolling-checksum algorithm of remote file synchronization that was popularized by the rsync utility and is used in rproxy. This algorithm transfers the differences between 2 files without needing both files on the same system.</Description>
<Archive sha1sum="02d513f7781e172cddf79a984f50284327b3ff4a" type="targz">https://github.com/librsync/librsync/archive/refs/tags/v2.3.2.tar.gz</Archive>
<Summary>Remote delta-compression library.</Summary>
<Description>A library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.</Description>
<Archive sha1sum="d116958ee9cdfab5a6129e0b2e707e271b20550c" type="targz">https://github.com/librsync/librsync/releases/download/v2.3.4/librsync-2.3.4.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>popt-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>librsync-0.9.7-largefiles.patch</Patch> -->
<!-- <Patch level="1">librsync-link.patch</Patch> -->
<!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
<Package>
<Name>librsync</Name>
<RuntimeDependencies>
<Dependency>zlib</Dependency>
<Dependency>popt</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc/librsync</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
@@ -41,16 +43,23 @@
<Name>librsync-devel</Name>
<Summary>Development files for librsync</Summary>
<RuntimeDependencies>
<Dependency>zlib-devel</Dependency>
<Dependency>popt-devel</Dependency>
<Dependency release="current">librsync</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/librsync.so</Path>
<Path fileType="man">/usr/share/man/man3</Path>
</Files>
</Package>
<History>
<Update release="8">
<Date>2025-02-07</Date>
<Version>2.3.4</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2022-11-05</Date>
<Version>2.3.2</Version>