rpm/rsync
SHA256
1
0
Fork 0
forked from pool/rsync
Code Pull Requests Activity

Accepting request 512233 from network

Browse Source 
- 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/request/show/512233
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsync?expand=0&rev=61
This commit is contained in:
Dominique Leuenberger 2017-07-24 11:04:31 +00:00 committed by Git OBS Bridge
commit 10276a752c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rsync-both-compressions.patch
View File

@ -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

6
rsync.changes
View File

@ -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