Browse Source

rsync: security fix

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8544 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 10 years ago
parent
commit
acd7d7a57a
1 changed files with 9 additions and 5 deletions
  1. 9 5
      r/rsync/rsync-vl.spec

+ 9 - 5
r/rsync/rsync-vl.spec

@@ -2,7 +2,7 @@ Summary:     A program for synchronizing files over a network.
 Summary(ja): ネットワーク越しにファイルを同期させるプログラム
 Name: rsync
 Version: 3.1.0
-Release: 1%{_dist_release}
+Release: 2%{_dist_release}
 Group: Applications/Internet
 License: GPLv3+
 URL: http://rsync.samba.org
@@ -12,7 +12,7 @@ Source2: rsync.xinetd
 
 Patch0: ssh-6-option.diff
 # security fixes
-# Patch100: rsync-3.0.7_CVE-2011-1097.patch
+Patch100: rsync-3.1.1-dos.patch
 
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -21,6 +21,7 @@ BuildRequires: libacl-devel libattr-devel popt-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
+Packager: daisuke
 
 %description
 Rsync uses a quick and reliable algorithm to very quickly bring
@@ -54,9 +55,9 @@ patch -p1 -i patches/xattrs.diff
 #Enable --copy-devices parameter
 patch -p1 -i patches/copy-devices.diff
 
-%patch0 -p1
+%patch0 -p1 -b .man
 # security fixes
-# %patch100 -p1 -b .CVE-2011-1097
+%patch100 -p1 -b .CVE-2011-1097
 
 %build
 autoreconf
@@ -87,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 11 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 3.1.0-2
+- add Patch100 to fix CVE-2014-2855
+
 * Sat Nov 23 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> 3.1.0-1
 - new upstream release
 
@@ -129,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 - add Patch10 for CVE-2007-4091
   (rsync "f_name()" Function Directory Name Handling Off-By-One Vulnerability)
 
-* Fri Jan 10 2007 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.6.9-0vl1
+* Wed Jan 10 2007 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.6.9-0vl1
 - new upstream release
 - add Vendor/Distribution tag