From 3b05e91f7a7aeaadd90932b93effafe115914cf8 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 23 Jan 2006 18:50:15 +0000 Subject: [PATCH] Fixed a problem with the configure script: we need to check $enableval these days, not $withval. --- acls.diff | 46 +++++++++++++++++++++++----------------------- xattrs.diff | 36 ++++++++++++++++++------------------ 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/acls.diff b/acls.diff index 5d78733..5171116 100644 --- a/acls.diff +++ b/acls.diff @@ -1218,7 +1218,7 @@ ACLs to a non-ACL-supporting disk should complain. +AC_MSG_CHECKING(whether to support ACLs) +AC_ARG_ENABLE(acl-support, +AC_HELP_STRING([--enable-acl-support], [Include ACL support (default=no)]), -+[ case "$withval" in ++[ case "$enableval" in + yes) + + case "$host_os" in @@ -1284,18 +1284,18 @@ ACLs to a non-ACL-supporting disk should complain. AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT ---- orig/flist.c 2006-01-21 08:00:25 +--- orig/flist.c 2006-01-22 21:04:41 +++ flist.c 2006-01-21 08:04:42 -@@ -965,6 +965,8 @@ static struct file_struct *send_file_nam +@@ -970,6 +970,8 @@ static struct file_struct *send_file_nam f == -2 ? SERVER_FILTERS : ALL_FILTERS); if (!file) return NULL; + if (MAKE_ACL(file, fname) < 0) + return NULL; - if (chmod_modes && (S_ISREG(file->mode) || S_ISDIR(file->mode))) + if (chmod_modes && !S_ISLNK(file->mode)) file->mode = tweak_mode(file->mode, chmod_modes); -@@ -976,6 +978,10 @@ static struct file_struct *send_file_nam +@@ -981,6 +983,10 @@ static struct file_struct *send_file_nam if (file->basename[0]) { flist->files[flist->count++] = file; send_file_entry(file, f); @@ -1306,7 +1306,7 @@ ACLs to a non-ACL-supporting disk should complain. } return file; } -@@ -1366,6 +1372,8 @@ struct file_list *recv_file_list(int f) +@@ -1371,6 +1377,8 @@ struct file_list *recv_file_list(int f) flags |= read_byte(f) << 8; file = receive_file_entry(flist, flags, f); @@ -1315,7 +1315,7 @@ ACLs to a non-ACL-supporting disk should complain. if (S_ISREG(file->mode)) stats.total_size += file->length; -@@ -1388,6 +1396,8 @@ struct file_list *recv_file_list(int f) +@@ -1393,6 +1401,8 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); @@ -1324,9 +1324,9 @@ ACLs to a non-ACL-supporting disk should complain. if (f >= 0) { /* Now send the uid/gid list. This was introduced in * protocol version 15 */ ---- orig/generator.c 2006-01-20 21:12:17 +--- orig/generator.c 2006-01-22 21:04:41 +++ generator.c 2006-01-14 08:17:25 -@@ -890,6 +890,10 @@ static void recv_generator(char *fname, +@@ -893,6 +893,10 @@ static void recv_generator(char *fname, if (set_perms(fname, file, statret ? NULL : &st, 0) && verbose && code && f_out != -1) rprintf(code, "%s/\n", fname); @@ -1336,7 +1336,7 @@ ACLs to a non-ACL-supporting disk should complain. +#endif if (delete_during && f_out != -1 && !phase && dry_run < 2 && (file->flags & FLAG_DEL_HERE)) - delete_in_dir(the_file_list, fname, file); + delete_in_dir(the_file_list, fname, file, &st); --- orig/lib/sysacls.c 2005-05-16 23:27:53 +++ lib/sysacls.c 2005-05-16 23:27:53 @@ -0,0 +1,3242 @@ @@ -4624,7 +4624,7 @@ ACLs to a non-ACL-supporting disk should complain. next; } ---- orig/options.c 2006-01-21 07:55:00 +--- orig/options.c 2006-01-23 18:48:23 +++ options.c 2005-08-27 21:15:29 @@ -44,6 +44,7 @@ int keep_dirlinks = 0; int copy_links = 0; @@ -4634,7 +4634,7 @@ ACLs to a non-ACL-supporting disk should complain. int preserve_perms = 0; int preserve_devices = 0; int preserve_uid = 0; -@@ -188,6 +189,7 @@ static void print_rsync_version(enum log +@@ -189,6 +190,7 @@ static void print_rsync_version(enum log char const *got_socketpair = "no "; char const *have_inplace = "no "; char const *hardlinks = "no "; @@ -4642,7 +4642,7 @@ ACLs to a non-ACL-supporting disk should complain. char const *links = "no "; char const *ipv6 = "no "; STRUCT_STAT *dumstat; -@@ -204,6 +206,10 @@ static void print_rsync_version(enum log +@@ -205,6 +207,10 @@ static void print_rsync_version(enum log hardlinks = ""; #endif @@ -4653,8 +4653,8 @@ ACLs to a non-ACL-supporting disk should complain. #ifdef SUPPORT_LINKS links = ""; #endif -@@ -217,9 +223,9 @@ static void print_rsync_version(enum log - rprintf(f, "Copyright (C) 1996-2006 by Wayne Davison, Andrew Tridgell, and others\n"); +@@ -218,9 +224,9 @@ static void print_rsync_version(enum log + rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " - "%shard links, %ssymlinks, batchfiles, \n", @@ -4665,7 +4665,7 @@ ACLs to a non-ACL-supporting disk should complain. /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature -@@ -287,6 +293,7 @@ void usage(enum logcode F) +@@ -288,6 +294,7 @@ void usage(enum logcode F) rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); rprintf(F," -p, --perms preserve permissions\n"); @@ -4673,7 +4673,7 @@ ACLs to a non-ACL-supporting disk should complain. 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"); -@@ -396,6 +403,9 @@ static struct poptOption long_options[] +@@ -397,6 +404,9 @@ static struct poptOption long_options[] {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 }, {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, @@ -4683,9 +4683,9 @@ ACLs to a non-ACL-supporting disk should complain. {"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 }, -@@ -1005,6 +1015,24 @@ int parse_arguments(int *argc, const cha - basis_dir[basis_dir_cnt++] = (char *)arg; - break; +@@ -1027,6 +1037,24 @@ int parse_arguments(int *argc, const cha + usage(FINFO); + exit_cleanup(0); + case 'A': +#ifdef SUPPORT_ACLS @@ -4708,7 +4708,7 @@ ACLs to a non-ACL-supporting disk should complain. default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1441,6 +1469,8 @@ void server_options(char **args,int *arg +@@ -1460,6 +1488,8 @@ void server_options(char **args,int *arg if (preserve_hard_links) argstr[x++] = 'H'; @@ -4734,7 +4734,7 @@ ACLs to a non-ACL-supporting disk should complain. if (verbose > 1 && flags & PERMS_REPORT) { enum logcode code = daemon_log_format_has_i || dry_run ? FCLIENT : FINFO; ---- orig/rsync.h 2006-01-14 20:27:10 +--- orig/rsync.h 2006-01-21 21:02:30 +++ rsync.h 2005-07-29 02:25:55 @@ -647,6 +647,44 @@ struct stats { #include "lib/permstring.h" @@ -4781,7 +4781,7 @@ ACLs to a non-ACL-supporting disk should complain. #include "proto.h" /* We have replacement versions of these if they're missing. */ ---- orig/rsync.yo 2006-01-21 08:12:23 +--- orig/rsync.yo 2006-01-22 21:04:42 +++ rsync.yo 2004-07-03 20:11:58 @@ -316,6 +316,7 @@ to the detailed description below for a -H, --hard-links preserve hard links diff --git a/xattrs.diff b/xattrs.diff index 05c510d..9582f79 100644 --- a/xattrs.diff +++ b/xattrs.diff @@ -62,7 +62,7 @@ After applying this patch, run these commands for a successful build: +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*) @@ -85,20 +85,20 @@ After applying this patch, run these commands for a successful build: AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT ---- orig/flist.c 2005-07-29 02:49:06 +--- orig/flist.c 2006-01-21 08:04:42 +++ flist.c 2005-10-16 23:03:04 -@@ -960,6 +960,8 @@ static struct file_struct *send_file_nam +@@ -972,6 +972,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); +@@ -984,9 +986,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 { @@ -108,7 +108,7 @@ After applying this patch, run these commands for a successful build: } return file; } -@@ -1327,6 +1331,7 @@ struct file_list *recv_file_list(int f) +@@ -1378,6 +1382,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; -@@ -1351,6 +1356,7 @@ struct file_list *recv_file_list(int f) +@@ -1402,6 +1407,7 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); SORT_FILE_ACL_INDEX_LISTS(); @@ -126,7 +126,7 @@ After applying this patch, run these commands for a successful build: /* 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, +@@ -897,6 +897,10 @@ static void recv_generator(char *fname, if (f_out == -1) SET_ACL(fname, file); #endif @@ -136,7 +136,7 @@ After applying this patch, run these commands for a successful build: +#endif if (delete_during && f_out != -1 && !phase && dry_run < 2 && (file->flags & FLAG_DEL_HERE)) - delete_in_dir(the_file_list, fname, file); + 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 @@ -0,0 +1,41 @@ @@ -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; -@@ -190,6 +191,7 @@ static void print_rsync_version(enum log +@@ -191,6 +192,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; -@@ -209,7 +211,9 @@ static void print_rsync_version(enum log +@@ -210,7 +212,9 @@ static void print_rsync_version(enum log #ifdef SUPPORT_ACLS acls = ""; #endif @@ -223,7 +223,7 @@ After applying this patch, run these commands for a successful build: links = ""; #endif @@ -224,9 +228,9 @@ static void print_rsync_version(enum log - "Copyright (C) 1996-2005 by Andrew Tridgell and others\n"); + rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " - "%shard links, %sACLs, %ssymlinks, batchfiles, \n", @@ -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 -@@ -297,6 +301,7 @@ void usage(enum logcode F) +@@ -295,6 +299,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"); -@@ -409,6 +414,9 @@ static struct poptOption long_options[] +@@ -407,6 +412,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 }, -@@ -1027,6 +1035,17 @@ int parse_arguments(int *argc, const cha +@@ -1054,6 +1062,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() -@@ -1464,6 +1483,8 @@ void server_options(char **args,int *arg +@@ -1490,6 +1509,8 @@ void server_options(char **args,int *arg argstr[x++] = 'H'; if (preserve_acls) argstr[x++] = 'A'; -- 2.34.1