[Bug 13526] Hard link creation time

2020-04-26 Thread just subscribed for rsync-qa from bugzilla via rsync
https://bugzilla.samba.org/show_bug.cgi?id=13526

Wayne Davison  changed:

   What|Removed |Added

Version|3.1.3   |3.2.0
 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Wayne Davison  ---
Indeed, you are exactly right about that assignment being missing. I've
committed a fix into the rsync-patches git repo.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.

-- 
Please use reply-all for most replies to avoid omitting the mailing list.
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html


[SCM] The rsync repository. - branch master updated

2020-04-26 Thread Rsync CVS commit messages
The branch, master has been updated
   via  c1cb307b Fix a couple issues with the atime file-list value.
  from  af6118d9 Allow a missing parent dir when --delete-missing-args was 
specified.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -
commit c1cb307b4b02cce539effcc01c82c060cd6facd0
Author: Wayne Davison 
Date:   Sun Apr 26 18:39:15 2020 -0700

Fix a couple issues with the atime file-list value.

---

Summary of changes:
 flist.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/flist.c b/flist.c
index a756fb67..d5f169ce 100644
--- a/flist.c
+++ b/flist.c
@@ -770,6 +770,8 @@ static struct file_struct *recv_file_entry(int f, struct 
file_list *flist, int x
modtime = first->modtime;
modtime_nsec = F_MOD_NSEC_or_0(first);
mode = first->mode;
+   if (atimes_ndx && !S_ISDIR(mode))
+   atime = F_ATIME(first);
if (preserve_uid)
uid = F_OWNER(first);
if (preserve_gid)
@@ -985,7 +987,7 @@ static struct file_struct *recv_file_entry(int f, struct 
file_list *flist, int x
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
-   if (atimes_ndx)
+   if (atimes_ndx && !S_ISDIR(mode))
F_ATIME(file) = atime;
if (unsort_ndx)
F_NDX(file) = flist->used + flist->ndx_start;
@@ -1384,7 +1386,7 @@ struct file_struct *make_file(const char *fname, struct 
file_list *flist,
F_GROUP(file) = st.st_gid;
if (am_generator && st.st_uid == our_uid)
file->flags |= FLAG_OWNED_BY_US;
-   if (atimes_ndx)
+   if (atimes_ndx && !S_ISDIR(file->mode))
F_ATIME(file) = st.st_atime;
 
if (basename != thisname)


-- 
The rsync repository.

___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs


[Bug 12569] Missing directory errors not ignored

2020-04-26 Thread just subscribed for rsync-qa from bugzilla via rsync
https://bugzilla.samba.org/show_bug.cgi?id=12569

Wayne Davison  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED

--- Comment #12 from Wayne Davison  ---
This check was added to try to prevent an untrusted sender from sneaking
through some bad file-list data.  However, the --delete-missing-args option
does seem to have the ability to send these incongruent lists.  I'm thinking
that the best fix is probably to have the sender fudge up the missing parent
dirs if they can be marked as missing like the missing args.  In the meantime,
I'm checking in a slightly different version of Paul's patch that makes the
receiver just complain about the missing parent dir info and continue on (it
does not return or a valid missing arg won't be deleted).

-- 
You are receiving this mail because:
You are the QA Contact for the bug.

-- 
Please use reply-all for most replies to avoid omitting the mailing list.
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html


[SCM] The rsync repository. - branch master updated

2020-04-26 Thread Rsync CVS commit messages
The branch, master has been updated
   via  af6118d9 Allow a missing parent dir when --delete-missing-args was 
specified.
  from  ea3337a2 Add extensions to the default no-compress list. Fixes bug 
#13749.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -
commit af6118d98b3482cbcfc223bf2a0777bc19eccb02
Author: Wayne Davison 
Date:   Sun Apr 26 18:02:17 2020 -0700

Allow a missing parent dir when --delete-missing-args was specified.

---

Summary of changes:
 generator.c | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/generator.c b/generator.c
index 3c50f63f..b90c7ccd 100644
--- a/generator.c
+++ b/generator.c
@@ -1277,10 +1277,16 @@ static void recv_generator(char *fname, struct 
file_struct *file, int ndx,
 && (*dn != '.' || dn[1]) /* Avoid an issue with 
--relative and the "." dir. */
 && (!prior_dir_file || strcmp(dn, 
f_name(prior_dir_file, NULL)) != 0)
 && flist_find_name(cur_flist, dn, 1) < 0) {
-   rprintf(FERROR,
-   "ABORTING due to invalid path from 
sender: %s/%s\n",
-   dn, file->basename);
-   exit_cleanup(RERR_PROTOCOL);
+   /* The --delete-missing-args option can 
actually put invalid entries into
+* the file list, so if that option was 
specified, we'll just complain about
+* it and allow it. */
+   if (missing_args == 2 && file->mode == 0)
+   rprintf(FERROR, "WARNING: parent dir is 
absent in the file list: %s\n", dn);
+   else {
+   rprintf(FERROR, "ABORTING due to 
invalid path from sender: %s/%s\n",
+   dn, file->basename);
+   exit_cleanup(RERR_PROTOCOL);
+   }
}
if (relative_paths && !implied_dirs
 && do_stat(dn, ) < 0) {
@@ -1383,7 +1389,7 @@ static void recv_generator(char *fname, struct 
file_struct *file, int ndx,
added_perms = 0;
if (is_dir < 0) {
if (!(preserve_times & PRESERVE_DIR_TIMES))
-   return;
+   goto cleanup;
/* In inc_recurse mode we want to make sure any missing
 * directories get created while we're still processing
 * the parent dir (which allows us to touch the parent
@@ -1525,7 +1531,7 @@ static void recv_generator(char *fname, struct 
file_struct *file, int ndx,
"ignoring unsafe symlink \"%s\" -> 
\"%s\"\n",
fname, sl);
}
-   return;
+   goto cleanup;
}
if (statret == 0) {
char lnk[MAXPATHLEN];


-- 
The rsync repository.

___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs


[Bug 13749] Add more extensions to DEFAULT_DONT_COMPRESS

2020-04-26 Thread just subscribed for rsync-qa from bugzilla via rsync
https://bugzilla.samba.org/show_bug.cgi?id=13749

Wayne Davison  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED
Version|3.1.3   |3.2.0

--- Comment #1 from Wayne Davison  ---
I just added the extensions you mentioned.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.

-- 
Please use reply-all for most replies to avoid omitting the mailing list.
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html


[SCM] The rsync repository. - branch master updated

2020-04-26 Thread Rsync CVS commit messages
The branch, master has been updated
   via  ea3337a2 Add extensions to the default no-compress list. Fixes bug 
#13749.
  from  035a13f7 Add a few new opts to rrsync.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -
commit ea3337a2107743fa22347ae075bbe3fafe297b69
Author: Wayne Davison 
Date:   Sun Apr 26 17:05:02 2020 -0700

Add extensions to the default no-compress list.
Fixes bug #13749.

---

Summary of changes:
 loadparm.c | 3 ++-
 rsync.yo   | 4 
 t_unsafe.c | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/loadparm.c b/loadparm.c
index 8117fb35..bd8a5208 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -54,7 +54,8 @@ extern item_list dparam_list;
 
 #define DEFAULT_DONT_COMPRESS "*.gz *.zip *.z *.rpm *.deb *.iso *.bz2" \
" *.t[gb]z *.7z *.mp[34] *.mov *.avi *.ogg *.jpg *.jpeg *.png" \
-   " *.lzo *.rzip *.lzma *.rar *.ace *.gpg *.xz *.txz *.lz *.tlz"
+   " *.lzo *.rzip *.lzma *.rar *.ace *.gpg *.xz *.txz *.lz *.tlz" \
+   " *.ogv *.web[mp] *.squashfs"
 
 /* the following are used by loadparm for option lists */
 typedef enum {
diff --git a/rsync.yo b/rsync.yo
index 0eecaaf6..59d84265 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -2094,14 +2094,18 @@ bf(mov)
 bf(mp3)
 bf(mp4)
 bf(ogg)
+bf(ogv)
 bf(png)
 bf(rar)
 bf(rpm)
 bf(rzip)
+bf(squashfs)
 bf(tbz)
 bf(tgz)
 bf(tlz)
 bf(txz)
+bf(webm)
+bf(webp)
 bf(xz)
 bf(z)
 bf(zip)
diff --git a/t_unsafe.c b/t_unsafe.c
index 0071bf60..3f41ddb4 100644
--- a/t_unsafe.c
+++ b/t_unsafe.c
@@ -2,7 +2,7 @@
  * Test harness for unsafe_symlink().  Not linked into rsync itself.
  *
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2019 Wayne Davison
+ * Copyright (C) 2003-2020 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


-- 
The rsync repository.

___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs


[SCM] The rsync repository. - branch master updated

2020-04-26 Thread Rsync CVS commit messages
The branch, master has been updated
   via  035a13f7 Add a few new opts to rrsync.
   via  f14adfd7 Some var cleanup; move test-util vars into t_stub.c.
  from  d218be34 Update a few more copyright years.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -
commit 035a13f7e483efa47847c5d77a8b0dd30ebd8925
Author: Wayne Davison 
Date:   Sun Apr 26 14:50:40 2020 -0700

Add a few new opts to rrsync.

commit f14adfd75e72d3bf5833eebe85f3ed9c1b4cb477
Author: Wayne Davison 
Date:   Sun Apr 26 14:05:27 2020 -0700

Some var cleanup; move test-util vars into t_stub.c.

---

Summary of changes:
 Makefile.in| 6 +++---
 log.c  | 1 -
 support/rrsync | 4 +++-
 t_stub.c   | 3 ++-
 t_unsafe.c | 3 ---
 tls.c  | 5 -
 trimslash.c| 5 -
 7 files changed, 8 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index 536be420..59649562 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,7 @@ popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
popt/popthelp.o popt/poptparse.o
 OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ 
@BUILD_POPT@
 
-TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o 
lib/sysxattrs.o @BUILD_POPT@
+TLS_OBJ = tls.o syscall.o t_stub.o lib/compat.o lib/snprintf.o 
lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
 
 # Programs we must have to run the test cases
 CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) 
\
@@ -127,7 +127,7 @@ getgroups$(EXEEXT): getgroups.o
 getfsdev$(EXEEXT): getfsdev.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
 
-TRIMSLASH_OBJ = trimslash.o syscall.o lib/compat.o lib/snprintf.o
+TRIMSLASH_OBJ = trimslash.o syscall.o t_stub.o lib/compat.o lib/snprintf.o
 trimslash$(EXEEXT): $(TRIMSLASH_OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
 
@@ -283,7 +283,7 @@ check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
 check30: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=30
 
-wildtest.o: wildtest.c lib/wildmatch.c rsync.h config.h
+wildtest.o: wildtest.c t_stub.o lib/wildmatch.c rsync.h config.h
 wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.o lib/compat.o lib/snprintf.o 
@BUILD_POPT@ $(LIBS)
 
diff --git a/log.c b/log.c
index ae6214da..059df046 100644
--- a/log.c
+++ b/log.c
@@ -47,7 +47,6 @@ extern int64 total_data_written;
 extern int64 total_data_read;
 extern mode_t orig_umask;
 extern char *auth_user;
-extern char *checksum_choice;
 extern char *stdout_format;
 extern char *logfile_format;
 extern char *logfile_name;
diff --git a/support/rrsync b/support/rrsync
index 3bbca2e0..a538fbba 100644
--- a/support/rrsync
+++ b/support/rrsync
@@ -62,7 +62,7 @@ die "$0 reading from write-only server not allowed\n" if 
$only eq 'w' && $am_sen
 # To disable a short-named option, add its letter to this string:
 our $short_disabled = 's';
 
-our $short_no_arg = 'ACDEHIJKLORSWXbcdgklmnoprstuvxyz'; # DO NOT REMOVE ANY
+our $short_no_arg = 'ACDEHIJKLORSUWXbcdgklmnoprstuvxyz'; # DO NOT REMOVE ANY
 our $short_with_num = '@B'; # DO NOT REMOVE ANY
 
 # To disable a long-named option, change its value to a -1.  The values mean:
@@ -122,6 +122,7 @@ our %long_opt = (
   'numeric-ids' => 0,
   'one-file-system' => 0,
   'only-write-batch' => 1,
+  'open-noatime' => 0,
   'owner' => 0,
   'partial' => 0,
   'partial-dir' => 2,
@@ -144,6 +145,7 @@ our %long_opt = (
   'times' => 0,
   'use-qsort' => 0,
   'usermap' => 1,
+  'write-devices' => -1,
 );
 
 ### END of options data produced by the cull_options script. ###
diff --git a/t_stub.c b/t_stub.c
index 84dd88f4..17baee82 100644
--- a/t_stub.c
+++ b/t_stub.c
@@ -28,9 +28,10 @@ int protect_args = 0;
 int module_id = -1;
 int relative_paths = 0;
 int module_dirlen = 0;
-int preserve_acls = 0;
 int preserve_times = 0;
 int preserve_xattrs = 0;
+int preserve_perms = 0;
+int preserve_executability = 0;
 int open_noatime = 0;
 char *partial_dir;
 char *module_dir;
diff --git a/t_unsafe.c b/t_unsafe.c
index 4ab6850a..0071bf60 100644
--- a/t_unsafe.c
+++ b/t_unsafe.c
@@ -28,9 +28,6 @@ int am_root = 0;
 int am_sender = 1;
 int read_only = 0;
 int list_only = 0;
-int human_readable = 0;
-int preserve_perms = 0;
-int preserve_executability = 0;
 short info_levels[COUNT_INFO], debug_levels[COUNT_DEBUG];
 
 int
diff --git a/tls.c b/tls.c
index ac402eba..7d48dab8 100644
--- a/tls.c
+++ b/tls.c
@@ -49,11 +49,6 @@ int list_only = 0;
 int link_times = 0;
 int link_owner = 0;
 int nsec_times = 0;
-int preserve_perms = 0;
-int preserve_executability = 0;
-int preallocate_files = 0;
-int open_noatime = 0;
-int inplace = 0;
 
 #ifdef SUPPORT_XATTRS
 
diff --git a/trimslash.c 

[Bug 13071] [PATCH] Allow --partial-dir with --inplace

2020-04-26 Thread just subscribed for rsync-qa from bugzilla via rsync
https://bugzilla.samba.org/show_bug.cgi?id=13071

--- Comment #6 from Wayne Davison  ---
Created attachment 15941
  --> https://bugzilla.samba.org/attachment.cgi?id=15941=edit
A simpler patch that just uses in-place updates of partial-dir files when
possible

-- 
You are receiving this mail because:
You are the QA Contact for the bug.

-- 
Please use reply-all for most replies to avoid omitting the mailing list.
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html


[Bug 13071] [PATCH] Allow --partial-dir with --inplace

2020-04-26 Thread just subscribed for rsync-qa from bugzilla via rsync
https://bugzilla.samba.org/show_bug.cgi?id=13071

Wayne Davison  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED

--- Comment #5 from Wayne Davison  ---
I dislike confusing what --inplace means. While an expert will know that it
changes meaning in different circumstances, I think it best that it always
means that the final destination file should be updated in-place, and thus
rsync should tell the user when it can't be used in combination with other
options.

As for the changes in this patch, I see 2 aspects of its interaction with the
partial-dir.  First, what happens when transferring a file that has a partial
file that already exists? And second, is the partial-dir used to store all the
temp files that are created for a transfer rather than the normal tmp file
being created and the partial-dir only getting created if the transfer is
interrupted?

As for the first part, I'm thinking that it would be fine if we change how a
partial-dir file is handled to always update it in-place, especially since
there is a good chance that the transferred file's early data is OK. The hard
part of that is that the sender needs to know which files are in-place
transfers so that it can restrict the checksum matching algorithm, so we must
know that the sender is new enough to respond to a FNAMECMP_PARTIAL_DIR value
as an indicator that the file is going to be handled in-place.  This could be
done via a compat flag character sent via -e or by forcing it to be an option
that an older sender would reject as unknown.

As for the second part, I'm not sure how much of a need there is for changing
the default behavior of the tmp file creation, and would probably not include
that change.  Also, the patch has an error in it where files in a subdir of the
transfer do not get created if the partial-dir is a relative path instead of an
absolute path (this is due to its use of "dummy" in the call that creates the
dir).

One interesting aspect of the patch is that it allows the --append option to be
used on partial files.  This could be useful if you're 100% certain that the
huge partial file is still a valid prefix of the source file.  However,
specifying --append with a --partial-dir would also affect how non-partial-dir
files get transferred, and is thus not a good way to affect just the continuing
of a partial-dir file's contents.  If we want appending of partial file data,
it would be better to add a --partial-append option and have both sides only
apply append behavior to the FNAMECMP_PARTIAL_DIR transfers.

Finally, since this patch sets the inplace flag for all files, it also has the
side effect that even non-partial files get the limited checksum matching
rules, which can make some transfers of shifted data much less efficient.

I'm looking at a simpler change which I will attach as a patch. I would
appreciate some feedback if the simpler behavior is enough for what you wanted
from this change.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.

-- 
Please use reply-all for most replies to avoid omitting the mailing list.
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html


Re: Enabling easier contributions to rsync

2020-04-26 Thread Ben RUBSON via rsync
> On 26 Apr 2020, at 20:37, Filipe Maia via rsync  wrote:
> 
> Hi,
> 
> Are there plans to soon move to github or some other place where people can 
> easily contribute to rsync, making the software discussion more lively and 
> productive? 
> I've seen several useful patches being submitted (e.g. faster checksums) 
> which many others could really use...

+1 for GitHub, would really be convenient !

Wayne, time to switch ? :-)

Ben


-- 
Please use reply-all for most replies to avoid omitting the mailing list.
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html


Enabling easier contributions to rsync

2020-04-26 Thread Filipe Maia via rsync
Hi,

Are there plans to soon move to github or some other place where people can
easily contribute to rsync, making the software discussion more lively and
productive?
I've seen several useful patches being submitted (e.g. faster checksums)
which many others could really use...

Cheers,
Filipe
-- 
Please use reply-all for most replies to avoid omitting the mailing list.
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html


[SCM] The rsync repository. - branch master updated

2020-04-26 Thread Rsync CVS commit messages
The branch, master has been updated
   via  d218be34 Update a few more copyright years.
   via  f4c077e8 Change pending version to 3.2.0 (currently 3.2.0dev).
  from  1c7785ab Change do_setattrlist_times() to use an stp arg.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -
commit d218be3482fc3567a9393de6c133efd7266db243
Author: Wayne Davison 
Date:   Sat Apr 25 23:34:16 2020 -0700

Update a few more copyright years.

commit f4c077e85e407d4866a095101d082c9debebad85
Author: Wayne Davison 
Date:   Sat Apr 25 23:30:42 2020 -0700

Change pending version to 3.2.0 (currently 3.2.0dev).

---

Summary of changes:
 NEWS | 2 +-
 OLDNEWS  | 2 +-
 compat.c | 2 +-
 configure.ac | 2 +-
 rsync-ssl.yo | 2 +-
 rsync.yo | 4 ++--
 syscall.c| 2 +-
 t_stub.c | 2 +-
 tls.c| 2 +-
 trimslash.c  | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/NEWS b/NEWS
index cd9a1cfb..5e9d356f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-NEWS for rsync 3.1.4 (UNRELEASED)
+NEWS for rsync 3.2.0 (UNRELEASED)
 Protocol: 31 (unchanged)
 Changes since 3.1.3:
 
diff --git a/OLDNEWS b/OLDNEWS
index 084c3d48..8b5e0140 100644
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -3746,7 +3746,7 @@ Changes since 2.4.6:
 
 Partial Protocol History
RELEASE DATEVER.DATE OF COMMIT* PROTOCOL
-   ?? May 2020 3.1.4   ??
+   ?? May 2020 3.2.0   ??
28 Jan 2018 3.1.3   31
21 Dec 2015 3.1.2   31
22 Jun 2014 3.1.1   31
diff --git a/compat.c b/compat.c
index 6298b904..40de14bb 100644
--- a/compat.c
+++ b/compat.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Andrew Tridgell 1996
  * Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2004-2019 Wayne Davison
+ * Copyright (C) 2004-2020 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/configure.ac b/configure.ac
index 55fccd8e..fef9004c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([rsync],[3.1.4dev],[http://rsync.samba.org/bugzilla.html])
+AC_INIT([rsync],[3.2.0dev],[http://rsync.samba.org/bugzilla.html])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([byteorder.h])
diff --git a/rsync-ssl.yo b/rsync-ssl.yo
index dd3774d2..c23b3798 100644
--- a/rsync-ssl.yo
+++ b/rsync-ssl.yo
@@ -36,7 +36,7 @@ bf(--type=NAME) option overrides this, if specified.
 dit(bf(RSYNC_SSL_PORT)) If specified, the value is the port number that is used
 as the default when the user does not specify a port in their rsync command.
 When not specified, the default port number is 874.  (Note that older rsync
-versions (prior to 3.1.4) did not communicate an overriding port number value
+versions (prior to 3.2.0) did not communicate an overriding port number value
 to the helper script.)
 
 dit(bf(RSYNC_SSL_CERT)) If specified, the value is a filename that contains a
diff --git a/rsync.yo b/rsync.yo
index 1fd78b63..0eecaaf6 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -1250,7 +1250,7 @@ to make the sending and receiving systems have the same 
access times on the
 transferred files without needing to run rsync an extra time after a file is
 transferred.
 
-Note that some older rsync versions (prior to 3.1.4) may have been built with
+Note that some older rsync versions (prior to 3.2.0) may have been built with
 a pre-release bf(--atimes) patch that does not imply bf(--open-noatime) when
 this option is repeated.
 
@@ -1615,7 +1615,7 @@ shell connection, rather than through a direct socket 
connection to a
 running rsync daemon on the remote host.  See the section "USING
 RSYNC-DAEMON FEATURES VIA A REMOTE-SHELL CONNECTION" above.
 
-Beginning with rsync 3.1.4, the RSYNC_PORT environment variable will be
+Beginning with rsync 3.2.0, the RSYNC_PORT environment variable will be
 set when a daemon connection is being made via a remote-shell
 connection.  It is set to 0 if the default daemon port is being assumed,
 or it is set to the value of the rsync port that was specified via
diff --git a/syscall.c b/syscall.c
index bcd9738e..e1a02a3c 100644
--- a/syscall.c
+++ b/syscall.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 1998 Andrew Tridgell
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2019 Wayne Davison
+ * Copyright (C) 2003-2020 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/t_stub.c b/t_stub.c
index 6f01a24d..84dd88f4 100644
--- a/t_stub.c
+++ b/t_stub.c
@@ -3,7 +3,7 @@
  * functions, so that module test harnesses can run