Bug 2780 - fix acl patch
fix acl patch
Status: CLOSED INVALID
Product: rsync
Classification: Unclassified
Component: core
2.6.5
All Linux
: P3 normal
: ---
Assigned To: Wayne Davison
Rsync QA Contact
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2005-06-09 00:39 UTC by Frederic Lepied
Modified: 2006-03-12 02:56 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Frederic Lepied 2005-06-09 00:39:47 UTC
--- rsync-2.6.5/patches/acls.diff.acl-patch	2005-06-01 18:22:41.000000000 +0200
+++ rsync-2.6.5/patches/acls.diff	2005-06-09 09:10:29.628842558 +0200
@@ -21,7 +21,7 @@
 +HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
  LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
 -	lib/permstring.o lib/pool_alloc.o @LIBOBJS@
-+	lib/permstring.o lib/pool_alloc.o lib/sysacls.o @LIBOBJS@
++	lib/permstring.o lib/pool_alloc.o sysacls.o @LIBOBJS@
  ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
  	zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
  	zlib/zutil.o zlib/adler32.o
@@ -58,7 +58,7 @@
 +/* handle passing ACLs between systems */
 +
 +#include "rsync.h"
-+#include "lib/sysacls.h"
++#include "sysacls.h"
 +
 +#ifdef SUPPORT_ACLS
 +
@@ -4735,7 +4735,7 @@
  				  ? FCLIENT : FINFO;
 --- orig/rsync.h	2005-05-03 17:11:01
 +++ rsync.h	2005-05-12 23:32:56
-@@ -638,6 +638,44 @@ struct stats {
+@@ -638,6 +638,46 @@
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
  
@@ -4777,9 +4777,18 @@
 +#endif /* SUPPORT_ACLS */
 +#include "smb_acls.h"
 +
++#define UNUSED(x) x __attribute__((__unused__))
++
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
+@@ -861,6 +901,4 @@
+ const char *get_panic_action(void);
+ #endif
+ 
+-#define UNUSED(x) x __attribute__((__unused__))
+-
+ extern const char *io_write_phase, *io_read_phase;
 --- orig/rsync.yo	2005-05-22 20:53:34
 +++ rsync.yo	2004-07-03 20:11:58
 @@ -317,6 +317,7 @@ to the detailed description below for a
Comment 1 Wayne Davison 2005-06-09 07:27:45 UTC
All the things changed in your patch indicate that you haven't applied the
acls.diff patch correctly.  Please be sure to use the -p0 option when running
patch so that the files get created in the proper subdirs.
Comment 2 Frederic Lepied 2005-06-09 07:53:08 UTC
You are right. I was updating our package and saw that the patch wasn't
submitted and I submitted it wrongly. Sorry.