Update rsync to v3.2.3 (#1887)

* Update rsync to v3.2.3

* Fix linting

* Disable inbuilt zlib

SPECS/rsync/rsync.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "rsync-3.1.3.tar.gz": "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0"
+  "rsync-3.2.3.tar.gz": "becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e"
  }
 }

SPECS/rsync/rsync.spec

@@ -1,25 +1,28 @@
 Summary:        Fast incremental file transfer.
 Name:           rsync
-Version:        3.1.3
-Release:        5%{?dist}
+Version:        3.2.3
+Release:        1%{?dist}
 License:        GPLv3+
-URL:            https://rsync.samba.org/
-Source0:        https://download.samba.org/pub/rsync/src/%{name}-%{version}.tar.gz
-# This vulnerability is fixed in upstream source
-Patch0:         CVE-2017-16548.nopatch
-Group:          Appication/Internet
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-BuildRequires:  zlib-devel
+Group:          Appication/Internet
+URL:            https://rsync.samba.org/
+Source0:        https://download.samba.org/pub/rsync/src/%{name}-%{version}.tar.gz
+BuildRequires:  lz4-devel
 BuildRequires:  systemd
-Requires:       zlib
+BuildRequires:  zlib-devel
+Requires:       lz4
 Requires:       systemd
+Requires:       zlib
+
 %description
 Rsync is a fast and extraordinarily versatile file copying tool. It can copy locally, to/from another host over any remote shell, or to/from a remote rsync daemon. It offers a large number of options that control every aspect of its behavior and permit very flexible specification of the set of files to be copied. It is famous for its delta-transfer algorithm, which reduces the amount of data sent over the network by sending only the differences between the source files and the existing files in the destination. Rsync is widely used for backups and mirroring and as an improved copy command for everyday use.
+
 %prep
 %setup -q
+
 %build
-%configure --with-included-zlib=no
+%configure --with-included-zlib=no --disable-xxhash
 make %{?_smp_mflags}
 
 %install
@@ -32,10 +35,10 @@ cat << EOF >> %{buildroot}/%{_libdir}/systemd/system/rsyncd.service
 [Unit]
 Description=Rsync Server
 After=local-fs.target
-ConditionPathExists=/etc/rsyncd.conf
+ConditionPathExists=%{_sysconfdir}/rsyncd.conf
 
 [Service]
-ExecStart=/usr/bin/rsync --daemon --no-detach
+ExecStart=%{_bindir}/rsync --daemon --no-detach
 
 [Install]
 WantedBy=multi-user.target
@@ -44,42 +47,55 @@ EOF
 %check
 make %{?_smp_mflags} check
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %license COPYING
 %exclude %{_libdir}/debug
-%exclude /usr/src/debug
+%exclude %{_prefix}/src/debug
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_libdir}/systemd/system/rsyncd.service
 %{_sysconfdir}/rsyncd.conf
+
 %changelog
+* Tue Jan 11 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 3.2.3-1
+- Update to version 3.2.3.
+
 * Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 3.1.3-5
 - Added %%license line automatically
 
-*   Wed Apr 22 2020 Nicolas Ontiveros <niontive@microsoft.com> 3.1.3-4
--   Fixed CVE-2017-16548.
--   Remove sha1 macro.
--   License verified.
-*   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.1.3-3
--   Initial CBL-Mariner import from Photon (license: Apache2).
-*   Mon Oct 15 2018 Ankit Jain <ankitja@vmware.com> 3.1.3-2
--   Building rsync with system zlib instead of outdated zlib in rsync source
-*   Tue May 01 2018 Xiaolin Li <xiaolinl@vmware.com> 3.1.3-1
--   Updated to version 3.1.3, fix CVE-2018-5764
-*   Wed Dec 27 2017 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-5
--   Fix CVE-2017-17433, CVE-2017-17434
-*   Wed Nov 29 2017 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-4
--   Fix CVE-2017-16548
-*   Wed Oct 05 2016 ChangLee <changlee@vmware.com> 3.1.2-3
--   Modified %check
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.1.2-2
--   GA - Bump release of all rpms
-*   Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-1
--   Updated to version 3.1.2
-*   Mon Dec 14 2015 Xiaolin Li < xiaolinl@vmware.com> 3.1.1-1
--   Initial build. First version
+* Wed Apr 22 2020 Nicolas Ontiveros <niontive@microsoft.com> 3.1.3-4
+- Fixed CVE-2017-16548.
+- Remove sha1 macro.
+- License verified.
+
+* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.1.3-3
+- Initial CBL-Mariner import from Photon (license: Apache2).
+
+* Mon Oct 15 2018 Ankit Jain <ankitja@vmware.com> 3.1.3-2
+- Building rsync with system zlib instead of outdated zlib in rsync source
+
+* Tue May 01 2018 Xiaolin Li <xiaolinl@vmware.com> 3.1.3-1
+- Updated to version 3.1.3, fix CVE-2018-5764
+
+* Wed Dec 27 2017 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-5
+- Fix CVE-2017-17433, CVE-2017-17434
+
+* Wed Nov 29 2017 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-4
+- Fix CVE-2017-16548
+
+* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 3.1.2-3
+- Modified %check
+
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.1.2-2
+- GA - Bump release of all rpms
+
+* Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-1
+- Updated to version 3.1.2
+
+* Mon Dec 14 2015 Xiaolin Li < xiaolinl@vmware.com> 3.1.1-1
+- Initial build. First version

cgmanifest.json

@@ -25455,8 +25455,8 @@
         "type": "other",
         "other": {
           "name": "rsync",
-          "version": "3.1.3",
-          "downloadUrl": "https://download.samba.org/pub/rsync/src/rsync-3.1.3.tar.gz"
+          "version": "3.2.3",
+          "downloadUrl": "https://download.samba.org/pub/rsync/src/rsync-3.2.3.tar.gz"
         }
       }
     },