#
# Conditional build:
%bcond_with rsh # set remote shell command to rsh instead of ssh (old behaviour)
-%bcond_with fadvise # apply fadvise patch
+%bcond_without fadvise # apply fadvise patch
%bcond_with tests # perform "make test"
#
%ifarch alpha
Summary(zh_TW.UTF-8): [喙啪]\e$(B6G?i火(c\e(B
Name: rsync
Version: 3.1.3
-Release: 1
+Release: 4
Epoch: 1
License: GPL v3+
Group: Networking/Utilities
Source0: https://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz
# Source0-md5: 1581a588fde9d89f6bc6201e8129afaf
-Source1: https://rsync.samba.org/ftp/rsync/rsync-patches-%{version}.tar.gz
+Source1: https://rsync.samba.org/ftp/rsync/%{name}-patches-%{version}.tar.gz
# Source1-md5: 753fc37ffc277571c69135e8bc5fae9d
Source2: %{name}.inet
Source3: %{name}.init
Source4: %{name}.sysconfig
Source5: %{name}d.logrotate
+Patch100: %{name}-fixes.patch
Patch0: %{name}-config.patch
-Patch1: https://tobi.oetiker.ch/patches/rsync-3.1.2-1-fadvise.patch
-# Patch1-md5: b055468e7cbc5d829aa943f07916d458
-Patch2: rsync-noatime.patch
+Patch1: %{name}-fadvise.patch
+Patch2: %{name}-noatime.patch
+Patch3: CVE-2016-9840.patch
+Patch4: CVE-2016-9841.patch
+Patch5: CVE-2016-9842.patch
+Patch6: CVE-2016-9843.patch
URL: https://rsync.samba.org/
BuildRequires: acl-devel
BuildRequires: autoconf >= 2.59
%prep
%setup -q -b1
+%patch100 -p1
%patch0 -p1
%{?with_fadvise:%patch1 -p1}
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
# for compat with previous patched version
patch -p1 -i patches/acls.diff || exit 1
#RSYNC_PASSWORD=
EOF
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/rsyncd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/rsyncd
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rsyncd
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/rsyncd
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/rsyncd
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/rsyncd
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rsyncd
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/rsyncd
%clean
rm -rf $RPM_BUILD_ROOT