<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fbf992c6ef2a5788b686ba291d32c3891a92f8de">https://github.com/macports/macports-ports/commit/fbf992c6ef2a5788b686ba291d32c3891a92f8de</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fbf992c6ef2 rsync: Update to 3.3.0
</span>fbf992c6ef2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fbf992c6ef2a5788b686ba291d32c3891a92f8de
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Apr 16 12:13:39 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> rsync: Update to 3.3.0
</span>---
net/rsync/Portfile | 11 ++++-----
net/rsync/files/fileflags.diff | 55 ++++++++++++++++--------------------------
2 files changed, 26 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync/Portfile b/net/rsync/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 38eff0f39ce..a1a3ff04683 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/rsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,11 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name rsync
conflicts rsync-hfscomp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.3.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ca09e13ff44c274c98b01327bb13cb4b88fc6d83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1149787
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e743ad58c56b0bcaaa40625b2294faa63f37dc22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1153969
</span>
categories net
license {GPL-3+ OpenSSLException}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +39,7 @@ depends_lib port:popt \
</span> patch.pre_args -p1
# This patch comes from
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://download.samba.org/pub/rsync/src/rsync-patches-3.2.7.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://download.samba.org/pub/rsync/src/rsync-patches-3.3.0.tar.gz
</span> # and needs to be updated with each release.
# We used to use hfs-compression.diff but it has been deliberately
# disabled by its developers as of 3.1.3 because it needs to be reworked
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/rsync/files/fileflags.diff b/net/rsync/files/fileflags.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 554564a4655..4901bdb4b77 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/rsync/files/fileflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/rsync/files/fileflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
</span> ./configure (optional if already run)
make
<span style='display:block; white-space:pre;background:#ffe0e0;'>-based-on: 6b5ae825db985e9d1c98576651b50c8e490ddb97
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+based-on: 6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
</span> diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,7 +341,7 @@ diff --git a/main.c b/main.c
</span> extern int msgs2stderr;
extern int module_id;
extern int read_only;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -975,6 +979,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -977,6 +981,22 @@ static int do_recv(int f_in, int f_out, char *local_name)
</span> * points to an identical file won't be replaced by the referent. */
copy_links = copy_dirlinks = copy_unsafe_links = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -383,7 +383,7 @@ diff --git a/options.c b/options.c
</span> int io_timeout = 0;
int prune_empty_dirs = 0;
int use_qsort = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -622,6 +624,8 @@ static struct poptOption long_options[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -623,6 +625,8 @@ static struct poptOption long_options[] = {
</span> {"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 },
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -392,7 +392,7 @@ diff --git a/options.c b/options.c
</span> {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
{"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
{"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -720,6 +724,12 @@ static struct poptOption long_options[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -721,6 +725,12 @@ static struct poptOption long_options[] = {
</span> {"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 },
{"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
{"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -405,7 +405,7 @@ diff --git a/options.c b/options.c
</span> {"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
{"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
{"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1015,6 +1025,14 @@ static void set_refuse_options(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1016,6 +1026,14 @@ static void set_refuse_options(void)
</span> #ifndef SUPPORT_CRTIMES
parse_one_refuse_match(0, "crtimes", list_end);
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -420,7 +420,7 @@ diff --git a/options.c b/options.c
</span>
/* Now we use the descrip values to actually mark the options for refusal. */
for (op = long_options; op != list_end; op++) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2712,6 +2730,9 @@ void server_options(char **args, int *argc_p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2734,6 +2752,9 @@ void server_options(char **args, int *argc_p)
</span> if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -430,7 +430,7 @@ diff --git a/options.c b/options.c
</span> if (do_compression && do_compression_level != CLVL_NOT_SPECIFIED) {
if (asprintf(&arg, "--compress-level=%d", do_compression_level) < 0)
goto oom;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2807,6 +2828,16 @@ void server_options(char **args, int *argc_p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2829,6 +2850,16 @@ void server_options(char **args, int *argc_p)
</span> args[ac++] = "--delete-excluded";
if (force_delete)
args[ac++] = "--force";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -525,7 +525,7 @@ diff --git a/rsync.1.md b/rsync.1.md
</span> 0. `--chmod=CHMOD`
This option tells rsync to apply one or more comma-separated "chmod" modes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2017,8 +2053,8 @@ expand it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2019,8 +2055,8 @@ expand it.
</span> [`--ignore-missing-args`](#opt) option a step farther: each missing arg
will become a deletion request of the corresponding destination file on the
receiving side (should it exist). If the destination file is a non-empty
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -536,7 +536,7 @@ diff --git a/rsync.1.md b/rsync.1.md
</span> independent of any other type of delete processing.
The missing source files are represented by special file-list entries which
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2029,14 +2065,14 @@ expand it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2031,14 +2067,14 @@ expand it.
</span> Tells [`--delete`](#opt) to go ahead and delete files even when there are
I/O errors.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -554,7 +554,7 @@ diff --git a/rsync.1.md b/rsync.1.md
</span> [`--recursive`](#opt) option was also enabled.
0. `--max-delete=NUM`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3096,7 +3132,7 @@ expand it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3099,7 +3135,7 @@ expand it.
</span> also turns on the output of other verbose messages).
The "%i" escape has a cryptic output that is 11 letters long. The general
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1118,23 +1118,10 @@ diff --git a/xattrs.c b/xattrs.c
</span> if (!IS_DEVICE(fst.st_mode))
fst.st_rdev = 0; /* just in case */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Nurp a/aclocal.m4 b/aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,6 +12,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # PARTICULAR PURPOSE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--m4_include([../m4/have_type.m4])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--m4_include([../m4/header_major_fixed.m4])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--m4_include([../m4/socklen_t.m4])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+m4_include([m4/have_type.m4])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+m4_include([m4/header_major_fixed.m4])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+m4_include([m4/socklen_t.m4])
</span> diff -Nurp a/rsync.1 b/rsync.1
--- a/rsync.1
+++ b/rsync.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -543,6 +543,7 @@ has its own detailed description later i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -545,6 +545,7 @@ has its own detailed description later i
</span> --keep-dirlinks, -K treat symlinked dir on receiver as dir
--hard-links, -H preserve hard links
--perms, -p preserve permissions
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1142,7 +1129,7 @@ diff -Nurp a/rsync.1 b/rsync.1
</span> --executability, -E preserve executability
--chmod=CHMOD affect file and/or directory permissions
--acls, -A preserve ACLs (implies --perms)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -584,7 +585,10 @@ has its own detailed description later i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -586,7 +587,10 @@ has its own detailed description later i
</span> --ignore-missing-args ignore missing source args without error
--delete-missing-args delete missing source args from destination
--ignore-errors delete even if there are I/O errors
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1154,7 +1141,7 @@ diff -Nurp a/rsync.1 b/rsync.1
</span> --max-delete=NUM don't delete more than NUM files
--max-size=SIZE don't transfer any file larger than SIZE
--min-size=SIZE don't transfer any file smaller than SIZE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -915,6 +919,7 @@ This is equivalent to \fB\-rlptgoD\fP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -917,6 +921,7 @@ This is equivalent to \fB\-rlptgoD\fP.
</span> recursion and want to preserve almost everything. Be aware that it does
\fBnot\fP include preserving ACLs (\fB\-A\fP), xattrs (\fB\-X\fP), atimes (\fB\-U\fP),
crtimes (\fB\-N\fP), nor the finding and preserving of hardlinks (\fB\-H\fP).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1162,7 +1149,7 @@ diff -Nurp a/rsync.1 b/rsync.1
</span> .IP
The only exception to the above equivalence is when \fB\-\-files-from\fP
is specified, in which case \fB\-r\fP is not implied.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1379,7 +1384,7 @@ to non-directories to be affected, as th
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1381,7 +1386,7 @@ to non-directories to be affected, as th
</span> Without this option, if the sending side has replaced a directory with a
symlink to a directory, the receiving side will delete anything that is in
the way of the new symlink, including a directory hierarchy (as long as
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1171,7 +1158,7 @@ diff -Nurp a/rsync.1 b/rsync.1
</span> .IP
See also \fB\-\-keep-dirlinks\fP for an analogous option for the
receiving side.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1597,6 +1602,29 @@ receiver-only rule that excludes all nam
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1599,6 +1604,29 @@ receiver-only rule that excludes all nam
</span> Note that the \fB\-X\fP option does not copy rsync's special xattr values (e.g.
those used by \fB\-\-fake-super\fP) unless you repeat the option (e.g. \fB\-XX\fP).
This "copy all xattrs" mode cannot be used with \fB\-\-fake-super\fP.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1201,7 +1188,7 @@ diff -Nurp a/rsync.1 b/rsync.1
</span> .IP "\fB\-\-chmod=CHMOD\fP"
This option tells rsync to apply one or more comma-separated "chmod" modes
to the permission of the files in the transfer. The resulting value is
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2078,8 +2106,8 @@ This option takes the behavior of the (i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2082,8 +2110,8 @@ This option takes the behavior of the (i
</span> \fB\-\-ignore-missing-args\fP option a step farther: each missing arg
will become a deletion request of the corresponding destination file on the
receiving side (should it exist). If the destination file is a non-empty
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1212,7 +1199,7 @@ diff -Nurp a/rsync.1 b/rsync.1
</span> independent of any other type of delete processing.
.IP
The missing source files are represented by special file-list entries which
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2087,13 +2115,13 @@ display as a "\fB*missing\fP" entry in t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2091,13 +2119,13 @@ display as a "\fB*missing\fP" entry in t
</span> .IP "\fB\-\-ignore-errors\fP"
Tells \fB\-\-delete\fP to go ahead and delete files even when there are
I/O errors.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1229,7 +1216,7 @@ diff -Nurp a/rsync.1 b/rsync.1
</span> \fB\-\-recursive\fP option was also enabled.
.IP "\fB\-\-max-delete=NUM\fP"
This tells rsync not to delete more than NUM files or directories. If that
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3154,7 +3182,7 @@ version 2.6.7 (you can use \fB\-vv\fP wi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3159,7 +3187,7 @@ version 2.6.7 (you can use \fB\-vv\fP wi
</span> also turns on the output of other verbose messages).
.IP
The "%i" escape has a cryptic output that is 11 letters long. The general
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1318,7 +1305,7 @@ diff -Nurp a/rsync.1.html b/rsync.1.html
</span> <dt id="opt--chmod"><code>--chmod=CHMOD</code><a href="#opt--chmod" class="tgt"></a></dt><dd>
<p>This option tells rsync to apply one or more comma-separated "chmod" modes
to the permission of the files in the transfer. The resulting value is
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1902,8 +1938,8 @@ is no longer there.</p>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1904,8 +1940,8 @@ is no longer there.</p>
</span> <a href="#opt--ignore-missing-args"><code>--ignore-missing-args</code></a> option a step farther: each missing arg
will become a deletion request of the corresponding destination file on the
receiving side (should it exist). If the destination file is a non-empty
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1329,7 +1316,7 @@ diff -Nurp a/rsync.1.html b/rsync.1.html
</span> independent of any other type of delete processing.</p>
<p>The missing source files are represented by special file-list entries which
display as a "<code>*missing</code>" entry in the <a href="#opt--list-only"><code>--list-only</code></a> output.</p>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1914,12 +1950,12 @@ display as a "<code>*missing</code>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1916,12 +1952,12 @@ display as a "<code>*missing</code>
</span> I/O errors.</p>
</dd>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1345,7 +1332,7 @@ diff -Nurp a/rsync.1.html b/rsync.1.html
</span> <a href="#opt--recursive"><code>--recursive</code></a> option was also enabled.</p>
</dd>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2891,7 +2927,7 @@ files will also be output, but only if t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2894,7 +2930,7 @@ files will also be output, but only if t
</span> version 2.6.7 (you can use <code>-vv</code> with older versions of rsync, but that
also turns on the output of other verbose messages).</p>
<p>The "%i" escape has a cryptic output that is 11 letters long. The general
</pre><pre style='margin:0'>
</pre>