After applying this patch, run these commands for a successful build:
- autoconf
- autoheader
+ ./prepare-source
./configure --enable-acl-support --enable-xattr-support
- make proto
make
---- orig/Makefile.in 2005-11-07 04:31:05
-+++ Makefile.in 2005-11-07 04:38:36
+--- old/Makefile.in
++++ new/Makefile.in
@@ -27,13 +27,13 @@ VERSION=@VERSION@
HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
OBJS3=progress.o pipe.o
DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
---- orig/backup.c 2004-10-06 00:13:09
-+++ backup.c 2005-03-03 01:20:46
-@@ -135,6 +135,7 @@ static int make_bak_dir(char *fullpath)
+--- old/backup.c
++++ new/backup.c
+@@ -136,6 +136,7 @@ static int make_bak_dir(char *fullpath)
do_lchown(fullpath, st.st_uid, st.st_gid);
do_chmod(fullpath, st.st_mode);
(void)DUP_ACL(end, fullpath, st.st_mode);
}
}
*p = '/';
-@@ -188,6 +189,7 @@ static int keep_backup(char *fname)
+@@ -190,6 +191,7 @@ static int keep_backup(char *fname)
return 0;
PUSH_KEEP_BACKUP_ACL(file, fname, buf);
+ PUSH_KEEP_BACKUP_XATTR(file, fname, buf);
/* Check to see if this is a device file, or link */
- if (IS_DEVICE(file->mode) && am_root && preserve_devices) {
-@@ -264,6 +266,7 @@ static int keep_backup(char *fname)
+ if ((am_root && preserve_devices && IS_DEVICE(file->mode))
+@@ -267,6 +269,7 @@ static int keep_backup(char *fname)
}
- set_perms(buf, file, NULL, 0);
+ set_file_attrs(buf, file, NULL, 0);
CLEANUP_KEEP_BACKUP_ACL();
+ CLEANUP_KEEP_BACKUP_XATTR();
free(file);
if (verbose > 1) {
---- orig/configure.in 2004-08-19 19:53:27
-+++ configure.in 2005-05-12 22:57:53
-@@ -826,6 +826,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
+--- old/configure.in
++++ new/configure.in
+@@ -814,6 +814,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
AC_MSG_RESULT(no)
)
+AC_MSG_CHECKING(whether to support extended attributes)
+AC_ARG_ENABLE(xattr-support,
+AC_HELP_STRING([--enable-xattr-support], [Include extended attribute support (default=no)]),
-+[ case "$withval" in
++[ case "$enableval" in
+ yes)
+ case "$host_os" in
+ *linux*)
AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
---- orig/flist.c 2005-07-29 02:49:06
-+++ flist.c 2005-10-16 23:03:04
-@@ -960,6 +960,8 @@ static struct file_struct *send_file_nam
+--- old/flist.c
++++ new/flist.c
+@@ -969,6 +969,8 @@ static struct file_struct *send_file_nam
return NULL;
if (MAKE_ACL(file, fname) < 0)
return NULL;
+ if (MAKE_XATTR(file, fname) < 0)
+ return NULL;
- maybe_emit_filelist_progress(flist->count + flist_count_offset);
-
-@@ -969,9 +971,11 @@ static struct file_struct *send_file_nam
+ if (chmod_modes && !S_ISLNK(file->mode))
+ file->mode = tweak_mode(file->mode, chmod_modes);
+@@ -981,9 +983,11 @@ static struct file_struct *send_file_nam
flist->files[flist->count++] = file;
- send_file_entry(file, f, base_flags);
+ send_file_entry(file, f);
SEND_ACL(file, f);
+ SEND_XATTR(file, f);
} else {
}
return file;
}
-@@ -1327,6 +1331,7 @@ struct file_list *recv_file_list(int f)
+@@ -1373,6 +1377,7 @@ struct file_list *recv_file_list(int f)
file = receive_file_entry(flist, flags, f);
RECEIVE_ACL(file, f);
if (S_ISREG(file->mode))
stats.total_size += file->length;
-@@ -1351,6 +1356,7 @@ struct file_list *recv_file_list(int f)
+@@ -1397,6 +1402,7 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
SORT_FILE_ACL_INDEX_LISTS();
+ SORT_FILE_XATTR_INDEX_LISTS();
if (f >= 0) {
- /* Now send the uid/gid list. This was introduced in
---- orig/generator.c 2006-01-14 08:17:25
-+++ generator.c 2005-05-12 23:21:08
-@@ -894,6 +894,10 @@ static void recv_generator(char *fname,
+ recv_uid_list(f, flist);
+--- old/generator.c
++++ new/generator.c
+@@ -908,6 +908,10 @@ static void recv_generator(char *fname,
if (f_out == -1)
SET_ACL(fname, file);
#endif
+#endif
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
- delete_in_dir(the_file_list, fname, file);
---- orig/lib/sysxattr.c 2005-05-12 23:23:15
-+++ lib/sysxattr.c 2005-05-12 23:23:15
+ delete_in_dir(the_file_list, fname, file, &st);
+--- old/lib/sysxattr.c
++++ new/lib/sysxattr.c
@@ -0,0 +1,41 @@
+/* Extended attribute support for rsync. */
+/* This file Copyright (C) 2004 Red Hat, Inc. */
+#else
+
+#endif /* No xattrs */
---- orig/lib/sysxattr.h 2005-05-12 23:56:31
-+++ lib/sysxattr.h 2005-05-12 23:56:31
+--- old/lib/sysxattr.h
++++ new/lib/sysxattr.h
@@ -0,0 +1,9 @@
+#if defined(HAVE_LINUX_XATTRS)
+
+#else
+
+#endif /* No xattrs */
---- orig/options.c 2005-08-27 21:15:29
-+++ options.c 2005-08-27 21:29:40
+--- old/options.c
++++ new/options.c
@@ -45,6 +45,7 @@ int copy_links = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
int preserve_acls = 0;
+int preserve_xattrs = 0;
int preserve_perms = 0;
+ int preserve_executability = 0;
int preserve_devices = 0;
- int preserve_uid = 0;
-@@ -190,6 +191,7 @@ static void print_rsync_version(enum log
+@@ -196,6 +197,7 @@ static void print_rsync_version(enum log
char const *have_inplace = "no ";
char const *hardlinks = "no ";
char const *acls = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-@@ -209,7 +211,9 @@ static void print_rsync_version(enum log
+@@ -215,7 +217,9 @@ static void print_rsync_version(enum log
#ifdef SUPPORT_ACLS
acls = "";
#endif
#ifdef SUPPORT_LINKS
links = "";
#endif
-@@ -224,9 +228,9 @@ static void print_rsync_version(enum log
- "Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
+@@ -229,9 +233,9 @@ static void print_rsync_version(enum log
+ rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
-- "%shard links, %sACLs, %ssymlinks, batchfiles, \n",
-+ "%shard links, %sACLs, %sxattrs, %ssymlinks, batchfiles, \n",
+- "%shard links, %sACLs, %ssymlinks, batchfiles,\n",
++ "%shard links, %sACLs, %sxattrs, %ssymlinks, batchfiles,\n",
(int) (sizeof (OFF_T) * 8),
- got_socketpair, hardlinks, acls, links);
+ got_socketpair, hardlinks, acls, xattrs, links);
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
-@@ -297,6 +301,7 @@ void usage(enum logcode F)
- rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
- rprintf(F," -p, --perms preserve permissions\n");
+@@ -303,6 +307,9 @@ void usage(enum logcode F)
+ #ifdef SUPPORT_ACLS
rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
+ #endif
++#ifdef SUPPORT_XATTRS
+ rprintf(F," -X, --xattrs preserve extended attributes (implies --perms)\n");
- rprintf(F," -o, --owner preserve owner (root only)\n");
++#endif
+ rprintf(F," --chmod=CHMOD change destination permissions\n");
+ rprintf(F," -o, --owner preserve owner (super-user only)\n");
rprintf(F," -g, --group preserve group\n");
- rprintf(F," -D, --devices preserve devices (root only)\n");
-@@ -409,6 +414,9 @@ static struct poptOption long_options[]
+@@ -423,6 +430,9 @@ static struct poptOption long_options[]
{"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
{"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
{"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
-@@ -1027,6 +1035,17 @@ int parse_arguments(int *argc, const cha
+@@ -1088,6 +1098,17 @@ int parse_arguments(int *argc, const cha
return 0;
- #endif /* SUPPORT_ACLS */
+ #endif
+ case 'X':
+#ifdef SUPPORT_XATTRS
default:
/* A large opt value means that set_refuse_options()
-@@ -1464,6 +1483,8 @@ void server_options(char **args,int *arg
- argstr[x++] = 'H';
+@@ -1532,6 +1553,10 @@ void server_options(char **args,int *arg
if (preserve_acls)
argstr[x++] = 'A';
+ #endif
++#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs)
+ argstr[x++] = 'X';
++#endif
if (preserve_uid)
argstr[x++] = 'o';
if (preserve_gid)
---- orig/rsync.c 2004-07-03 20:11:58
-+++ rsync.c 2005-10-16 23:19:27
-@@ -139,12 +139,15 @@ int set_perms(char *fname,struct file_st
+--- old/rsync.c
++++ new/rsync.c
+@@ -215,12 +215,15 @@ int set_file_attrs(char *fname, struct f
}
#endif
+ updated = 1;
}
- if (verbose > 1 && flags & PERMS_REPORT) {
---- orig/rsync.h 2005-07-29 02:25:55
-+++ rsync.h 2005-10-16 23:19:44
-@@ -685,6 +685,38 @@ struct stats {
+ if (verbose > 1 && flags & ATTRS_REPORT) {
+--- old/rsync.h
++++ new/rsync.h
+@@ -695,6 +695,38 @@ struct chmod_mode_struct;
#endif /* SUPPORT_ACLS */
#include "smb_acls.h"
#include "proto.h"
/* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2004-07-03 20:11:58
-+++ rsync.yo 2005-03-03 01:33:53
-@@ -317,6 +317,7 @@ to the detailed description below for a
- -K, --keep-dirlinks treat symlinked dir on receiver as dir
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -318,6 +318,7 @@ to the detailed description below for a
-p, --perms preserve permissions
- -A, --acls preserve ACLs (implies -p) [local option]
-+ -X, --xattrs preserve extended attributes (implies -p) [local option]
- -o, --owner preserve owner (root only)
+ -E, --executability preserve executability
+ -A, --acls preserve ACLs (implies -p) [non-standard]
++ -X, --xattrs preserve extended attrs (implies -p) [n.s.]
+ --chmod=CHMOD change destination permissions
+ -o, --owner preserve owner (super-user only)
-g, --group preserve group
- -D, --devices preserve devices (root only)
-@@ -687,6 +688,11 @@ ACLs to be the same as the local ACLs.
- remote machine's rsync supports this option also. This is a non-standard
- option.
+@@ -752,6 +753,11 @@ dit(bf(-A, --acls)) This option causes r
+ ACLs to be the same as the source ACLs. This nonstandard option only
+ works if the remote rsync also supports it. bf(--acls) implies bf(--perms).
+dit(bf(-X, --xattrs)) This option causes rsync to update the remote
+extended attributes to be the same as the local ones. This will work
+only if the remote machine's rsync supports this option also. This is
+a non-standard option.
+
- dit(bf(-o, --owner)) This option causes rsync to set the owner of the
- destination file to be the same as the source file. On most systems,
- only the super-user can set file ownership. By default, the preservation
---- orig/xattr.c 2005-10-16 23:25:12
-+++ xattr.c 2005-10-16 23:25:12
+ dit(bf(--chmod)) This option tells rsync to apply one or more
+ comma-separated "chmod" strings to the permission of the files in the
+ transfer. The resulting value is treated as though it was the permissions
+--- old/xattr.c
++++ new/xattr.c
@@ -0,0 +1,540 @@
+/* Extended Attribute support for rsync */
+/* Copyright (C) 2004 Red Hat, Inc */
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff