diff options
| author | Erich Eckner <git@eckner.net> | 2016-11-22 13:17:02 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2016-11-22 13:56:37 +0100 |
| commit | 4a678f5dcccdc5cce98e6f7fd070e00caed2a1da (patch) | |
| tree | da0c4f82a5216bf42988c430644d53e382e03287 | |
| parent | d85fba2c7c29e9aa374c311bd289837206f66f95 (diff) | |
| download | crux-patches-4a678f5dcccdc5cce98e6f7fd070e00caed2a1da.tar.xz | |
rsync: update man page about new option
| -rw-r--r-- | core/rsync/may-modify-others.patch.new | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/core/rsync/may-modify-others.patch.new b/core/rsync/may-modify-others.patch.new index b37c7a5..aed2e55 100644 --- a/core/rsync/may-modify-others.patch.new +++ b/core/rsync/may-modify-others.patch.new @@ -38,15 +38,16 @@ diff -u3 rsync-3.1.2/options.c rsync-3.1.2-mod/options.c int basis_dir_cnt = 0; char *dest_option = NULL; -@@ -761,6 +762,7 @@ +@@ -761,6 +762,8 @@ rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n"); rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); -+ rprintf(F," --may-modify-others meta data of files in above three DIRs may be modified\n"); ++ rprintf(F," --may-modify-others allow meta data of files in above three\n"); ++ rprintf(F," DIRs to be modified\n"); rprintf(F," -z, --compress compress file data during the transfer\n"); rprintf(F," --compress-level=NUM explicitly set compression level\n"); rprintf(F," --skip-compress=LIST skip compressing files with a suffix in LIST\n"); -@@ -814,7 +816,7 @@ +@@ -814,7 +817,7 @@ } enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, @@ -55,7 +56,7 @@ diff -u3 rsync-3.1.2/options.c rsync-3.1.2-mod/options.c OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, -@@ -961,6 +963,7 @@ +@@ -961,6 +964,7 @@ {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 }, {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 }, {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, @@ -63,7 +64,7 @@ diff -u3 rsync-3.1.2/options.c rsync-3.1.2-mod/options.c {"fuzzy", 'y', POPT_ARG_NONE, 0, 'y', 0, 0 }, {"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, {"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, -@@ -1643,6 +1646,10 @@ +@@ -1643,6 +1647,10 @@ return 0; #endif @@ -74,3 +75,25 @@ diff -u3 rsync-3.1.2/options.c rsync-3.1.2-mod/options.c case OPT_COPY_DEST: copy_dest = 1; dest_option = "--copy-dest"; +--- rsync-3.1.2/rsync.yo 2015-12-21 21:00:49.000000000 +0100 ++++ rsync-3.1.2-mod/rsync.yo 2016-11-22 13:12:57.606979457 +0100 +@@ -419,6 +419,8 @@ + --compare-dest=DIR also compare received files relative to DIR + --copy-dest=DIR ... and include copies of unchanged files + --link-dest=DIR hardlink to files in DIR when unchanged ++ --may-modify-others allow meta data of files in above three ++ DIRs to be modified + -z, --compress compress file data during the transfer + --compress-level=NUM explicitly set compression level + --skip-compress=LIST skip compressing files with suffix in LIST +--- rsync-3.1.2/rsync.1 2015-12-21 21:22:41.000000000 +0100 ++++ rsync-3.1.2-mod/rsync.1 2016-11-22 13:54:19.227845494 +0100 +@@ -495,6 +495,8 @@ + \-\-compare\-dest=DIR also compare received files relative to DIR + \-\-copy\-dest=DIR ... and include copies of unchanged files + \-\-link\-dest=DIR hardlink to files in DIR when unchanged ++ \-\-may\-modify\-others allow meta data of files in above three ++ DIRs to be modified + \-z, \-\-compress compress file data during the transfer + \-\-compress\-level=NUM explicitly set compression level + \-\-skip\-compress=LIST skip compressing files with suffix in LIST |