From a97b3ece2a404d69525d29b9c9c03d8bec16594e8e7755a2c55b53bb81cfd0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 24 Jul 2017 11:00:40 +0000 Subject: [PATCH] - Refresh patch rsync-both-compressions.patch to include fix when using old-compress on new zlib on server too OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=56 --- rsync-both-compressions.patch | 11 ++++++++++- rsync.changes | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/rsync-both-compressions.patch b/rsync-both-compressions.patch index 1670e74..7aacf66 100644 --- a/rsync-both-compressions.patch +++ b/rsync-both-compressions.patch @@ -55,9 +55,18 @@ index 64ec8b84..522875c5 100644 #ifdef HAVE_SETVBUF diff --git a/token.c b/token.c -index ad9b9bcd..0eb95362 100644 +index ad9b9bcd..a1ceb975 100644 --- a/token.c +++ b/token.c +@@ -374,7 +374,7 @@ send_deflated_token(int f, int32 token, struct map_struct *buf, OFF_T offset, + } + if (nb == 0 && token != -2) + flush = Z_SYNC_FLUSH; +- r = deflate(&tx_strm, flush); ++ r = deflate_int(&tx_strm, flush); + if (r != Z_OK) { + rprintf(FERROR, "deflate returned %d\n", r); + exit_cleanup(RERR_STREAMIO); @@ -405,7 +405,6 @@ send_deflated_token(int f, int32 token, struct map_struct *buf, OFF_T offset, } else if (token != -2 && do_compression == 1) { /* Add the data in the current block to the compressor's diff --git a/rsync.changes b/rsync.changes index 09a9c97..bf4fbad 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 24 10:45:16 UTC 2017 - tchvatal@suse.com + +- Refresh patch rsync-both-compressions.patch to include + fix when using old-compress on new zlib on server too + ------------------------------------------------------------------- Thu Jul 13 09:00:59 UTC 2017 - tchvatal@suse.com