The branch, master has been updated via 142aba00 Silence some symlink mode-change failures. via 8687e44d Fix a broken link & make a tweak. via 0bd8e851 Facilitate the next release. from 00a5ab23 Tweak some rrsync rules for cleanup & release.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 142aba00d52143c25d3de9287d6b946e1188b6d0 Author: Wayne Davison <wa...@opencoder.net> Date: Mon Jan 17 22:12:21 2022 -0800 Silence some symlink mode-change failures. commit 8687e44d10d81ebb576b8fc825151ea960483365 Author: Wayne Davison <wa...@opencoder.net> Date: Mon Jan 17 20:44:16 2022 -0800 Fix a broken link & make a tweak. commit 0bd8e851857d07508d505089851c11567d2549b8 Author: Wayne Davison <wa...@opencoder.net> Date: Mon Jan 17 19:25:02 2022 -0800 Facilitate the next release. ----------------------------------------------------------------------- Summary of changes: NEWS.md | 7 ++++--- generator.c | 2 +- packaging/release-rsync | 4 ++-- rsync.1.md | 12 ++++++------ syscall.c | 5 ++++- 5 files changed, 17 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS.md b/NEWS.md index 502d2d6c..3083ca3a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,3 @@ - # NEWS for rsync 3.2.4 (UNRELEASED) ## Changes in this version: @@ -95,6 +94,9 @@ - Tweak --progress to display "`??:??:??`" when the time-remaining value is so large as to be meaningless. + - Silence some chmod warnings about symlinks when it looks like we have a + function to set their permissions but they can't really be set. + ### ENHANCEMENTS: - Use openssl's `-verify_hostname` option in the rsync-ssl script. @@ -171,7 +173,7 @@ - Try to support a client that sent a remote rsync a wacko stderr file handle (such as an older File::RsyncP perl library used by BackupPC). - - Some man page improvements. + - Lots of man page improvements, including better html versions. ### PACKAGING RELATED: @@ -222,7 +224,6 @@ - Use mallinfo2() instead of mallinfo(), when available. - ------------------------------------------------------------------------------ # NEWS for rsync 3.2.3 (6 Aug 2020) diff --git a/generator.c b/generator.c index 3a45b4bd..454fd19f 100644 --- a/generator.c +++ b/generator.c @@ -532,7 +532,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre iflags |= ITEM_REPORT_CRTIME; } #endif -#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST +#ifndef CAN_CHMOD_SYMLINK if (S_ISLNK(file->mode)) { ; } else diff --git a/packaging/release-rsync b/packaging/release-rsync index 78f1676f..d484628c 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -206,10 +206,10 @@ About to: txt = replace_or_die(x_re, repl, txt, f"Unable to find SUBPROTOCOL_VERSION define in {fn}") elif fn == 'NEWS.md': efv = re.escape(finalversion) - x_re = re.compile(r'^<.+>\s+# NEWS for rsync %s \(UNRELEASED\)\s+## Changes in this version:\n' % efv + x_re = re.compile(r'^# NEWS for rsync %s \(UNRELEASED\)\s+## Changes in this version:\n' % efv + r'(\n### PROTOCOL NUMBER:\s+- The protocol number was changed to \d+\.\n)?') rel_day = 'UNRELEASED' if pre else today - repl = (f'<a name="{finalversion}"></a>\n\n# NEWS for rsync {finalversion} ({rel_day})\n\n' + repl = (f'# NEWS for rsync {finalversion} ({rel_day})\n\n' + '## Changes in this version:\n') if proto_changed: repl += f'\n### PROTOCOL NUMBER:\n\n - The protocol number was changed to {protocol_version}.\n' diff --git a/rsync.1.md b/rsync.1.md index 703d0f17..b5685d3f 100644 --- a/rsync.1.md +++ b/rsync.1.md @@ -169,15 +169,15 @@ spaces from the local shell but not also from the remote shell: > rsync -aiv host:'a simple file.pdf' /dest/ -Older versions of rsync only allowed specifying one remote-source arg, so it -required the remote side to split the args at a space. You can still get this -old-style arg splitting by using the [`--old-args`](#opt) option: +Really old versions of rsync only allowed specifying one remote-source arg, so +it required the remote side to split the args at a space. You can still get +this old-style arg splitting by using the [`--old-args`](#opt) option: > rsync -ai --old-args host:'dir1/file1 dir2/file2' /dest > rsync -ai --old-args host::'modname/dir1/file1 modname/dir2/file2' /dest -See that option's section for an environment variable that can be exported to -help old scripts. +See that option's section for an [environment variable](#RSYNC_OLD_ARGS) that +can be exported to help old scripts. ## CONNECTING TO AN RSYNC DAEMON @@ -2331,7 +2331,7 @@ your home directory (remove the '=' for that). character-set. The translation happens before wild-cards are expanded. See also the [`--files-from`](#opt) option. - You may also control this setting via the [`RSYNC_PROTECT_ARGS`)(#) + You may also control this setting via the [`RSYNC_PROTECT_ARGS`](#) environment variable. If it has a non-zero value, this setting will be enabled by default, otherwise it will be disabled by default. Either state is overridden by a manually specified positive or negative version of this diff --git a/syscall.c b/syscall.c index c037349b..f6a7b0af 100644 --- a/syscall.c +++ b/syscall.c @@ -257,7 +257,10 @@ int do_chmod(const char *path, mode_t mode) memset(&attrList, 0, sizeof attrList); attrList.bitmapcount = ATTR_BIT_MAP_COUNT; attrList.commonattr = ATTR_CMN_ACCESSMASK; - code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW); + if ((code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW)) == 0) + break; + if (errno == ENOTSUP) + code = 1; # else code = 1; # endif -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs