From 2b390fdfe40549589a55038d72017571fdfb5a0a3f1845387d89e6987941fdeb Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 7 Jul 2020 10:01:48 +0000 Subject: [PATCH] Accepting request 819170 from home:namtrac:branches:network - Updated to version 3.2.2 * Too many changes to list, see included NEWS.md file. - Add BR on pkgconfig(openssl), rsync now uses openssl for MD4/MD5 - Add BR on libzstd-devel and liblz4-devel to enabled lz4 and zstd compression support. - Add BR on xxhash-devel to enable xxhash checksum support. - Refresh rsync-add_back_use_slp_directive.patch - Drop rsync-both-compressions.patch, rsync-send_error_to_sender.patch, rsync-avoid-uploading-after-error.patch, rsync-fix-prealloc-to-keep-file-size-0-when-possible.patch: Fixed upstream. OBS-URL: https://build.opensuse.org/request/show/819170 OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=78 --- rsync-3.1.3.tar.gz | 3 - rsync-3.1.3.tar.gz.asc | 7 - rsync-3.2.2.tar.gz | 3 + rsync-3.2.2.tar.gz.asc | 6 + rsync-add_back_use_slp_directive.patch | 161 ++++++++---------- rsync-avoid-uploading-after-error.patch | 13 -- rsync-both-compressions.patch | 98 ----------- ...oc-to-keep-file-size-0-when-possible.patch | 25 --- rsync-no-libattr.patch | 8 +- rsync-patches-3.1.3.tar.gz | 3 - rsync-patches-3.1.3.tar.gz.asc | 7 - rsync-patches-3.2.2.tar.gz | 3 + rsync-patches-3.2.2.tar.gz.asc | 6 + rsync-send_error_to_sender.patch | 73 -------- rsync.changes | 15 ++ rsync.spec | 46 ++--- 16 files changed, 128 insertions(+), 349 deletions(-) delete mode 100644 rsync-3.1.3.tar.gz delete mode 100644 rsync-3.1.3.tar.gz.asc create mode 100644 rsync-3.2.2.tar.gz create mode 100644 rsync-3.2.2.tar.gz.asc delete mode 100644 rsync-avoid-uploading-after-error.patch delete mode 100644 rsync-both-compressions.patch delete mode 100644 rsync-fix-prealloc-to-keep-file-size-0-when-possible.patch delete mode 100644 rsync-patches-3.1.3.tar.gz delete mode 100644 rsync-patches-3.1.3.tar.gz.asc create mode 100644 rsync-patches-3.2.2.tar.gz create mode 100644 rsync-patches-3.2.2.tar.gz.asc delete mode 100644 rsync-send_error_to_sender.patch diff --git a/rsync-3.1.3.tar.gz b/rsync-3.1.3.tar.gz deleted file mode 100644 index 88e830c..0000000 --- a/rsync-3.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0 -size 905908 diff --git a/rsync-3.1.3.tar.gz.asc b/rsync-3.1.3.tar.gz.asc deleted file mode 100644 index b9dd900..0000000 --- a/rsync-3.1.3.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlpuY4cACgkQbIWfsUuWqMWfBACgscuEGZltcborW4ye308u05xg -e/kAoKjkpotybbJNQjZUKsFqpDDKa9AR -=9BRy ------END PGP SIGNATURE----- diff --git a/rsync-3.2.2.tar.gz b/rsync-3.2.2.tar.gz new file mode 100644 index 0000000..ff94878 --- /dev/null +++ b/rsync-3.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:644bd3841779507665211fd7db8359c8a10670c57e305b4aab61b4e40037afa8 +size 1057001 diff --git a/rsync-3.2.2.tar.gz.asc b/rsync-3.2.2.tar.gz.asc new file mode 100644 index 0000000..c5e1084 --- /dev/null +++ b/rsync-3.2.2.tar.gz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQASMiwJtTJbw5YnC9shZ+xS5aoxQUCXwFv0gAKCRBshZ+xS5ao +xeEqAKCbN2BJh4xPRy8h5+WEjMZ5dvMcugCeJh7dvnYDLZPFVvRkiKW+APQe+e8= +=mREY +-----END PGP SIGNATURE----- diff --git a/rsync-add_back_use_slp_directive.patch b/rsync-add_back_use_slp_directive.patch index bab5f48..414147a 100644 --- a/rsync-add_back_use_slp_directive.patch +++ b/rsync-add_back_use_slp_directive.patch @@ -1,8 +1,8 @@ -Index: rsync-3.1.1/clientserver.c +Index: rsync-3.2.2/clientserver.c =================================================================== ---- rsync-3.1.1.orig/clientserver.c 2015-10-07 14:58:43.767379915 +0200 -+++ rsync-3.1.1/clientserver.c 2015-10-07 14:59:24.515920754 +0200 -@@ -1200,7 +1200,7 @@ int daemon_main(void) +--- rsync-3.2.2.orig/clientserver.c ++++ rsync-3.2.2/clientserver.c +@@ -1412,7 +1412,7 @@ int daemon_main(void) * local address??? */ #ifdef HAVE_LIBSLP @@ -11,65 +11,62 @@ Index: rsync-3.1.1/clientserver.c rprintf(FINFO, "Couldn't register with service discovery protocol, continuing anyway\n"); } -Index: rsync-3.1.1/loadparm.c +Index: rsync-3.2.2/daemon-parm.txt =================================================================== ---- rsync-3.1.1.orig/loadparm.c 2015-10-07 14:58:43.767379915 +0200 -+++ rsync-3.1.1/loadparm.c 2015-10-07 14:59:24.515920754 +0200 -@@ -101,6 +101,7 @@ typedef struct { - int rsync_port; - #ifdef HAVE_LIBSLP - int slp_refresh; -+ BOOL use_slp; - #endif - } global_vars; +--- rsync-3.2.2.orig/daemon-parm.txt ++++ rsync-3.2.2/daemon-parm.txt +@@ -11,6 +11,7 @@ STRING socket_options NULL + INTEGER listen_backlog 5 + INTEGER rsync_port|port 0 + INTEGER slp_refresh 0 ++BOOL use_slp False -@@ -181,6 +182,10 @@ static const all_vars Defaults = { + BOOL proxy_protocol False - /* listen_backlog; */ 5, - /* rsync_port; */ 0, -+#ifdef HAVE_LIBSLP -+ /* slp_refresh; */ 0, -+ /* use_slp; */ False, -+#endif - }, - - /* ==== local_vars ==== */ -@@ -322,6 +327,7 @@ static struct parm_struct parm_table[] = - {"port", P_INTEGER,P_GLOBAL,&Vars.g.rsync_port, NULL,0}, - #ifdef HAVE_LIBSLP - {"slp refresh", P_INTEGER,P_GLOBAL,&Vars.g.slp_refresh, NULL,0}, -+ {"use slp", P_BOOL, P_GLOBAL,&Vars.g.use_slp, NULL,0}, - #endif - {"socket options", P_STRING, P_GLOBAL,&Vars.g.socket_options, NULL,0}, - -@@ -458,6 +464,7 @@ FN_GLOBAL_INTEGER(lp_listen_backlog, &Va - FN_GLOBAL_INTEGER(lp_rsync_port, &Vars.g.rsync_port) - #ifdef HAVE_LIBSLP - FN_GLOBAL_INTEGER(lp_slp_refresh, &Vars.g.slp_refresh) -+FN_GLOBAL_BOOL(lp_use_slp, &Vars.g.use_slp) - #endif - - FN_LOCAL_STRING(lp_auth_users, auth_users) -Index: rsync-3.1.1/rsyncd.conf.yo +Index: rsync-3.2.2/rsyncd.conf.5.md =================================================================== ---- rsync-3.1.1.orig/rsyncd.conf.yo 2015-10-07 14:58:43.767379915 +0200 -+++ rsync-3.1.1/rsyncd.conf.yo 2015-10-07 14:59:24.516920767 +0200 -@@ -124,6 +124,10 @@ via the bf(--sockopts) command-line opti - dit(bf(listen backlog)) You can override the default backlog value when the - daemon listens for connections. It defaults to 5. +--- rsync-3.2.2.orig/rsyncd.conf.5.md ++++ rsync-3.2.2/rsyncd.conf.5.md +@@ -136,6 +136,11 @@ a literal % into a value is to use %%. + You can override the default backlog value when the daemon listens for + connections. It defaults to 5. -+dit(bf(use slp)) This parameter is used to determine if the module names are -+advertised via slp. The default is for this to be disabled, which won't -+advertise your public modules. ++0. `use slp` + - dit(bf(slp refresh)) This parameter is used to determine how long service - advertisements are valid (measured in seconds), and is only applicable if - you have Service Location Protocol support compiled in. If this is -Index: rsync-3.1.1/socket.c ++ This parameter is used to determine if the module names are advertised via ++ slp. The default is disabled, which won't advertise your public modules. ++ + 0. `slp refresh` + + This parameter is used to determine how long service advertisements are +Index: rsync-3.2.2/main.c =================================================================== ---- rsync-3.1.1.orig/socket.c 2015-10-07 14:58:43.767379915 +0200 -+++ rsync-3.1.1/socket.c 2015-10-07 14:59:24.516920767 +0200 -@@ -546,7 +546,7 @@ void start_accept_loop(int port, int (*f +--- rsync-3.2.2.orig/main.c ++++ rsync-3.2.2/main.c +@@ -1366,11 +1366,14 @@ static int start_client(int argc, char * + if (shell_machine && !shell_machine[0]) { + #ifdef HAVE_LIBSLP + /* User entered just rsync:// URI */ +- print_service_list(); +- exit_cleanup(0); +-#else /* No SLP, die here */ ++ if (lp_use_slp()) { ++ print_service_list(); ++ exit_cleanup(0); ++ } else { ++ rprintf(FINFO, "SLP is disabled, cannot browse\n"); ++ } ++#else /* No SLP */ + rprintf(FINFO, "No SLP support, cannot browse\n"); +- exit_cleanup(RERR_SYNTAX); + #endif + } + +Index: rsync-3.2.2/socket.c +=================================================================== +--- rsync-3.2.2.orig/socket.c ++++ rsync-3.2.2/socket.c +@@ -536,7 +536,7 @@ void start_accept_loop(int port, int (*f int *sp, maxfd, i; #ifdef HAVE_LIBSLP time_t next_slp_refresh; @@ -78,42 +75,18 @@ Index: rsync-3.1.1/socket.c if (slp_timeout) { if (slp_timeout < SLP_MIN_TIMEOUT) slp_timeout = SLP_MIN_TIMEOUT; -Index: rsync-3.1.1/main.c +Index: rsync-3.2.2/rsyncd.conf.5 =================================================================== ---- rsync-3.1.1.orig/main.c 2015-10-07 14:58:43.767379915 +0200 -+++ rsync-3.1.1/main.c 2015-10-07 14:59:24.516920767 +0200 -@@ -1250,11 +1250,14 @@ static int start_client(int argc, char * - if (shell_machine && !shell_machine[0]) { - #ifdef HAVE_LIBSLP - /* User entered just rsync:// URI */ -- print_service_list(); -- exit_cleanup(0); --#else /* No SLP, die here */ -+ if (lp_use_slp()) { -+ print_service_list(); -+ exit_cleanup(0); -+ } else { -+ rprintf(FINFO, "SLP is disabled, cannot browse\n"); -+ } -+#else /* No SLP */ - rprintf(FINFO, "No SLP support, cannot browse\n"); -- exit_cleanup(RERR_SYNTAX); - #endif - } - -Index: rsync-3.1.1/rsyncd.conf.5 -=================================================================== ---- rsync-3.1.1.orig/rsyncd.conf.5 2015-10-07 14:36:06.288364061 +0200 -+++ rsync-3.1.1/rsyncd.conf.5 2015-10-07 15:00:28.309767222 +0200 -@@ -142,6 +142,11 @@ via the \fB\-\-sockopts\fP command\-line - You can override the default backlog value when the - daemon listens for connections. It defaults to 5. - .IP -+.IP "\fBuse slp\fP" -+This parameter is used to determine if the module names are -+advertised via slp. The default is for this to be disabled, which won't -+advertise your public modules. -+.IP - .IP "\fBslp refresh\fP" - This parameter is used to determine how long service - advertisements are valid (measured in seconds), and is only applicable if +--- rsync-3.2.2.orig/rsyncd.conf.5 ++++ rsync-3.2.2/rsyncd.conf.5 +@@ -132,6 +132,10 @@ can also be specified via the \fB\-\-soc + .IP "\fBlisten\ backlog\fP" + You can override the default backlog value when the daemon listens for + connections. It defaults to 5. ++.IP "\fBuse\ slp\fP" ++This parameter is used to determine if the module names are advertised ++via slp. The default is disabled, which won't advertise your public ++modules. + .IP "\fBslp\ refresh\fP" + This parameter is used to determine how long service advertisements are + valid (measured in seconds), and is only applicable if you have Service diff --git a/rsync-avoid-uploading-after-error.patch b/rsync-avoid-uploading-after-error.patch deleted file mode 100644 index 6de8649..0000000 --- a/rsync-avoid-uploading-after-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugzilla.samba.org/show_bug.cgi?id=12525#c1 - ---- cleanup.c.orig 2017-01-18 14:53:35.000000000 +0100 -+++ cleanup.c 2017-01-18 14:56:58.000000000 +0100 -@@ -255,7 +255,7 @@ - } - if (!am_sender) - io_flush(MSG_FLUSH); /* Be sure to send all messages */ -- noop_io_until_death(); -+ /* noop_io_until_death(); */ - } - else if (!am_sender) - io_flush(MSG_FLUSH); /* Be sure to send all messages */ diff --git a/rsync-both-compressions.patch b/rsync-both-compressions.patch deleted file mode 100644 index 720a635..0000000 --- a/rsync-both-compressions.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index e01e124b..4ee4083e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -794,7 +794,8 @@ else - AC_MSG_RESULT(no) - fi - --# We default to using our zlib unless --with-included-zlib=no is given. -+# Always compile with system zlib but if --with-included-zlib=yes is given -+# or not specified at all compile in the support too. - if test x"$with_included_zlib" != x"no"; then - with_included_zlib=yes - elif test x"$ac_cv_header_zlib_h" != x"yes"; then -@@ -810,7 +811,6 @@ if test x"$with_included_zlib" = x"yes"; then - BUILD_ZLIB='$(zlib_OBJS)' - CFLAGS="-I$srcdir/zlib $CFLAGS" - else -- AC_DEFINE(EXTERNAL_ZLIB, 1, [Define to 1 if using external zlib]) - AC_MSG_RESULT(no) - fi - -diff --git a/options.c b/options.c -index 64ec8b84..522875c5 100644 ---- a/options.c -+++ b/options.c -@@ -1866,16 +1866,6 @@ int parse_arguments(int *argc_p, const char ***argv_p) - create_refuse_error(refused_compress); - return 0; - } --#ifdef EXTERNAL_ZLIB -- if (do_compression == 1) { -- snprintf(err_buf, sizeof err_buf, -- "This rsync lacks old-style --compress due to its external zlib. Try -zz.\n"); -- if (am_server) -- return 0; -- fprintf(stderr, "%s" "Continuing without compression.\n\n", err_buf); -- do_compression = 0; -- } --#endif - } - - #ifdef HAVE_SETVBUF -diff --git a/token.c b/token.c -index ad9b9bcd..34bc331f 100644 ---- a/token.c -+++ b/token.c -@@ -23,6 +23,10 @@ - #include "itypes.h" - #include - -+#ifndef Z_INSERT_ONLY -+#define Z_INSERT_ONLY Z_SYNC_FLUSH -+#endif -+ - extern int do_compression; - extern int protocol_version; - extern int module_id; -@@ -405,7 +409,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 - * history and hash table. */ --#ifndef EXTERNAL_ZLIB - do { - /* Break up long sections in the same way that - * see_deflate_token() does. */ -@@ -424,11 +427,6 @@ send_deflated_token(int f, int32 token, struct map_struct *buf, OFF_T offset, - exit_cleanup(RERR_STREAMIO); - } - } while (toklen > 0); --#else -- toklen++; -- rprintf(FERROR, "Impossible error in external-zlib code (1).\n"); -- exit_cleanup(RERR_STREAMIO); --#endif - } - } - -@@ -579,7 +577,6 @@ static int32 recv_deflated_token(int f, char **data) - */ - static void see_deflate_token(char *buf, int32 len) - { --#ifndef EXTERNAL_ZLIB - int r; - int32 blklen; - unsigned char hdr[5]; -@@ -617,11 +614,6 @@ static void see_deflate_token(char *buf, int32 len) - exit_cleanup(RERR_STREAMIO); - } - } while (len || rx_strm.avail_out == 0); --#else -- buf++; len++; -- rprintf(FERROR, "Impossible error in external-zlib code (2).\n"); -- exit_cleanup(RERR_STREAMIO); --#endif - } - - /** diff --git a/rsync-fix-prealloc-to-keep-file-size-0-when-possible.patch b/rsync-fix-prealloc-to-keep-file-size-0-when-possible.patch deleted file mode 100644 index 9c07870..0000000 --- a/rsync-fix-prealloc-to-keep-file-size-0-when-possible.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c2da3809f714d936dec1cab6d5bf8b724b9cd113 Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Tue, 15 Jan 2019 08:51:08 -0800 -Subject: [PATCH] Fix --prealloc to keep file-size 0 when possible. - ---- - syscall.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/syscall.c b/syscall.c -index dbd556b8..0d1221b3 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -462,7 +462,7 @@ int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec)) - - OFF_T do_fallocate(int fd, OFF_T offset, OFF_T length) - { -- int opts = inplace || preallocate_files ? 0 : DO_FALLOC_OPTIONS; -+ int opts = inplace || preallocate_files ? DO_FALLOC_OPTIONS : 0; - int ret; - RETURN_ERROR_IF(dry_run, 0); - RETURN_ERROR_IF_RO_OR_LO; --- -2.16.4 - diff --git a/rsync-no-libattr.patch b/rsync-no-libattr.patch index 0c68c9e..9410aab 100644 --- a/rsync-no-libattr.patch +++ b/rsync-no-libattr.patch @@ -1,6 +1,8 @@ ---- rsync-3.1.1.orig/configure.ac -+++ rsync-3.1.1/configure.ac -@@ -1050,7 +1050,7 @@ else +Index: rsync-3.2.2/configure.ac +=================================================================== +--- rsync-3.2.2.orig/configure.ac ++++ rsync-3.2.2/configure.ac +@@ -1309,7 +1309,7 @@ else AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs (or equivalent)]) AC_DEFINE(SUPPORT_XATTRS, 1) AC_DEFINE(NO_SYMLINK_USER_XATTRS, 1, [True if symlinks do not support user xattrs]) diff --git a/rsync-patches-3.1.3.tar.gz b/rsync-patches-3.1.3.tar.gz deleted file mode 100644 index 6060821..0000000 --- a/rsync-patches-3.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dc2848f20ca75c07a30c3237ccf8d61b61082ae7de94758a27dac350c99fb98 -size 174524 diff --git a/rsync-patches-3.1.3.tar.gz.asc b/rsync-patches-3.1.3.tar.gz.asc deleted file mode 100644 index fbc501e..0000000 --- a/rsync-patches-3.1.3.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlpuY4gACgkQbIWfsUuWqMWGSwCfXA4JjLY1S1lrFUV9EwzBLoFh -YMYAn07BGWQj08NJfz8HMQirEfiqNj8W -=QEC2 ------END PGP SIGNATURE----- diff --git a/rsync-patches-3.2.2.tar.gz b/rsync-patches-3.2.2.tar.gz new file mode 100644 index 0000000..d5b83b4 --- /dev/null +++ b/rsync-patches-3.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eeccf4c7f178c936e451b679e64b670f707b989b7a40e2d22286407f8987ae9a +size 286274 diff --git a/rsync-patches-3.2.2.tar.gz.asc b/rsync-patches-3.2.2.tar.gz.asc new file mode 100644 index 0000000..f9145ef --- /dev/null +++ b/rsync-patches-3.2.2.tar.gz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQASMiwJtTJbw5YnC9shZ+xS5aoxQUCXwFv0gAKCRBshZ+xS5ao +xSPwAKDnfIn1dpWr0cs76vc4iMOeZZhEsACfUqZ/NLjutRI5GWBaenyJ9xj1cPM= +=0BMf +-----END PGP SIGNATURE----- diff --git a/rsync-send_error_to_sender.patch b/rsync-send_error_to_sender.patch deleted file mode 100644 index e4b1f67..0000000 --- a/rsync-send_error_to_sender.patch +++ /dev/null @@ -1,73 +0,0 @@ -https://bugzilla.samba.org/show_bug.cgi?id=12522#c2 - -Index: rsync.h -=================================================================== ---- rsync.h.orig -+++ rsync.h -@@ -167,6 +167,7 @@ - #define ATTRS_SKIP_MTIME (1<<1) - #define ATTRS_SET_NANO (1<<2) - -+#define MSG_FLUSH 2 - #define FULL_FLUSH 1 - #define NORMAL_FLUSH 0 - -Index: io.c -=================================================================== ---- io.c.orig -+++ io.c -@@ -1994,10 +1994,11 @@ static void sleep_for_bwlimit(int bytes_ - void io_flush(int flush_it_all) - { - if (iobuf.out.len > iobuf.out_empty_len) { -- if (flush_it_all) /* FULL_FLUSH: flush everything in the output buffers */ -+ if (flush_it_all == FULL_FLUSH) /* flush everything in the output buffers */ - perform_io(iobuf.out.size - iobuf.out_empty_len, PIO_NEED_OUTROOM); -- else /* NORMAL_FLUSH: flush at least 1 byte */ -+ else if (flush_it_all == NORMAL_FLUSH) /* flush at least 1 byte */ - perform_io(iobuf.out.size - iobuf.out.len + 1, PIO_NEED_OUTROOM); -+ /* MSG_FLUSH: flush iobuf.msg only */ - } - if (iobuf.msg.len) - perform_io(iobuf.msg.size, PIO_NEED_MSGROOM); -Index: cleanup.c -=================================================================== ---- cleanup.c.orig -+++ cleanup.c -@@ -26,6 +26,7 @@ extern int dry_run; - extern int am_server; - extern int am_daemon; - extern int am_receiver; -+extern int am_sender; - extern int io_error; - extern int keep_partial; - extern int got_xfer_error; -@@ -243,15 +244,21 @@ NORETURN void _exit_cleanup(int code, co - switch_step++; - - if (exit_code && exit_code != RERR_SOCKETIO && exit_code != RERR_STREAMIO && exit_code != RERR_SIGNAL1 -- && exit_code != RERR_TIMEOUT && !shutting_down && (protocol_version >= 31 || am_receiver)) { -- if (line > 0) { -- if (DEBUG_GTE(EXIT, 3)) { -- rprintf(FINFO, "[%s] sending MSG_ERROR_EXIT with exit_code %d\n", -- who_am_i(), exit_code); -+ && exit_code != RERR_TIMEOUT && !shutting_down) { -+ if (protocol_version >= 31 || am_receiver) { -+ if (line > 0) { -+ if (DEBUG_GTE(EXIT, 3)) { -+ rprintf(FINFO, "[%s] sending MSG_ERROR_EXIT with exit_code %d\n", -+ who_am_i(), exit_code); -+ } -+ send_msg_int(MSG_ERROR_EXIT, exit_code); - } -- send_msg_int(MSG_ERROR_EXIT, exit_code); -+ if (!am_sender) -+ io_flush(MSG_FLUSH); /* Be sure to send all messages */ -+ noop_io_until_death(); - } -- noop_io_until_death(); -+ else if (!am_sender) -+ io_flush(MSG_FLUSH); /* Be sure to send all messages */ - } - - /* FALLTHROUGH */ diff --git a/rsync.changes b/rsync.changes index ecff902..d723345 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Jul 7 08:59:17 UTC 2020 - Ismail Dönmez + +- Updated to version 3.2.2 + * Too many changes to list, see included NEWS.md file. +- Add BR on pkgconfig(openssl), rsync now uses openssl for MD4/MD5 +- Add BR on libzstd-devel and liblz4-devel to enabled lz4 and zstd + compression support. +- Add BR on xxhash-devel to enable xxhash checksum support. +- Refresh rsync-add_back_use_slp_directive.patch +- Drop rsync-both-compressions.patch, rsync-send_error_to_sender.patch, + rsync-avoid-uploading-after-error.patch, + rsync-fix-prealloc-to-keep-file-size-0-when-possible.patch: + Fixed upstream. + ------------------------------------------------------------------- Thu Jul 11 06:04:07 UTC 2019 - Antoine Belvire diff --git a/rsync.spec b/rsync.spec index bbb91af..465219e 100644 --- a/rsync.spec +++ b/rsync.spec @@ -1,7 +1,7 @@ # # spec file for package rsync # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: rsync -Version: 3.1.3 +Version: 3.2.2 Release: 0 Summary: Versatile tool for fast incremental file transfer License: GPL-3.0-or-later Group: Productivity/Networking/Other -Url: http://rsync.samba.org/ +URL: https://rsync.samba.org/ Source: http://rsync.samba.org/ftp/rsync/src/rsync-%{version}.tar.gz Source1: http://rsync.samba.org/ftp/rsync/src/rsync-patches-%{version}.tar.gz Source2: logrotate.rsync @@ -38,19 +38,18 @@ Source12: %{name}.keyring Patch0: rsync-no-libattr.patch #PATCH-FIX-SUSE boo#922710 slp Patch1: rsync-add_back_use_slp_directive.patch -Patch2: rsync-both-compressions.patch -#PATCH-FIX-UPSTREAM bsc#1062063 rsync doesn't stop on errors -Patch4: rsync-send_error_to_sender.patch -Patch5: rsync-avoid-uploading-after-error.patch -#PATCH-FIX-UPSTREAM bsc#1108562 file contents cause rsync to fail -Patch6: rsync-fix-prealloc-to-keep-file-size-0-when-possible.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libacl-devel +BuildRequires: liblz4-devel +BuildRequires: libzstd-devel BuildRequires: openslp-devel +BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: systemd-rpm-macros +BuildRequires: xxhash-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig(openssl) Requires(post): grep Requires(post): sed Recommends: logrotate @@ -68,17 +67,16 @@ for backups and mirroring and as an improved copy command for everyday use. %prep %setup -q -b 1 rm -f zlib/*.h + patch -p1 < patches/acls.diff patch -p1 < patches/xattrs.diff patch -p1 < patches/slp.diff -%patch1 -p1 + # fate#312479 patch -p1 < patches/time-limit.diff + %patch0 -p1 -%patch2 -p1 -%patch4 -%patch5 -%patch6 -p1 +%patch1 -p1 %build autoreconf -fiv @@ -91,11 +89,11 @@ export LDFLAGS="-Wl,-z,relro,-z,now -pie" --enable-slp \ --enable-acl-support \ --enable-xattr-support -make %{?_smp_mflags} reconfigure -make %{?_smp_mflags} +%make_build reconfigure +%make_build %check -make %{?_smp_mflags} check +%make_build check %install %make_install @@ -103,9 +101,9 @@ rm -f %{buildroot}%{_sbindir}/rsyncd install -d %{buildroot}%{_sysconfdir}/logrotate.d install -d %{buildroot}%{_sysconfdir}/init.d install -d %{buildroot}%{_sysconfdir}/xinetd.d -install -d %{buildroot}%{_prefix}/sbin +install -d %{buildroot}%{_sbindir} ln -sf ../bin/rsync %{buildroot}%{_sbindir}/rsyncd -install -m 755 support/rsyncstats %{buildroot}%{_prefix}/bin +install -m 755 support/rsyncstats %{buildroot}%{_bindir} install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/rsync install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/rsyncd.conf install -m 600 %{SOURCE6} %{buildroot}%{_sysconfdir}/rsyncd.secrets @@ -127,6 +125,8 @@ ln -sf service %{buildroot}%{_sbindir}/rcrsyncd %service_del_postun rsyncd.service %files +%license COPYING +%doc NEWS.md README.md tech_report.tex %{_unitdir}/rsyncd@.service %{_unitdir}/rsyncd.service %{_unitdir}/rsyncd.socket @@ -137,9 +137,9 @@ ln -sf service %{buildroot}%{_sbindir}/rcrsyncd %{_sbindir}/rsyncd %{_bindir}/rsyncstats %{_bindir}/rsync -%{_mandir}/man1/rsync.1%{ext_man} -%{_mandir}/man5/rsyncd.conf.5%{ext_man} -%license COPYING -%doc NEWS README tech_report.tex +%{_bindir}/rsync-ssl +%{_mandir}/man1/rsync.1%{?ext_man} +%{_mandir}/man1/rsync-ssl.1%{?ext_man} +%{_mandir}/man5/rsyncd.conf.5%{?ext_man} %changelog