rpm/rsync
SHA256
1
0
Fork 0
forked from pool/rsync
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsync?expand=0&rev=8

Browse Source
This commit is contained in:
OBS User unknown 2007-09-11 16:36:05 +00:00 committed by Git OBS Bridge
parent 5c0e115c41
commit a809c22901
3 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
rsync-fix_fuzzy.patch Normal file
View File

@ -0,0 +1,45 @@
--- flist.c 2007/09/10 14:55:19 1.5
+++ flist.c 2007/09/10 15:30:23
@@ -998,7 +998,7 @@
file->mode = tweak_mode(file->mode, chmod_modes);
#ifdef SUPPORT_ACLS
- if (preserve_acls) {
+ if (preserve_acls && f >= 0) {
sx.st.st_mode = file->mode;
sx.acc_acl = sx.def_acl = NULL;
if (get_acl(fname, &sx) < 0)
@@ -1006,7 +1006,7 @@
}
#endif
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs) {
+ if (preserve_xattrs && f >= 0) {
sx.xattr = NULL;
if (get_xattr(fname, &sx) < 0)
return NULL;
@@ -1021,20 +1021,20 @@
flist->files[flist->count++] = file;
send_file_entry(file, f);
#ifdef SUPPORT_ACLS
- if (preserve_acls)
+ if (preserve_acls && f >= 0)
send_acl(&sx, f);
#endif
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs)
+ if (preserve_xattrs && f >= 0)
send_xattr(&sx, f);
#endif
} else {
#ifdef SUPPORT_ACLS
- if (preserve_acls)
+ if (preserve_acls && f >= 0)
free_acl(&sx);
#endif
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs)
+ if (preserve_xattrs && f >= 0)
free_xattr(&sx);
#endif
}

6
rsync.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 10 17:30:57 CEST 2007 - ro@suse.de
- fix abort in rsync when acls and fuzzy are used together
(#306263)
-------------------------------------------------------------------
Fri Aug 17 15:03:44 CEST 2007 - cthiel@suse.de

7
rsync.spec
View File

@ -23,7 +23,7 @@ Group: Productivity/Networking/Other
PreReq: %fillup_prereq %insserv_prereq
Autoreqprov: on
Version: 2.6.9
Release: 34
Release: 45
Summary: Replacement for RCP/mirror that has Many More Features
Source: samba.org/ftp/rsync/rsync-%{version}.tar.bz2
Source1: logrotate.rsync
@ -36,6 +36,7 @@ Patch2: slp.diff
Patch3: system-zlib.diff
Patch4: rsync-overlong.patch
Patch5: lutimes-hack.diff
Patch6: rsync-fix_fuzzy.patch
URL: http://rsync.samba.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define with_system_zlib 0
@ -73,6 +74,7 @@ cp configure.orig configure
%patch1
%patch4 -p1
%patch5
%patch6
cp configure.orig configure
%build
@ -138,6 +140,9 @@ ln -sf ../../etc/init.d/rsyncd $RPM_BUILD_ROOT/usr/sbin/rcrsyncd
%doc COPYING NEWS README tech_report.ps tech_report.tex
%changelog
* Mon Sep 10 2007 - ro@suse.de
- fix abort in rsync when acls and fuzzy are used together
(#306263)
* Fri Aug 17 2007 - cthiel@suse.de
- added lutimes-hack.diff to work around a glibc bug in lutimes.c
* Thu Aug 02 2007 - ro@suse.de