./configure --enable-acl-support --enable-xattr-support
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
+--- 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);
free(file);
if (verbose > 1) {
---- orig/configure.in 2004-08-19 19:53:27
-+++ configure.in 2005-05-12 22:57:53
-@@ -810,6 +810,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_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
---- orig/flist.c 2006-01-31 02:37:33
-+++ flist.c 2005-10-16 23:03:04
+--- 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)
if (f >= 0) {
recv_uid_list(f, flist);
---- orig/generator.c 2006-02-04 22:26:45
-+++ generator.c 2005-05-12 23:21:08
+--- old/generator.c
++++ new/generator.c
@@ -908,6 +908,10 @@ static void recv_generator(char *fname,
if (f_out == -1)
SET_ACL(fname, file);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
delete_in_dir(the_file_list, fname, file, &st);
---- orig/lib/sysxattr.c 2005-05-12 23:23:15
-+++ lib/sysxattr.c 2005-05-12 23:23:15
+--- 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 2006-02-04 19:58:53
-+++ options.c 2006-02-04 20:05:35
+--- 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_perms = 0;
int preserve_executability = 0;
int preserve_devices = 0;
-@@ -195,6 +196,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;
-@@ -214,7 +216,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
-@@ -228,9 +232,9 @@ static void print_rsync_version(enum log
+@@ -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, "
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
-@@ -302,6 +306,9 @@ void usage(enum logcode F)
+@@ -303,6 +307,9 @@ void usage(enum logcode F)
#ifdef SUPPORT_ACLS
rprintf(F," -A, --acls preserve ACLs (implies --perms)\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");
-@@ -421,6 +428,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 },
-@@ -1085,6 +1095,17 @@ int parse_arguments(int *argc, const cha
+@@ -1088,6 +1098,17 @@ int parse_arguments(int *argc, const cha
return 0;
#endif
default:
/* A large opt value means that set_refuse_options()
-@@ -1530,6 +1551,10 @@ void server_options(char **args,int *arg
+@@ -1532,6 +1553,10 @@ void server_options(char **args,int *arg
if (preserve_acls)
argstr[x++] = 'A';
#endif
if (preserve_uid)
argstr[x++] = 'o';
if (preserve_gid)
---- orig/rsync.c 2006-02-04 19:53:13
-+++ rsync.c 2005-10-16 23:19:27
-@@ -206,12 +206,15 @@ int set_file_attrs(char *fname, struct f
+--- old/rsync.c
++++ new/rsync.c
+@@ -215,12 +215,15 @@ int set_file_attrs(char *fname, struct f
}
#endif
}
if (verbose > 1 && flags & ATTRS_REPORT) {
---- orig/rsync.h 2006-01-31 19:27:00
-+++ rsync.h 2005-10-16 23:19:44
+--- 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 2006-02-05 06:55:30
-+++ rsync.yo 2006-01-31 03:16:46
+--- old/rsync.yo
++++ new/rsync.yo
@@ -318,6 +318,7 @@ to the detailed description below for a
-p, --perms preserve permissions
-E, --executability preserve executability
--chmod=CHMOD change destination permissions
-o, --owner preserve owner (super-user only)
-g, --group preserve group
-@@ -751,6 +752,11 @@ dit(bf(-A, --acls)) This option causes r
+@@ -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(--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
---- orig/xattr.c 2005-10-16 23:25:12
-+++ xattr.c 2005-10-16 23:25:12
+--- 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