X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/93ca4d27d3d0806c3085aef4dbb331ba451b3dc4..bd68c3c2ed721c5cac5abd3602cba9199f678d62:/xattrs.diff diff --git a/xattrs.diff b/xattrs.diff index d9e5f18..05c510d 100644 --- a/xattrs.diff +++ b/xattrs.diff @@ -28,7 +28,7 @@ After applying this patch, run these commands for a successful build: 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 -@@ -136,6 +136,7 @@ static int make_bak_dir(char *fullpath) +@@ -135,6 +135,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); @@ -36,7 +36,7 @@ After applying this patch, run these commands for a successful build: } } *p = '/'; -@@ -189,6 +190,7 @@ static int keep_backup(char *fname) +@@ -188,6 +189,7 @@ static int keep_backup(char *fname) return 0; PUSH_KEEP_BACKUP_ACL(file, fname, buf); @@ -44,7 +44,7 @@ After applying this patch, run these commands for a successful build: /* Check to see if this is a device file, or link */ if (IS_DEVICE(file->mode) && am_root && preserve_devices) { -@@ -265,6 +267,7 @@ static int keep_backup(char *fname) +@@ -264,6 +266,7 @@ static int keep_backup(char *fname) } set_perms(buf, file, NULL, 0); CLEANUP_KEEP_BACKUP_ACL(); @@ -54,7 +54,7 @@ After applying this patch, run these commands for a successful build: if (verbose > 1) { --- orig/configure.in 2004-08-19 19:53:27 +++ configure.in 2005-05-12 22:57:53 -@@ -822,6 +822,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_ +@@ -826,6 +826,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_ AC_MSG_RESULT(no) ) @@ -87,7 +87,7 @@ After applying this patch, run these commands for a successful build: --- orig/flist.c 2005-07-29 02:49:06 +++ flist.c 2005-10-16 23:03:04 -@@ -962,6 +962,8 @@ static struct file_struct *send_file_nam +@@ -960,6 +960,8 @@ static struct file_struct *send_file_nam return NULL; if (MAKE_ACL(file, fname) < 0) return NULL; @@ -96,7 +96,7 @@ After applying this patch, run these commands for a successful build: maybe_emit_filelist_progress(flist->count + flist_count_offset); -@@ -971,9 +973,11 @@ static struct file_struct *send_file_nam +@@ -969,9 +971,11 @@ static struct file_struct *send_file_nam flist->files[flist->count++] = file; send_file_entry(file, f, base_flags); SEND_ACL(file, f); @@ -108,7 +108,7 @@ After applying this patch, run these commands for a successful build: } return file; } -@@ -1330,6 +1334,7 @@ struct file_list *recv_file_list(int f) +@@ -1327,6 +1331,7 @@ struct file_list *recv_file_list(int f) file = receive_file_entry(flist, flags, f); RECEIVE_ACL(file, f); @@ -116,7 +116,7 @@ After applying this patch, run these commands for a successful build: if (S_ISREG(file->mode)) stats.total_size += file->length; -@@ -1354,6 +1359,7 @@ struct file_list *recv_file_list(int f) +@@ -1351,6 +1356,7 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); SORT_FILE_ACL_INDEX_LISTS(); @@ -124,9 +124,9 @@ After applying this patch, run these commands for a successful build: if (f >= 0) { /* Now send the uid/gid list. This was introduced in ---- orig/generator.c 2005-05-12 23:34:00 +--- orig/generator.c 2006-01-14 08:17:25 +++ generator.c 2005-05-12 23:21:08 -@@ -729,6 +729,10 @@ static void recv_generator(char *fname, +@@ -894,6 +894,10 @@ static void recv_generator(char *fname, if (f_out == -1) SET_ACL(fname, file); #endif @@ -203,7 +203,7 @@ After applying this patch, run these commands for a successful build: int preserve_perms = 0; int preserve_devices = 0; int preserve_uid = 0; -@@ -189,6 +190,7 @@ static void print_rsync_version(enum log +@@ -190,6 +191,7 @@ static void print_rsync_version(enum log char const *have_inplace = "no "; char const *hardlinks = "no "; char const *acls = "no "; @@ -211,7 +211,7 @@ After applying this patch, run these commands for a successful build: char const *links = "no "; char const *ipv6 = "no "; STRUCT_STAT *dumstat; -@@ -208,7 +210,9 @@ static void print_rsync_version(enum log +@@ -209,7 +211,9 @@ static void print_rsync_version(enum log #ifdef SUPPORT_ACLS acls = ""; #endif @@ -222,7 +222,7 @@ After applying this patch, run these commands for a successful build: #ifdef SUPPORT_LINKS links = ""; #endif -@@ -223,9 +227,9 @@ static void print_rsync_version(enum log +@@ -224,9 +228,9 @@ static void print_rsync_version(enum log "Copyright (C) 1996-2005 by Andrew Tridgell and others\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " @@ -234,7 +234,7 @@ After applying this patch, run these commands for a successful build: /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature -@@ -296,6 +300,7 @@ void usage(enum logcode F) +@@ -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"); rprintf(F," -A, --acls preserve ACLs (implies --perms)\n"); @@ -242,7 +242,7 @@ After applying this patch, run these commands for a successful build: rprintf(F," -o, --owner preserve owner (root only)\n"); rprintf(F," -g, --group preserve group\n"); rprintf(F," -D, --devices preserve devices (root only)\n"); -@@ -404,6 +409,9 @@ static struct poptOption long_options[] +@@ -409,6 +414,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 }, @@ -252,7 +252,7 @@ After applying this patch, run these commands for a successful build: {"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 }, -@@ -1021,6 +1029,17 @@ int parse_arguments(int *argc, const cha +@@ -1027,6 +1035,17 @@ int parse_arguments(int *argc, const cha return 0; #endif /* SUPPORT_ACLS */ @@ -270,7 +270,7 @@ After applying this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() -@@ -1451,6 +1470,8 @@ void server_options(char **args,int *arg +@@ -1464,6 +1483,8 @@ void server_options(char **args,int *arg argstr[x++] = 'H'; if (preserve_acls) argstr[x++] = 'A'; @@ -302,7 +302,7 @@ After applying this patch, run these commands for a successful build: if (verbose > 1 && flags & PERMS_REPORT) { --- orig/rsync.h 2005-07-29 02:25:55 +++ rsync.h 2005-10-16 23:19:44 -@@ -689,6 +689,38 @@ struct stats { +@@ -685,6 +685,38 @@ struct stats { #endif /* SUPPORT_ACLS */ #include "smb_acls.h" @@ -351,7 +351,7 @@ After applying this patch, run these commands for a successful build: -o, --owner preserve owner (root only) -g, --group preserve group -D, --devices preserve devices (root only) -@@ -674,6 +675,11 @@ ACLs to be the same as the local ACLs. +@@ -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. @@ -702,7 +702,7 @@ After applying this patch, run these commands for a successful build: + + if (!preserve_xattrs) + return; -+ fname = f_name(file); ++ fname = f_name(file, NULL); + tag = read_byte(f); + if (tag != 'X' && tag != 'x') { + rprintf(FERROR,