diff options
| author | Valery Kartel <valery.kartel@gmail.com> | 2015-09-24 16:17:31 +0300 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2015-09-29 16:13:11 +0200 |
| commit | fa6505dc69a2a6945324744d8134de0b186be808 (patch) | |
| tree | 51ed8fedb90f372a5b783b2a2a7d2af6f7f890b2 /testing/csync2/csync2-1.34-librsync-1.0.0.patch | |
| parent | 48cf8ee4d00068967848c3c9deb33b6c996c1697 (diff) | |
| download | aports-fa6505dc69a2a6945324744d8134de0b186be808.tar.bz2 aports-fa6505dc69a2a6945324744d8134de0b186be808.tar.xz | |
testing/csync2: upgrade to 2.0
Diffstat (limited to 'testing/csync2/csync2-1.34-librsync-1.0.0.patch')
| -rw-r--r-- | testing/csync2/csync2-1.34-librsync-1.0.0.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/testing/csync2/csync2-1.34-librsync-1.0.0.patch b/testing/csync2/csync2-1.34-librsync-1.0.0.patch deleted file mode 100644 index d46653d455..0000000000 --- a/testing/csync2/csync2-1.34-librsync-1.0.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -Patch by Robert Scheck <robert@fedoraproject.org> for csync2 <= 1.34 based on the -patch by Roman Tereshonkov and Kari Hautio to avoid a build failure with librsync ->= 1.0.0 (which is a security bugfix release). The discussion and solution finding -can be found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity). - ---- csync2-1.34/rsync.c 2007-07-24 23:04:18.000000000 +0200 -+++ csync2-1.34/rsync.c.librsync-1.0.0 2015-03-02 00:18:43.000000000 +0100 -@@ -134,8 +134,13 @@ - - if ( isreg ) { - csync_debug(3, "Running rs_sig_file() from librsync....\n"); -+#ifdef RS_DEFAULT_STRONG_LEN - result = rs_sig_file(basis_file, sig_file, - RS_DEFAULT_BLOCK_LEN, RS_DEFAULT_STRONG_LEN, &stats); -+#else /* librsync >= 1.0.0 */ -+ result = rs_sig_file(basis_file, sig_file, -+ RS_DEFAULT_BLOCK_LEN, 8, RS_MD4_SIG_MAGIC, &stats); -+#endif - if (result != RS_DONE) { - csync_debug(0, "Internal error from rsync library!\n"); - goto error; -@@ -216,8 +221,13 @@ - if ( !basis_file ) basis_file = fopen("/dev/null", "rb"); - - csync_debug(3, "Running rs_sig_file() from librsync..\n"); -+#ifdef RS_DEFAULT_STRONG_LEN - result = rs_sig_file(basis_file, sig_file, - RS_DEFAULT_BLOCK_LEN, RS_DEFAULT_STRONG_LEN, &stats); -+#else /* librsync >= 1.0.0 */ -+ result = rs_sig_file(basis_file, sig_file, -+ RS_DEFAULT_BLOCK_LEN, 8, RS_MD4_SIG_MAGIC, &stats); -+#endif - if (result != RS_DONE) - csync_fatal("Got an error from librsync, too bad!\n"); - |