up to 3.1.3; SECURITY; rsync-3.1.2-1-fadvise.patch disabled

[packages/rsync.git] / rsync.spec

diff --git a/rsync.spec b/rsync.spec
index 399430274418e5c9657f46d486169400b86b7ef1..72a0e813a0e8f7bde7eac68ec8408fcbdb055fd1 100644 (file)
--- a/rsync.spec
+++ b/rsync.spec
@@ -4,6 +4,7 @@
 #
 # Conditional build:
 %bcond_with    rsh     # set remote shell command to rsh instead of ssh (old behaviour)
+%bcond_with    fadvise # apply fadvise patch
 %bcond_with    tests   # perform "make test"
 #
 %ifarch alpha
@@ -19,21 +20,23 @@ 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.2
-Release:       3
+Version:       3.1.3
+Release:       1
 Epoch:         1
 License:       GPL v3+
 Group:         Networking/Utilities
-Source0:       http://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz
-# Source0-md5: 0f758d7e000c0f7f7d3792610fad70cb
-Source1:       http://rsync.samba.org/ftp/rsync/rsync-patches-%{version}.tar.gz
-# Source1-md5: f412602a3cba0b872adfaed905a0aa28
+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-md5: 753fc37ffc277571c69135e8bc5fae9d
 Source2:       %{name}.inet
 Source3:       %{name}.init
 Source4:       %{name}.sysconfig
 Source5:       %{name}d.logrotate
 Patch0:                %{name}-config.patch
-URL:           http://rsync.samba.org/
+Patch1:                https://tobi.oetiker.ch/patches/rsync-3.1.2-1-fadvise.patch
+# Patch1-md5:  b055468e7cbc5d829aa943f07916d458
+URL:           https://rsync.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -106,7 +109,7 @@ rsync - це швидша та гнучкіша альтернатива rcp, я
 Summary:       Files necessary to run rsync in daemon mode
 Summary(pl.UTF-8):     Pliki niezbędne do uruchomienia rsynca w trybie serwera
 Group:         Networking/Daemons
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      rc-inetd
 Provides:      rsyncd
 Obsoletes:     rsyncd
@@ -134,7 +137,7 @@ Summary:    Files necessary to run rsync in daemon mode
 Summary(pl.UTF-8):     Pliki niezbędne do uruchomienia rsynca w trybie serwera
 Group:         Networking/Daemons
 Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      rsyncd
 Obsoletes:     rsyncd
 Obsoletes:     rsyncd-inetd
@@ -159,6 +162,7 @@ techniczna nowego algorytmu została również dołączona do pakietu.
 %prep
 %setup -q -b1
 %patch0 -p1
+%{?with_fadvise:%patch1 -p1}
 
 # for compat with previous patched version
 patch -p1 -i patches/acls.diff || exit 1