|
@@ -1,8 +1,8 @@
|
|
|
Summary: A program for synchronizing files over a network.
|
|
Summary: A program for synchronizing files over a network.
|
|
|
Summary(ja): ネットワーク越しにファイルを同期させるプログラム
|
|
Summary(ja): ネットワーク越しにファイルを同期させるプログラム
|
|
|
Name: rsync
|
|
Name: rsync
|
|
|
-Version: 3.1.1
|
|
+Version: 3.1.2
|
|
|
-Release: 2%{_dist_release}
|
|
+Release: 1%{_dist_release}
|
|
|
Group: Applications/Internet
|
|
Group: Applications/Internet
|
|
|
License: GPLv3+
|
|
License: GPLv3+
|
|
|
URL: http://rsync.samba.org
|
|
URL: http://rsync.samba.org
|
|
@@ -12,7 +12,10 @@ Source2: rsync.xinetd
|
|
|
|
|
|
|
|
Patch0: ssh-6-option.diff
|
|
Patch0: ssh-6-option.diff
|
|
|
# security fixes
|
|
# security fixes
|
|
|
-Patch100: rsync_CVE-2014-9512.patch
|
|
+Patch100: 0001-Enforce-trailing-0-when-receiving-xattr-name-values.patch
|
|
|
|
|
+Patch110: 0002-Check-fname-in-recv_files-sooner.patch
|
|
|
|
|
+Patch120: 0003-Sanitize-xname-in-read_ndx_and_attrs.patch
|
|
|
|
|
+Patch130: 0004-Check-daemon-filter-against-fnamecmp-in-recv_files.patch
|
|
|
|
|
|
|
|
Prefix: %{_prefix}
|
|
Prefix: %{_prefix}
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
@@ -57,14 +60,17 @@ patch -p1 -i patches/copy-devices.diff
|
|
|
|
|
|
|
|
%patch0 -p1 -b .man
|
|
%patch0 -p1 -b .man
|
|
|
# security fixes
|
|
# security fixes
|
|
|
-%patch100 -p1 -b .CVE-2014-9512
|
|
+%patch100 -p1
|
|
|
|
|
+%patch110 -p1
|
|
|
|
|
+%patch120 -p1
|
|
|
|
|
+%patch130 -p1
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
|
autoreconf
|
|
autoreconf
|
|
|
-%configure
|
|
+# %configure
|
|
|
|
|
+make reconfigure
|
|
|
make %{?_smp_mflags} CCOPTFLAGS="$RPM_OPT_FLAGS"
|
|
make %{?_smp_mflags} CCOPTFLAGS="$RPM_OPT_FLAGS"
|
|
|
|
|
|
|
|
-
|
|
|
|
|
%install
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
@@ -88,6 +94,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
|
+* Sat Jan 13 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 3.1.2-1
|
|
|
|
|
+- update to 3.1.2
|
|
|
|
|
+- add patch100-130 to fix security issue from debian
|
|
|
|
|
+- use make reconfigure in build section
|
|
|
|
|
+
|
|
|
* Sat Nov 14 2015 Toshiharu Kudoh <toshi.kd2@gmail.com> 3.1.1-2
|
|
* Sat Nov 14 2015 Toshiharu Kudoh <toshi.kd2@gmail.com> 3.1.1-2
|
|
|
- added Patch100 to fix CVE-2014-9512
|
|
- added Patch100 to fix CVE-2014-9512
|
|
|
|
|
|
iwamoto