rpms/rsync/devel rsync-2.6.9-hlink-segv.patch, NONE, 1.1 rsync.spec, 1.42, 1.43

[Simo Sorce (simo)]

Author: simo

Update of /cvs/pkgs/rpms/rsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25201

Modified Files:
	rsync.spec 
Added Files:
	rsync-2.6.9-hlink-segv.patch 
Log Message:

Fix bug 244564



rsync-2.6.9-hlink-segv.patch:

--- NEW FILE rsync-2.6.9-hlink-segv.patch ---
--- 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);


Index: rsync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- rsync.spec	19 Feb 2007 23:12:06 -0000	1.42
+++ rsync.spec	5 Sep 2007 13:49:27 -0000	1.43
@@ -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 @@
 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 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Wed Sep 5 2007 Simo Sorce <ssorce at 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 at redhat.com> 2.6.9-2
 - Add dist tag to Release to fix upgrades from FC5 or FC6.