./configure (optional if already run)
make
---- old/generator.c
-+++ new/generator.c
-@@ -43,6 +43,7 @@ extern int preserve_specials;
- extern int preserve_hard_links;
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -44,6 +44,7 @@ extern int preserve_hard_links;
+ extern int preserve_executability;
extern int preserve_perms;
extern int preserve_times;
+extern int omit_dir_changes;
extern int uid_ndx;
extern int gid_ndx;
extern int delete_mode;
-@@ -555,6 +556,7 @@ void itemize(const char *fnamecmp, struc
- int keep_time = !preserve_times ? 0
- : S_ISDIR(file->mode) ? preserve_times > 1
- : !S_ISLNK(file->mode);
+@@ -436,6 +437,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ const char *xname)
+ {
+ if (statret >= 0) { /* A from-dest-dir statret can == 1! */
+ int omit_changes = omit_dir_changes && S_ISDIR(sxp->st.st_mode);
-
- if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
- iflags |= ITEM_REPORT_SIZE;
-@@ -565,10 +567,11 @@ void itemize(const char *fnamecmp, struc
- iflags |= ITEM_REPORT_TIME;
- if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+ int keep_time = !preserve_times ? 0
+ : S_ISDIR(file->mode) ? preserve_times > 1 :
+ #ifdef CAN_SET_SYMLINK_TIMES
+@@ -465,10 +467,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ } else if (preserve_executability
+ && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0)))
iflags |= ITEM_REPORT_PERMS;
- if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
+ if (uid_ndx && am_root && !omit_changes
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
-@@ -1235,7 +1238,7 @@ static void recv_generator(char *fname,
- statret = -1;
- new_root_dir = 0;
- }
+@@ -1260,7 +1263,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ real_sx = sx;
+ if (file->flags & FLAG_DIR_CREATED)
+ statret = -1;
- if (!preserve_perms) { /* See comment in non-dir code below. */
+ if (!preserve_perms || omit_dir_changes) { /* See comment in non-dir code below. */
file->mode = dest_mode(file->mode, sx.st.st_mode,
dflt_perms, statret == 0);
}
---- old/options.c
-+++ new/options.c
-@@ -56,6 +56,7 @@ int preserve_specials = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -59,6 +59,7 @@ int preserve_specials = 0;
int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -344,6 +345,7 @@ void usage(enum logcode F)
+@@ -699,6 +700,7 @@ void usage(enum logcode F)
rprintf(F," -D same as --devices --specials\n");
rprintf(F," -t, --times preserve modification times\n");
rprintf(F," -O, --omit-dir-times omit directories from --times\n");
-+ rprintf(F," --omit-dir-changes omit directories any attribute changes\n");
++ rprintf(F," --omit-dir-changes omit directories from any attribute changes\n");
rprintf(F," --super receiver attempts super-user activities\n");
#ifdef SUPPORT_XATTRS
rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
-@@ -480,6 +482,7 @@ static struct poptOption long_options[]
+@@ -849,6 +851,7 @@ static struct poptOption long_options[] = {
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
{"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
{"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 },
-@@ -1430,6 +1433,8 @@ int parse_arguments(int *argc, const cha
- parse_rule(&filter_list, backup_dir_buf, 0, 0);
+@@ -2072,6 +2075,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
}
+ if (omit_dir_changes)
if (make_backups && !backup_dir) {
omit_dir_times = 0; /* Implied, so avoid -O to sender. */
if (preserve_times > 1)
-@@ -1665,6 +1670,8 @@ void server_options(char **args,int *arg
+@@ -2315,6 +2320,8 @@ void server_options(char **args, int *argc_p)
argstr[x++] = 'm';
if (omit_dir_times)
argstr[x++] = 'O';
} else {
if (copy_links)
argstr[x++] = 'L';
---- old/rsync.c
-+++ new/rsync.c
+diff --git a/rsync.c b/rsync.c
+--- a/rsync.c
++++ b/rsync.c
@@ -33,6 +33,7 @@ extern int preserve_xattrs;
extern int preserve_perms;
extern int preserve_executability;
extern int am_root;
extern int am_server;
extern int am_sender;
-@@ -324,9 +325,11 @@ int set_file_attrs(const char *fname, st
- updated = 1;
+@@ -505,9 +506,11 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ file->flags |= FLAG_TIME_FAILED;
}
- change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
+ && sxp->st.st_gid != (gid_t)F_GROUP(file)
+ && !(omit_dir_changes && S_ISDIR(sxp->st.st_mode));
#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
- if (S_ISLNK(sxp->st.st_mode))
+ if (S_ISLNK(sxp->st.st_mode)) {
;
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -356,6 +356,7 @@ to the detailed description below for a complete description. verb(
+ -D same as --devices --specials
+ -t, --times preserve modification times
+ -O, --omit-dir-times omit directories from --times
++ --omit-dir-changes omit directories from any attribute changes
+ --super receiver attempts super-user activities
+ --fake-super store/recover privileged attrs using xattrs
+ -S, --sparse handle sparse files efficiently
+@@ -1078,6 +1079,10 @@ it is preserving modification times (see bf(--times)). If NFS is sharing
+ the directories on the receiving side, it is a good idea to use bf(-O).
+ This option is inferred if you use bf(--backup) without bf(--backup-dir).
+
++dit(bf(--omit-dir-changes)) This tells rsync to omit directories when applying
++any preserved attributes (owner, group, times, permissions) to already existing
++directories.
++
+ dit(bf(--super)) This tells the receiving side to attempt super-user
+ activities even if the receiving rsync wasn't run by the super-user. These
+ activities include: preserving users via the bf(--owner) option, preserving