- downgrade to 3.1.2 due to server segfault

[packages/rsync.git] / rsync.spec

diff --git a/rsync.spec b/rsync.spec
index 97eeffe0d8428ff9c0c5b637f7b0583efe4a0eca..a257e2df417b2d03f46f9c4ab21341baac89ce56 100644 (file)
--- a/rsync.spec
+++ b/rsync.spec
@@ -1,3 +1,4 @@
+# TODO: 3.1.3 rsyncd segfaults very early in server rsync:// mode (both inetd and standalone)
 #
 # Conditional build:
 %bcond_with    rsh     # set remote shell command to rsh instead of ssh (old behaviour)
@@ -16,26 +17,24 @@ Summary(uk.UTF-8):  Програма для ефективного віддале
 Summary(zh_CN.UTF-8):  [通讯]传输工具
 Summary(zh_TW.UTF-8):  [喙啪]\e$(B6G?i火(c\e(B
 Name:          rsync
-Version:       3.1.0
-Release:       1
-License:       GPL
+Version:       3.1.2
+Release:       3
+Epoch:         1
+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 +161,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 +171,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 +242,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