diff --git a/rsync-3.2.2.tar.gz b/rsync-3.2.2.tar.gz deleted file mode 100644 index ff94878..0000000 --- a/rsync-3.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index c5e1084..0000000 --- a/rsync-3.2.2.tar.gz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQQASMiwJtTJbw5YnC9shZ+xS5aoxQUCXwFv0gAKCRBshZ+xS5ao -xeEqAKCbN2BJh4xPRy8h5+WEjMZ5dvMcugCeJh7dvnYDLZPFVvRkiKW+APQe+e8= -=mREY ------END PGP SIGNATURE----- diff --git a/rsync-3.2.3.tar.gz b/rsync-3.2.3.tar.gz new file mode 100644 index 0000000..5dfab68 --- /dev/null +++ b/rsync-3.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e +size 1069784 diff --git a/rsync-3.2.3.tar.gz.asc b/rsync-3.2.3.tar.gz.asc new file mode 100644 index 0000000..e08605a --- /dev/null +++ b/rsync-3.2.3.tar.gz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQASMiwJtTJbw5YnC9shZ+xS5aoxQUCXyzRugAKCRBshZ+xS5ao +xa7uAJ0fzldqVXlP3AiBI1PBJISTn/VjpQCfVBo0o0veH0KZZJyCcEmfTggiJDc= +=ck3O +-----END PGP SIGNATURE----- diff --git a/rsync-add_back_use_slp_directive.patch b/rsync-add_back_use_slp_directive.patch deleted file mode 100644 index 414147a..0000000 --- a/rsync-add_back_use_slp_directive.patch +++ /dev/null @@ -1,92 +0,0 @@ -Index: rsync-3.2.2/clientserver.c -=================================================================== ---- 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 -- if (register_services()) { -+ if (lp_use_slp() && register_services()) { - rprintf(FINFO, - "Couldn't register with service discovery protocol, continuing anyway\n"); - } -Index: rsync-3.2.2/daemon-parm.txt -=================================================================== ---- 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 - - BOOL proxy_protocol False - -Index: rsync-3.2.2/rsyncd.conf.5.md -=================================================================== ---- 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. - -+0. `use slp` -+ -+ 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.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; -- short slp_timeout = lp_slp_refresh(); -+ short slp_timeout = lp_use_slp() ? lp_slp_refresh() : 0; - if (slp_timeout) { - if (slp_timeout < SLP_MIN_TIMEOUT) - slp_timeout = SLP_MIN_TIMEOUT; -Index: rsync-3.2.2/rsyncd.conf.5 -=================================================================== ---- 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-patches-3.2.2.tar.gz b/rsync-patches-3.2.2.tar.gz deleted file mode 100644 index d5b83b4..0000000 --- a/rsync-patches-3.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index f9145ef..0000000 --- a/rsync-patches-3.2.2.tar.gz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQQASMiwJtTJbw5YnC9shZ+xS5aoxQUCXwFv0gAKCRBshZ+xS5ao -xSPwAKDnfIn1dpWr0cs76vc4iMOeZZhEsACfUqZ/NLjutRI5GWBaenyJ9xj1cPM= -=0BMf ------END PGP SIGNATURE----- diff --git a/rsync-patches-3.2.3.tar.gz b/rsync-patches-3.2.3.tar.gz new file mode 100644 index 0000000..2b45f66 --- /dev/null +++ b/rsync-patches-3.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de6645b46967bd701b7d6f3e29cccb19d2b46a6fa2d26a9db165847dca0e42f2 +size 157092 diff --git a/rsync-patches-3.2.3.tar.gz.asc b/rsync-patches-3.2.3.tar.gz.asc new file mode 100644 index 0000000..c3fd266 --- /dev/null +++ b/rsync-patches-3.2.3.tar.gz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQASMiwJtTJbw5YnC9shZ+xS5aoxQUCXyzRugAKCRBshZ+xS5ao +xa2oAKDaZfy8axuxsYyrrY+tkygSagjFjwCgk0MMptlzjWEJ23ogzrTQ4E7Eb6c= +=I7Yo +-----END PGP SIGNATURE----- diff --git a/rsync.changes b/rsync.changes index d723345..b2c14f2 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,10 +1,34 @@ +------------------------------------------------------------------- +Fri Aug 7 06:47:00 UTC 2020 - Ismail Dönmez + +- Updated to version 3.2.3 + * Fixes a memory usage regression introduced in 3.2.2 + * Too many changes to list, see included NEWS.md file. +- acls.diff, time-limit.diff and xattrs.diff are now upstream. +- Drop rsync-add_back_use_slp_directive.patch, included in upstream + slp.diff + +------------------------------------------------------------------- +Wed Aug 5 05:23:42 UTC 2020 - Ismail Dönmez + +- Add BR on c++_compiler needed for SIMD support +- Add --enable-simd configure option on x86_64 + +------------------------------------------------------------------- +Wed Aug 5 05:10:51 UTC 2020 - Ismail Dönmez + +- Change BR on xxhash-devel to pkgconfig(libxxhash) and depend + on xxhash >= 0.8.0 since this is needed for XXH3 +- Use xxhash only on suse_version >= 1550 since xxhash 0.8.0 is not + available elsewhere. + ------------------------------------------------------------------- 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 +- Add BR on libzstd-devel and liblz4-devel to enable lz4 and zstd compression support. - Add BR on xxhash-devel to enable xxhash checksum support. - Refresh rsync-add_back_use_slp_directive.patch diff --git a/rsync.spec b/rsync.spec index 465219e..e03c8ac 100644 --- a/rsync.spec +++ b/rsync.spec @@ -16,8 +16,14 @@ # +%if 0%{?suse_version} >= 1550 +%bcond_without xxhash +%else +%bcond_with xxhash +%endif + Name: rsync -Version: 3.2.2 +Version: 3.2.3 Release: 0 Summary: Versatile tool for fast incremental file transfer License: GPL-3.0-or-later @@ -36,10 +42,9 @@ Source10: http://rsync.samba.org/ftp/rsync/src/rsync-%{version}.tar.gz.asc Source11: http://rsync.samba.org/ftp/rsync/src/rsync-patches-%{version}.tar.gz.asc Source12: %{name}.keyring Patch0: rsync-no-libattr.patch -#PATCH-FIX-SUSE boo#922710 slp -Patch1: rsync-add_back_use_slp_directive.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: c++_compiler BuildRequires: libacl-devel BuildRequires: liblz4-devel BuildRequires: libzstd-devel @@ -47,8 +52,10 @@ BuildRequires: openslp-devel BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: systemd-rpm-macros -BuildRequires: xxhash-devel BuildRequires: zlib-devel +%if %{with xxhash} +BuildRequires: pkgconfig(libxxhash) >= 0.8.0 +%endif BuildRequires: pkgconfig(openssl) Requires(post): grep Requires(post): sed @@ -68,24 +75,24 @@ for backups and mirroring and as an improved copy command for everyday use. %setup -q -b 1 rm -f zlib/*.h -patch -p1 < patches/acls.diff -patch -p1 < patches/xattrs.diff patch -p1 < patches/slp.diff -# fate#312479 -patch -p1 < patches/time-limit.diff - %patch0 -p1 -%patch1 -p1 %build autoreconf -fiv export CFLAGS="%{optflags} -fPIC -DPIC -fPIE" -export LDFLAGS="-Wl,-z,relro,-z,now -pie" +export LDFLAGS="-Wl,-z,relro,-z,now -fPIE -pie" %configure \ --with-included-popt=no \ --with-included-zlib=no \ --disable-debug \ +%if !%{with xxhash} + --disable-xxhash\ +%endif +%ifarch x86_64 + --enable-simd \ +%endif --enable-slp \ --enable-acl-support \ --enable-xattr-support