From f769f0c38b3440b762f3dfbcc06cde76c93989c6 Mon Sep 17 00:00:00 2001 From: uglyside Date: Fri, 7 Feb 2025 09:20:52 +0300 Subject: [PATCH] librsync-2.3.4 --- network/share/librsync/actions.py | 34 +++---- .../files/librsync-0.9.7-largefiles.patch | 92 ------------------- .../share/librsync/files/librsync-link.patch | 26 ------ network/share/librsync/pspec.xml | 29 ++++-- 4 files changed, 34 insertions(+), 147 deletions(-) delete mode 100644 network/share/librsync/files/librsync-0.9.7-largefiles.patch delete mode 100644 network/share/librsync/files/librsync-link.patch diff --git a/network/share/librsync/actions.py b/network/share/librsync/actions.py index 1a89d4eca3..b82de527c0 100644 --- a/network/share/librsync/actions.py +++ b/network/share/librsync/actions.py @@ -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") diff --git a/network/share/librsync/files/librsync-0.9.7-largefiles.patch b/network/share/librsync/files/librsync-0.9.7-largefiles.patch deleted file mode 100644 index 5dbb0c9e7f..0000000000 --- a/network/share/librsync/files/librsync-0.9.7-largefiles.patch +++ /dev/null @@ -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 - * Copyright (C) 2002, 2003 by Donovan Baarda -@@ -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 - * -@@ -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 - .\" -@@ -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 diff --git a/network/share/librsync/files/librsync-link.patch b/network/share/librsync/files/librsync-link.patch deleted file mode 100644 index b3523712ac..0000000000 --- a/network/share/librsync/files/librsync-link.patch +++ /dev/null @@ -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 diff --git a/network/share/librsync/pspec.xml b/network/share/librsync/pspec.xml index 0ed7cede93..558fd2f949 100644 --- a/network/share/librsync/pspec.xml +++ b/network/share/librsync/pspec.xml @@ -1,9 +1,9 @@ - + librsync - http://librsync.sourceforge.net/ + https://github.com/librsync/librsync PisiLinux Community admins@pisilinux.org @@ -11,29 +11,31 @@ LGPLv2.1 library app:console - librsync implements the rolling-checksum algorithm of remote file synchronization that was popularized by the rsync utility and is used in rproxy - 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. - https://github.com/librsync/librsync/archive/refs/tags/v2.3.2.tar.gz + Remote delta-compression library. + A library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications. + https://github.com/librsync/librsync/releases/download/v2.3.4/librsync-2.3.4.tar.gz cmake + ninja + zlib-devel popt-devel - - + librsync + zlib popt /usr/bin /usr/lib /usr/share/man - /usr/share/doc/librsync + /usr/share/doc @@ -41,16 +43,23 @@ librsync-devel Development files for librsync + zlib-devel + popt-devel librsync /usr/include - /usr/lib/librsync.so - /usr/share/man/man3 + + 2025-02-07 + 2.3.4 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-11-05 2.3.2