Hello community, here is the log from the commit of package rsync for openSUSE:Factory checked in at 2020-07-15 11:20:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsync (Old) and /work/SRC/openSUSE:Factory/.rsync.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsync" Wed Jul 15 11:20:45 2020 rev:71 rq:819203 version:3.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/rsync/rsync.changes 2019-07-16 08:37:21.571240869 +0200 +++ /work/SRC/openSUSE:Factory/.rsync.new.3060/rsync.changes 2020-07-15 11:22:38.277455114 +0200 @@ -1,0 +2,15 @@ +Tue Jul 7 08:59:17 UTC 2020 - Ismail Dönmez <[email protected]> + +- 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. + +------------------------------------------------------------------- Old: ---- rsync-3.1.3.tar.gz rsync-3.1.3.tar.gz.asc rsync-avoid-uploading-after-error.patch rsync-both-compressions.patch rsync-fix-prealloc-to-keep-file-size-0-when-possible.patch rsync-patches-3.1.3.tar.gz rsync-patches-3.1.3.tar.gz.asc rsync-send_error_to_sender.patch New: ---- rsync-3.2.2.tar.gz rsync-3.2.2.tar.gz.asc rsync-patches-3.2.2.tar.gz rsync-patches-3.2.2.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsync.spec ++++++ --- /var/tmp/diff_new_pack.lmaImg/_old 2020-07-15 11:22:41.309458115 +0200 +++ /var/tmp/diff_new_pack.lmaImg/_new 2020-07-15 11:22:41.313458119 +0200 @@ -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 @@ 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 @@ %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 @@ --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 @@ 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 @@ %service_del_postun rsyncd.service %files +%license COPYING +%doc NEWS.md README.md tech_report.tex %{_unitdir}/[email protected] %{_unitdir}/rsyncd.service %{_unitdir}/rsyncd.socket @@ -137,9 +137,9 @@ %{_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 ++++++ rsync-3.1.3.tar.gz -> rsync-3.2.2.tar.gz ++++++ ++++ 61053 lines of diff (skipped) ++++++ rsync-add_back_use_slp_directive.patch ++++++ --- /var/tmp/diff_new_pack.lmaImg/_old 2020-07-15 11:22:41.605458408 +0200 +++ /var/tmp/diff_new_pack.lmaImg/_new 2020-07-15 11:22:41.609458412 +0200 @@ -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,109 +11,82 @@ 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; - -@@ -181,6 +182,10 @@ static const all_vars Defaults = { - - /* 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}, +--- 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. -@@ -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 -=================================================================== ---- 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. - -+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 -=================================================================== ---- 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 - 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.1.1/main.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/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 * +--- 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"); -+ } ++ 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 +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.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 ++++++ rsync-no-libattr.patch ++++++ --- /var/tmp/diff_new_pack.lmaImg/_old 2020-07-15 11:22:41.617458420 +0200 +++ /var/tmp/diff_new_pack.lmaImg/_new 2020-07-15 11:22:41.617458420 +0200 @@ -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]) ++++++ rsync-patches-3.1.3.tar.gz -> rsync-patches-3.2.2.tar.gz ++++++ ++++ 24335 lines of diff (skipped)
