X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rsync.spec;h=48850371260d0ddd06c02b366b639d2e5f27b74e;hb=ccf03c22e296efd60d8bfc10a1afe02a6e2affbe;hp=97eeffe0d8428ff9c0c5b637f7b0583efe4a0eca;hpb=ee3bf8817a1d60c84f7efaf92a8dfc62572b44f5;p=packages%2Frsync.git

diff --git a/rsync.spec b/rsync.spec
index 97eeffe..4885037 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -16,26 +16,23 @@ Summary(uk.UTF-8):	Програма для ефективного віддале
 Summary(zh_CN.UTF-8):	[通讯]传输工具
 Summary(zh_TW.UTF-8):	[喙啪]$(B6G?i火(c(B
 Name:		rsync
-Version:	3.1.0
-Release:	1
-License:	GPL
+Version:	3.1.2
+Release:	2
+License:	GPL v3+
 Group:		Networking/Utilities
 Source0:	http://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz
-# Source0-md5:	3be148772a33224771a8d4d2a028b132
+# Source0-md5:	0f758d7e000c0f7f7d3792610fad70cb
 Source1:	http://rsync.samba.org/ftp/rsync/rsync-patches-%{version}.tar.gz
-# Source1-md5:	a6f46f342017644e4747c1c083feefac
+# Source1-md5:	f412602a3cba0b872adfaed905a0aa28
 Source2:	%{name}.inet
 Source3:	%{name}.init
 Source4:	%{name}.sysconfig
 Source5:	%{name}d.logrotate
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-openssl-read_line_old.patch
-Patch2:		%{name}-dos.patch
 URL:		http://rsync.samba.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
-BuildRequires:	openssl-devel
 BuildRequires:	popt-devel
 BuildRequires:	rpmbuild(macros) >= 1.318
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -162,13 +159,6 @@ techniczna nowego algorytmu została również dołączona do pakietu.
 # for compat with previous patched version
 patch -p1 -i patches/acls.diff || exit 1
 patch -p1 -i patches/xattrs.diff || exit 1
-patch -p1 < patches/openssl-support.diff || exit 1
-
-# fix call to read_line_old in clientserver.c (from openssl-support.patch)
-%patch1 -p1
-
-# CVE-2014-2855
-%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -179,7 +169,6 @@ cp -f /usr/share/automake/config.sub .
 	%{?with_rsh:--with-rsh=rsh} \
 	--enable-ipv6 \
 	--enable-acl-support \
-	--enable-openssl \
 	--enable-xattr-support \
 	--disable-debug \
 	--with-rsyncd-conf=%{_sysconfdir}/rsyncd.conf
@@ -251,7 +240,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README NEWS OLDNEWS TODO
+%doc README NEWS OLDNEWS TODO support
 %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/CVSIGNORE
 %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/RSYNC_PASSWORD
 %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/RSYNC_PROXY