Fix bug 244564

This commit is contained in:
Simo Sorce 2007-09-05 13:49:27 +00:00
parent d241fce7db
commit cadf8704c5
2 changed files with 19 additions and 2 deletions

View File

@ -0,0 +1,12 @@
--- rsync-2.6.9-orig/hlink.c 2007-06-17 11:51:28.000000000 +0200
+++ rsync-2.6.9/hlink.c 2007-06-17 11:58:22.000000000 +0200
@@ -315,6 +315,9 @@ void hard_link_cluster(struct file_struc
if (file->F_HLINDEX != SKIPPED_LINK)
continue;
hlink2 = f_name(file, NULL);
+#ifdef SUPPORT_ACLS
+ sx.acc_acl = sx.def_acl = NULL;
+#endif
statret = link_stat(hlink2, &sx.st, 0);
maybe_hard_link(file, ndx, hlink2, statret, &sx,
hlink1, &st, itemizing, code);

View File

@ -1,17 +1,18 @@
Summary: A program for synchronizing files over a network.
Name: rsync
Version: 2.6.9
Release: 2%{?dist}
Release: 3%{?dist}
Group: Applications/Internet
# TAG: for pre versions use
#Source: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
Source: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
Source1: rsync.xinetd
Patch1: rsync-2.6.9-acl-xattr-delete-bug.patch
Patch2: rsync-2.6.9-hlink-segv.patch
BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc
Prefix: %{_prefix}
BuildRoot: /var/tmp/%{name}-root
License: GPL
License: GPLv2+
%description
Rsync uses a reliable algorithm to bring remote and host files into
@ -29,6 +30,7 @@ package.
patch -p1 < patches/acls.diff
patch -p1 < patches/xattrs.diff
%patch1 -p1 -b .acl_xattrs_bug
%patch2 -p1 -b .hlink_segv
%build
rm -fr autom4te.cache
@ -58,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/rsyncd.conf.5*
%changelog
* Wed Sep 5 2007 Simo Sorce <ssorce@redhat.com> 2.6.9-3.fc8
- Add patch to fix crash bug with hardlinks and ACLs patches
* Mon Feb 19 2007 Adam Jackson <ajax@redhat.com> 2.6.9-2
- Add dist tag to Release to fix upgrades from FC5 or FC6.