From 6d848407bc63f7febfd096200ad3b9eef08571ea Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 11:58:03 +0000
Subject: [PATCH] auto-import rsync-2.5.4-2  from rsync-2.5.4-2.src.rpm

---
 rsync.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/rsync.spec b/rsync.spec
index 36f95b5..4baafa5 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -1,13 +1,15 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.5.4
-Release: 1
+Release: 2
 Group: Applications/Internet
 Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsync.xinetd
 Patch0: rsync-2.5.4-maxdel.patch
 Patch1: rsync-2.4.6-segv.patch
 Patch2: rsync-2.5.4-moresignage.patch
+Patch3: rsync-2.5.4-fix.patch
+Patch4: rsync-2.5.4-warn.patch
 Prefix: %{_prefix}
 BuildRoot: /var/tmp/%{name}-root
 Copyright: GPL
@@ -26,6 +28,8 @@ package.
 %patch0 -p1 -b .maxdel
 %patch1 -p1 -b .segv
 %patch2 -p1 -b .moresignage
+%patch3 -p1 -b .fix
+%patch4 -p1 -b .warn
 
 %build
 %configure
@@ -51,6 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Wed Apr 10 2002 Bill Nottingham <notting@redhat.com> 2.5.4-2
+- upstream patches: fix accidental use of --whole-file, fix
+  minor memory leak, and bad worst-case child kill behavior
+- make passing -e to rsync:// URLs not cause an error exit (#62489)
+
 * Wed Mar 13 2002 Bill Nottingham <notting@redhat.com> 2.5.4-1
 - update to 2.5.4, do assorted patchmerging