Preparing for release of 3.2.2

Handle tweaked NEWS headings & protocol change.
Get rid of some superfluous lz4 code.
2026-05-25 15:25:30 -04:00 · 2020-07-04 23:12:59 -07:00 · 2020-07-04 23:11:46 -07:00 · 2020-07-04 16:13:00 -07:00 · 2020-07-04 16:10:37 -07:00 · 2020-07-04 14:21:15 -07:00
31 changed files with 764 additions and 880 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ aclocal.m4
 /help-rsync*.h
 /default-cvsignore.h
 /default-dont-compress.h
+/daemon-parm.h
 /.md2man-works
 /autom4te*.cache
 /confdefs.h
@@ -48,6 +49,7 @@ aclocal.m4
 /testsuite/devices-fake.test
 /testsuite/xattrs-hlink.test
 /patches
-/SaVeDiR
-/.gen-stash
+/patches.gen
+/build
+/auto-build-save
 .deps
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,4 @@
-# Makefile for rsync. This is processed by configure to produce the final
-# Makefile
+# The Makefile for rsync (configure creates it from Makefile.in).

 prefix=@prefix@
 datarootdir=@datarootdir@
@@ -27,8 +26,6 @@ MKDIR_P=@MKDIR_P@
 VPATH=$(srcdir)
 SHELL=/bin/sh

-VERSION=@RSYNC_VERSION@
-
 .SUFFIXES:
 .SUFFIXES: .c .o

@@ -38,7 +35,7 @@ ASM_x86_64=lib/md5-asm-x86_64.o
 GENFILES=configure.sh aclocal.m4 config.h.in proto.h proto.h-tstamp rsync.1 rsync.1.html \
 	 rsync-ssl.1 rsync-ssl.1.html rsyncd.conf.5 rsyncd.conf.5.html
 HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \
-	lib/pool_alloc.h lib/mdigest.h lib/md-defines.h
+	lib/pool_alloc.h lib/mdigest.h lib/md-defines.h version.h
 LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
 	lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@
 zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
@@ -104,7 +101,7 @@ $(CHECK_OBJS): $(HEADERS)
 tls.o xattrs.o: lib/sysxattrs.h
 options.o: latest-year.h help-rsync.h help-rsyncd.h
 exclude.o: default-cvsignore.h
-loadparm.o: default-dont-compress.h
+loadparm.o: default-dont-compress.h daemon-parm.h

 flist.o: rounding.h

@@ -114,6 +111,9 @@ default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
 help-rsync.h help-rsyncd.h: rsync.1.md help-from-md.awk
 	$(AWK) -f $(srcdir)/help-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md

+daemon-parm.h: daemon-parm.txt daemon-parm.awk
+	$(AWK) -f $(srcdir)/daemon-parm.awk $(srcdir)/daemon-parm.txt
+
 rounding.h: rounding.c rsync.h proto.h
 	@for r in 0 1 3; do \
 	    if $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/rounding.c >rounding.out 2>&1; then \
@@ -203,6 +203,10 @@ reconfigure: configure.sh
 	./config.status --recheck
 	./config.status

+.PHONY: restatus
+restatus:
+	./config.status
+
 Makefile: Makefile.in config.status configure.sh config.h.in
 	@if test -f Makefile; then cp -p Makefile Makefile.old; else touch Makefile.old; fi
 	@./config.status
@@ -227,19 +231,19 @@ proto: proto.h-tstamp
 proto.h: proto.h-tstamp
 	@if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi

-proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
-	$(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c
+proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h daemon-parm.h
+	$(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h

 .PHONY: man
 man: rsync.1 rsync-ssl.1 rsyncd.conf.5

-rsync.1: rsync.1.md md2man NEWS.md Makefile
+rsync.1: rsync.1.md md2man version.h Makefile
 	@$(srcdir)/maybe-make-man $(srcdir) rsync.1.md

-rsync-ssl.1: rsync-ssl.1.md md2man NEWS.md Makefile
+rsync-ssl.1: rsync-ssl.1.md md2man version.h Makefile
 	@$(srcdir)/maybe-make-man $(srcdir) rsync-ssl.1.md

-rsyncd.conf.5: rsyncd.conf.5.md md2man NEWS.md Makefile
+rsyncd.conf.5: rsyncd.conf.5.md md2man version.h Makefile
 	@$(srcdir)/maybe-make-man $(srcdir) rsyncd.conf.5.md

 .PHONY: clean
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,15 +1,18 @@
 <a name="3.2.2"></a>

-# NEWS for rsync 3.2.2 (UNRELEASED)
+# NEWS for rsync 3.2.2 (4 Jul 2020)

-Protocol: 31 (unchanged)
-
-## Changes since 3.2.1:
+## Changes in this version:

 ### BUG FIXES:

+ - Avoid a crash when a daemon module enables `transfer logging` without
+   setting a `log format` value.
+
 - Fixed installing rsync-ssl script from an alternate build dir.

+ - Fixed the updating of configure.sh from an alternate build dir.
+
 - Apple requires the asm function name to begin with an underscore.

 - Avoid a test failure in the daemon test when --atimes is disabled.
@@ -22,7 +25,7 @@ Protocol: 31 (unchanged)
   apply to both.

 - Simplify how the negotiation environment variables apply when interacting
-   with an older rsync version.
+   with an older rsync and also when a list contains only invalid names.

 - Do not allow a negotiated checksum or compression choice of "none" unless
   the user authorized it via an environment variable or command-line option.
@@ -34,29 +37,48 @@ Protocol: 31 (unchanged)
   also allows you to specify the value via the RSYNC_MAX_ALLOC environment
   variable.

+ - Add the "open atime" daemon parameter to allow a daemon to always enable or
+   disable the use of O_NOATIME (the default is to let the user control it).
+
+ - The default systemd config was changed to remove the `ProtectHome=on`
+   setting since rsync is often used to serve files in /home and /root and this
+   seemed a bit too strict.  Feel free to use `systemctl edit rsync` to add
+   that restriction (or maybe `ProtectHome=read-only`), if you like.  See the
+   3.2.0 NEWS for the other restrictions that were added compared to 3.1.3.
+
 - The memory allocation functions now automatically check for a failure and
   die when out of memory.  This eliminated some caller-side check-and-die
   code and added some missing sanity-checking of allocations.

+ - Put optimizations into their own list in the `--version` output.
+
 - Improved the man page a bit more.

 ### PACKAGING RELATED:

 - Prepared the checksum code for an upcoming xxHash release that provides new
-   XXH3 & XXH128 checksum routines.  These will not be compiled into rsync
-   until the xxhash v0.8.0 include files are installed on the build host, and
-   that release is a few weeks away at the time this was written.  So, if it's
-   now the future and you have packaged and installed xxhash-0.8.0-devel, a
-   fresh rebuild of rsync 3.2.2 will give you the new checksum routines.
+   XXH3 (64-bit) & XXH128 (128-bit) checksum routines.  These will not be
+   compiled into rsync until the xxhash v0.8.0 include files are installed on
+   the build host, and that release is a few weeks away at the time this was
+   written.  So, if it's now the future and you have packaged and installed
+   xxhash-0.8.0-devel, a fresh rebuild of rsync 3.2.2 will give you the new
+   checksum routines.  Just make sure that the new rsync package depends on
+   xxhash >= 0.8.0.
+
+### DEVELOPER RELATED:
+
+ - Moved the version number out of configure.ac into its own version.h file so
+   that we don't need to reconfigure just because the version number changes.
+
+ - Moved the daemon parameter list into daemon-parm.txt so that an awk script
+   can create the interrelated structs and accessors that loadparm.c needs.

 ------------------------------------------------------------------------------
 <a name="3.2.1"></a>

 # NEWS for rsync 3.2.1 (22 Jun 2020)

-Protocol: 31 (unchanged)
-
-## Changes since 3.2.0:
+## Changes in this version:

 ### BUG FIXES:

@@ -119,9 +141,7 @@ Protocol: 31 (unchanged)

 # NEWS for rsync 3.2.0 (19 Jun 2020)

-Protocol: 31 (unchanged)
-
-## Changes since 3.1.3:
+## Changes in this version:

 ### BUG FIXES:

@@ -174,6 +194,13 @@ Protocol: 31 (unchanged)

 ### ENHANCEMENTS:

+ - The default systemd config was made stricter by default.  For instance,
+   `ProtectHome=on` (which hides content in /root and /home/USER dirs),
+   `ProtectSystem=full` (which makes /usr, /boot, & /etc dirs read-only), and
+   `PrivateDevices=on` (which hides devices).  You can override any of these
+   using the standard `systemctl edit rsync` and add one or more directives
+   under a `[Service]` heading (and restart the rsync service).
+
 - Various checksum enhancements, including the optional use of openssl's MD4 &
   MD5 checksum algorithms, some x86-64 optimizations for the rolling checksum,
   some x86-64 optimizations for the (non-openssl) MD5 checksum, the addition
@@ -326,9 +353,7 @@ Protocol: 31 (unchanged)

 # NEWS for rsync 3.1.3 (28 Jan 2018)

-Protocol: 31 (unchanged)
-
-## Changes since 3.1.2:
+## Changes in this version:

 ### SECURITY FIXES:

@@ -398,9 +423,7 @@ Protocol: 31 (unchanged)

 # NEWS for rsync 3.1.2 (21 Dec 2015)

-Protocol: 31 (unchanged)
-
-## Changes since 3.1.1:
+## Changes in this version:

 ### SECURITY FIXES:

@@ -466,9 +489,7 @@ Protocol: 31 (unchanged)

 # NEWS for rsync 3.1.1 (22 Jun 2014)

-Protocol: 31 (unchanged)
-
-## Changes since 3.1.0:
+## Changes in this version:

 ### BUG FIXES:

@@ -588,9 +609,11 @@ Protocol: 31 (unchanged)

 # NEWS for rsync 3.1.0 (28 Sep 2013)

-Protocol: 31 (changed)
+## Changes in this version:

-## Changes since 3.0.9:
+### PROTOCOL NUMBER:
+
+ - The protocol number was changed to 31.

 ### OUTPUT CHANGES:

@@ -837,9 +860,7 @@ Protocol: 31 (changed)

 # NEWS for rsync 3.0.9 (23 Sep 2011)

-Protocol: 30 (unchanged)
-
-## Changes since 3.0.8:
+## Changes in this version:

 ### BUG FIXES:

@@ -899,9 +920,7 @@ Protocol: 30 (unchanged)

 # NEWS for rsync 3.0.8 (26 Mar 2011)

-Protocol: 30 (unchanged)
-
-## Changes since 3.0.7:
+## Changes in this version:

 ### BUG FIXES:

@@ -1040,9 +1059,7 @@ Protocol: 30 (unchanged)

 # NEWS for rsync 3.0.7 (31 Dec 2009)

-Protocol: 30 (unchanged)
-
-## Changes since 3.0.6:
+## Changes in this version:

 ### BUG FIXES:

@@ -1110,9 +1127,7 @@ Protocol: 30 (unchanged)

 # NEWS for rsync 3.0.6 (8 May 2009)

-Protocol: 30 (unchanged)
-
-## Changes since 3.0.5:
+## Changes in this version:

 ### BUG FIXES:

@@ -1171,9 +1186,7 @@ Protocol: 30 (unchanged)

 # NEWS for rsync 3.0.5 (28 Dec 2008)

-Protocol: 30 (unchanged)
-
-## Changes since 3.0.4:
+## Changes in this version:

 ### BUG FIXES:

@@ -1238,9 +1251,7 @@ Protocol: 30 (unchanged)

 # NEWS for rsync 3.0.4 (6 Sep 2008)

-Protocol: 30 (unchanged)
-
-## Changes since 3.0.3:
+## Changes in this version:

 ### BUG FIXES:

@@ -1308,9 +1319,7 @@ Protocol: 30 (unchanged)

 # NEWS for rsync 3.0.3 (29 Jun 2008)

-Protocol: 30 (unchanged)
-
-## Changes since 3.0.2:
+## Changes in this version:

 ### BUG FIXES:

@@ -1401,9 +1410,7 @@ Protocol: 30 (unchanged)

 # NEWS for rsync 3.0.2 (8 Apr 2008)

-Protocol: 30 (unchanged)
-
-## Changes since 3.0.1:
+## Changes in this version:

 ### BUG FIXES:

@@ -1425,9 +1432,7 @@ Protocol: 30 (unchanged)

 # NEWS for rsync 3.0.1 (3 Apr 2008)

-Protocol: 30 (unchanged)
-
-## Changes since 3.0.0:
+## Changes in this version:

 ### NOTABLE CHANGES IN BEHAVIOR:

@@ -1565,9 +1570,11 @@ Protocol: 30 (unchanged)

 # NEWS for rsync 3.0.0 (1 Mar 2008)

-Protocol: 30 (changed)
+## Changes in this version:

-## Changes since 2.6.9:
+### PROTOCOL NUMBER:
+
+ - The protocol number was changed to 30.

 ### NOTABLE CHANGES IN BEHAVIOR:

@@ -1914,9 +1921,7 @@ Protocol: 30 (changed)

 # NEWS for rsync 2.6.9 (6 Nov 2006)

-Protocol: 29 (unchanged)
-
-## Changes since 2.6.8:
+## Changes in this version:

 ### BUG FIXES:

@@ -2076,9 +2081,7 @@ Protocol: 29 (unchanged)

 # NEWS for rsync 2.6.8 (22 Apr 2006)

-Protocol: 29 (unchanged)
-
-## Changes since 2.6.7:
+## Changes in this version:

 ### BUG FIXES:

@@ -2148,9 +2151,7 @@ Protocol: 29 (unchanged)

 # NEWS for rsync 2.6.7 (11 Mar 2006)

-Protocol: 29 (unchanged)
-
-## Changes since 2.6.6:
+## Changes in this version:

 ### OUTPUT CHANGES:

@@ -2474,9 +2475,7 @@ Protocol: 29 (unchanged)

 # NEWS for rsync 2.6.6 (28 Jul 2005)

-Protocol: 29 (unchanged)
-
-## Changes since 2.6.5:
+## Changes in this version:

 ### SECURITY FIXES:

@@ -2542,9 +2541,7 @@ Protocol: 29 (unchanged)

 # NEWS for rsync 2.6.5 (1 Jun 2005)

-Protocol: 29 (unchanged)
-
-## Changes since 2.6.4:
+## Changes in this version:

 ### OUTPUT CHANGES:

@@ -2725,9 +2722,11 @@ Protocol: 29 (unchanged)

 # NEWS for rsync 2.6.4 (30 March 2005)

-Protocol: 29 (changed)
+## Changes in this version:

-## Changes since 2.6.3:
+### PROTOCOL NUMBER:
+
+ - The protocol number was changed to 29.

 ### OUTPUT CHANGES:

@@ -3105,9 +3104,7 @@ Protocol: 29 (changed)

 # NEWS for rsync 2.6.3 (30 Sep 2004)

-Protocol: 28 (unchanged)
-
-## Changes since 2.6.2:
+## Changes in this version:

 ### SECURITY FIXES:

@@ -3351,9 +3348,7 @@ Protocol: 28 (unchanged)

 # NEWS for rsync 2.6.2 (30 Apr 2004)

-Protocol: 28 (unchanged)
-
-## Changes since 2.6.1:
+## Changes in this version:

 ### BUG FIXES:

@@ -3395,9 +3390,11 @@ Protocol: 28 (unchanged)

 # NEWS for rsync 2.6.1 (26 Apr 2004)

-Protocol: 28 (changed)
+## Changes in this version:

-## Changes since 2.6.0:
+### PROTOCOL NUMBER:
+
+ - The protocol number was changed to 28.

 ### SECURITY FIXES:

@@ -3585,9 +3582,12 @@ Protocol: 28 (changed)

 # NEWS for rsync 2.6.0 (1 Jan 2004)

-Protocol: 27 (changed)
+## Changes in this version:

-## Changes since 2.5.7:
+### PROTOCOL NUMBER:
+
+ - The protocol number was changed to 27.  The maximum accepted protocol number
+   was increased from 30 to 40.

 ### ENHANCEMENTS:

@@ -3722,9 +3722,7 @@ Protocol: 27 (changed)

 # NEWS for rsync 2.5.7 (4 Dec 2003)

-Protocol: 26 (unchanged)
-
-## Changes since 2.5.6:
+## Changes in this version:

 ### SECURITY FIXES:

@@ -3736,9 +3734,7 @@ Protocol: 26 (unchanged)

 # NEWS for rsync 2.5.6, aka "the dwd-between-jobs release" (26 Jan 2003)

-Protocol: 26 (unchanged)
-
-## Changes since 2.5.5:
+## Changes in this version:

 ### ENHANCEMENTS:

@@ -3833,9 +3829,7 @@ Protocol: 26 (unchanged)

 # NEWS for rsync 2.5.5, aka Snowy River (2 Apr 2002)

-Protocol: 26 (unchanged)
-
-## Changes since 2.5.4:
+## Changes in this version:

 ### ENHANCEMENTS:

@@ -3874,9 +3868,7 @@ Protocol: 26 (unchanged)

 # NEWS for rsync 2.5.4, aka "Imitation lizard skin" (13 Mar 2002)

-Protocol: 26 (unchanged)
-
-## Changes since 2.5.3:
+## Changes in this version:

 ### BUG FIXES:

@@ -3896,9 +3888,7 @@ Protocol: 26 (unchanged)

 # NEWS for rsync 2.5.3, aka "Happy 26" (11 Mar 2002)

-Protocol: 26 (unchanged)
-
-## Changes since 2.5.2:
+## Changes in this version:

 ### SECURITY FIXES:

@@ -3947,9 +3937,7 @@ Protocol: 26 (unchanged)

 # NEWS for rsync 2.5.2 (26 Jan 2002)

-Protocol: 26 (changed)
-
-## Changes since 2.5.1:
+## Changes in this version:

 ### SECURITY FIXES:

@@ -3957,6 +3945,10 @@ Protocol: 26 (changed)
   some cases we were not sufficiently careful about reading integers from the
   network.

+### PROTOCOL NUMBER:
+
+ - The protocol number was changed to 26.
+
 ### BUG FIXES:

 - Fix possible string mangling in log files.
@@ -3994,9 +3986,7 @@ Protocol: 26 (changed)

 # NEWS for rsync 2.5.1 (3 Jan 2002)

-Protocol: 25 (unchanged)
-
-## Changes since 2.5.0:
+## Changes in this version:

 ### BUG FIXES:

@@ -4031,9 +4021,11 @@ Protocol: 25 (unchanged)

 # NEWS for rsync 2.5.0 (30 Nov 2001)

-Protocol: 25 (changed)
+## Changes in this version:

-## Changes since 2.4.6:
+### PROTOCOL NUMBER:
+
+ - The protocol number was changed to 25.

 ### ANNOUNCEMENTS:

@@ -4151,7 +4143,7 @@ Protocol: 25 (changed)

 | RELEASE DATE | VER.   | DATE OF COMMIT\* | PROTOCOL    |
 |--------------|--------|------------------|-------------|
-| ?? Jun 2020  | 3.2.2  |                  | 31          |
+| 04 Jul 2020  | 3.2.2  |                  | 31          |
 | 22 Jun 2020  | 3.2.1  |                  | 31          |
 | 19 Jun 2020  | 3.2.0  |                  | 31          |
 | 28 Jan 2018  | 3.1.3  |                  | 31          |
--- a/cleanup.c
+++ b/cleanup.c
@@ -222,7 +222,7 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 		 * we don't want to output a duplicate error. */
 		if ((exit_code && line > 0)
 		 || am_daemon || (logfile_name && (am_server || !INFO_GTE(STATS, 1)))) {
-#ifdef HAVE_USLEEP /* Try for a teeny delay if both sender & receiver are sending a msg at the same time. */
+#ifdef HAVE_USLEEP /* A tiny delay just in case both sender & receiver are sending a msg at the same time. */
 			if (am_server && exit_code)
 				usleep(50);
 #endif
--- a/clientserver.c
+++ b/clientserver.c
@@ -38,6 +38,7 @@ extern int preserve_xattrs;
 extern int kluge_around_eof;
 extern int daemon_over_rsh;
 extern int munge_symlinks;
+extern int open_noatime;
 extern int sanitize_paths;
 extern int numeric_ids;
 extern int filesfrom_fd;
@@ -695,8 +696,8 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char

 	module_id = i;

-	if (lp_transfer_logging(i) && !logfile_format)
-		logfile_format = lp_log_format(i);
+	if (lp_transfer_logging(module_id) && !logfile_format)
+		logfile_format = lp_log_format(module_id);
 	if (log_format_has(logfile_format, 'i'))
 		logfile_format_has_i = 1;
 	if (logfile_format_has_i || log_format_has(logfile_format, 'o'))
@@ -705,7 +706,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 	uid = MY_UID();
 	am_root = (uid == 0);

-	p = *lp_uid(i) ? lp_uid(i) : am_root ? NOBODY_USER : NULL;
+	p = *lp_uid(module_id) ? lp_uid(module_id) : am_root ? NOBODY_USER : NULL;
 	if (p) {
 		if (!user_to_uid(p, &uid, True)) {
 			rprintf(FLOG, "Invalid uid %s\n", p);
@@ -716,7 +717,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 	} else
 		set_uid = 0;

-	p = *lp_gid(i) ? conf_strtok(lp_gid(i)) : NULL;
+	p = *lp_gid(module_id) ? conf_strtok(lp_gid(module_id)) : NULL;
 	if (p) {
 		/* The "*" gid must be the first item in the list. */
 		if (strcmp(p, "*") == 0) {
@@ -749,7 +750,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 			return -1;
 	}

-	module_dir = lp_path(i);
+	module_dir = lp_path(module_id);
 	if (*module_dir == '\0') {
 		rprintf(FLOG, "No path specified for module %s\n", name);
 		io_printf(f_out, "@ERROR: no path setting.\n");
@@ -786,38 +787,38 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 	} else
 		set_filter_dir(module_dir, module_dirlen);

-	p = lp_filter(i);
+	p = lp_filter(module_id);
 	parse_filter_str(&daemon_filter_list, p, rule_template(FILTRULE_WORD_SPLIT),
 		XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3);

-	p = lp_include_from(i);
+	p = lp_include_from(module_id);
 	parse_filter_file(&daemon_filter_list, p, rule_template(FILTRULE_INCLUDE),
 		XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);

-	p = lp_include(i);
+	p = lp_include(module_id);
 	parse_filter_str(&daemon_filter_list, p,
 		rule_template(FILTRULE_INCLUDE | FILTRULE_WORD_SPLIT),
 		XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);

-	p = lp_exclude_from(i);
+	p = lp_exclude_from(module_id);
 	parse_filter_file(&daemon_filter_list, p, rule_template(0),
 		XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);

-	p = lp_exclude(i);
+	p = lp_exclude(module_id);
 	parse_filter_str(&daemon_filter_list, p, rule_template(FILTRULE_WORD_SPLIT),
 		XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);

 	log_init(1);

 #ifdef HAVE_PUTENV
-	if ((*lp_early_exec(i) || *lp_prexfer_exec(i) || *lp_postxfer_exec(i))
+	if ((*lp_early_exec(module_id) || *lp_prexfer_exec(module_id) || *lp_postxfer_exec(module_id))
 	 && !getenv("RSYNC_NO_XFER_EXEC")) {
 		set_env_num("RSYNC_PID", (long)getpid());

 		/* For post-xfer exec, fork a new process to run the rsync
 		 * daemon while this process waits for the exit status and
 		 * runs the indicated command at that point. */
-		if (*lp_postxfer_exec(i)) {
+		if (*lp_postxfer_exec(module_id)) {
 			pid_t pid = fork();
 			if (pid < 0) {
 				rsyserr(FLOG, errno, "fork failed");
@@ -837,7 +838,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 				else
 					status = -1;
 				set_env_num("RSYNC_EXIT_STATUS", status);
-				if (shell_exec(lp_postxfer_exec(i)) < 0)
+				if (shell_exec(lp_postxfer_exec(module_id)) < 0)
 					status = -1;
 				_exit(status);
 			}
@@ -845,9 +846,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char

 		/* For early exec, fork a child process to run the indicated
 		 * command and wait for it to exit. */
-		if (*lp_early_exec(i)) {
+		if (*lp_early_exec(module_id)) {
 			int arg_fd;
-			pid_t pid = start_pre_exec(lp_early_exec(i), &arg_fd, NULL);
+			pid_t pid = start_pre_exec(lp_early_exec(module_id), &arg_fd, NULL);
 			if (pid == (pid_t)-1) {
 				rsyserr(FLOG, errno, "early exec preparation failed");
 				io_printf(f_out, "@ERROR: early exec preparation failed\n");
@@ -864,8 +865,8 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 		/* For pre-xfer exec, fork a child process to run the indicated
 		 * command, though it first waits for the parent process to
 		 * send us the user's request via a pipe. */
-		if (*lp_prexfer_exec(i)) {
-			pre_exec_pid = start_pre_exec(lp_prexfer_exec(i), &pre_exec_arg_fd, &pre_exec_error_fd);
+		if (*lp_prexfer_exec(module_id)) {
+			pre_exec_pid = start_pre_exec(lp_prexfer_exec(module_id), &pre_exec_arg_fd, &pre_exec_error_fd);
 			if (pre_exec_pid == (pid_t)-1) {
 				rsyserr(FLOG, errno, "pre-xfer exec preparation failed");
 				io_printf(f_out, "@ERROR: pre-xfer exec preparation failed\n");
@@ -906,7 +907,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 	if (module_dirlen || (!use_chroot && !*lp_daemon_chroot()))
 		sanitize_paths = 1;

-	if ((munge_symlinks = lp_munge_symlinks(i)) < 0)
+	if ((munge_symlinks = lp_munge_symlinks(module_id)) < 0)
 		munge_symlinks = !use_chroot || module_dirlen;
 	if (munge_symlinks) {
 		STRUCT_STAT st;
@@ -961,8 +962,8 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 		am_root = (our_uid == 0);
 	}

-	if (lp_temp_dir(i) && *lp_temp_dir(i)) {
-		tmpdir = lp_temp_dir(i);
+	if (lp_temp_dir(module_id) && *lp_temp_dir(module_id)) {
+		tmpdir = lp_temp_dir(module_id);
 		if (strlen(tmpdir) >= MAXPATHLEN - 10) {
 			rprintf(FLOG,
 				"the 'temp dir' value for %s is WAY too long -- ignoring.\n",
@@ -989,7 +990,12 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 	} else
 		orig_early_argv = NULL;

+	/* The default is to use the user's setting unless the module sets True or False. */
+	if (lp_open_noatime(module_id) >= 0)
+		open_noatime = lp_open_noatime(module_id);
+
 	munge_symlinks = save_munge_symlinks; /* The client mustn't control this. */
+
 	if (am_daemon > 0)
 		msgs2stderr = 0; /* A non-rsh-run daemon doesn't have stderr for msgs. */

@@ -1008,7 +1014,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 	if (write_batch < 0)
 		dry_run = 1;

-	if (lp_fake_super(i)) {
+	if (lp_fake_super(module_id)) {
 		if (preserve_xattrs > 1)
 			preserve_xattrs = 1;
 		am_root = -1;
@@ -1033,7 +1039,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char

 #ifndef DEBUG
 	/* don't allow the logs to be flooded too fast */
-	limit_output_verbosity(lp_max_verbosity(i));
+	limit_output_verbosity(lp_max_verbosity(module_id));
 #endif

 	if (protocol_version < 23 && (protocol_version == 22 || am_sender))
@@ -1094,20 +1100,20 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 #endif

 	if (!numeric_ids
-	 && (use_chroot ? lp_numeric_ids(i) != False : lp_numeric_ids(i) == True))
+	 && (use_chroot ? lp_numeric_ids(module_id) != False : lp_numeric_ids(module_id) == True))
 		numeric_ids = -1; /* Set --numeric-ids w/o breaking protocol. */

-	if (lp_timeout(i) && (!io_timeout || lp_timeout(i) < io_timeout))
-		set_io_timeout(lp_timeout(i));
+	if (lp_timeout(module_id) && (!io_timeout || lp_timeout(module_id) < io_timeout))
+		set_io_timeout(lp_timeout(module_id));

 	/* If we have some incoming/outgoing chmod changes, append them to
 	 * any user-specified changes (making our changes have priority).
 	 * We also get a pointer to just our changes so that a receiver
 	 * process can use them separately if --perms wasn't specified. */
 	if (am_sender)
-		p = lp_outgoing_chmod(i);
+		p = lp_outgoing_chmod(module_id);
 	else
-		p = lp_incoming_chmod(i);
+		p = lp_incoming_chmod(module_id);
 	if (*p && !(daemon_chmod_modes = parse_chmod(p, &chmod_modes))) {
 		rprintf(FLOG, "Invalid \"%sing chmod\" directive: %s\n",
 			am_sender ? "outgo" : "incom", p);
--- a/compat.c
+++ b/compat.c
@@ -366,7 +366,7 @@ static void recv_negotiate_str(int f_in, struct name_num_obj *nno, char *tmpbuf,
 		rprintf(FERROR, "%s list: %s\n", am_server ? "Client" : "Server", tmpbuf);
 		/* Recreate our original list from the saw values. This can't overflow our huge
 		 * buffer because we don't have enough valid entries to get anywhere close. */
-		for (j = 1; j <= nno->saw_len; j++) {
+		for (j = 1, *cp = '\0'; j <= nno->saw_len; j++) {
 			struct name_num_item *nni;
 			for (nni = nno->list; nni->name; nni++) {
 				if (nno->saw[nni->num] == j) {
@@ -376,6 +376,8 @@ static void recv_negotiate_str(int f_in, struct name_num_obj *nno, char *tmpbuf,
 				}
 			}
 		}
+		if (!*tmpbuf)
+			strlcpy(cp, " INVALID", MAX_NSTR_STRLEN);
 		rprintf(FERROR, "%s list:%s\n", am_server ? "Server" : "Client", tmpbuf);
 	}

--- a/28
+++ b/28
@@ -4,24 +4,24 @@
 # then transfer control to the configure.sh script to do the real work.

 dir=`dirname $0`
-realconfigure="$dir/configure.sh"
+if test x"$dir" = x; then
+    dir=.
+fi

-if test ! -f "$realconfigure"; then
-    if test -f "$HOME/build_farm/build_test.fns"; then
-	# Test the included popt
-	set -- --with-included-popt "${@}"
-	# Allow the build farm to grab latest files via rsync.
-	actions='build fetch'
-    else
-	actions='build'
+if test "$dir" = '.'; then
+    branch=`packaging/prep-auto-dir` || exit 1
+    if test x"$branch" != x; then
+	cd build || exit 1
+	dir=..
    fi
-    if "$dir/prepare-source" $actions; then
-	:
-    else
+fi
+
+if test ! -f configure.sh; then
+    if ! "$dir/prepare-source" build; then
 	echo 'Failed to build configure.sh and/or config.h.in -- giving up.' >&2
-	rm -f "$realconfigure"
+	rm -f configure.sh
 	exit 1
    fi
 fi

-exec "$realconfigure" "${@}"
+exec ./configure.sh --srcdir="$dir" "${@}"
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,15 @@
 dnl Process this file with autoconf to produce a configure script.

-AC_INIT([rsync],[3.2.2pre1],[https://rsync.samba.org/bugtracking.html])
+AC_INIT([rsync],[ ],[https://rsync.samba.org/bugtracking.html])

 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)
 AC_PREREQ([2.69])

-AC_SUBST(RSYNC_VERSION, $PACKAGE_VERSION)
-AC_MSG_NOTICE([Configuring rsync $PACKAGE_VERSION])
+PACKAGE_VERSION=`sed 's/.*"\(.*\)".*/\1/' <$srcdir/version.h`

-AC_DEFINE_UNQUOTED(RSYNC_VERSION, ["$PACKAGE_VERSION"], [rsync release version])
+AC_MSG_NOTICE([Configuring rsync $PACKAGE_VERSION])

 LDFLAGS=${LDFLAGS-""}

@@ -1338,5 +1337,5 @@ AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
 AC_OUTPUT

 AC_MSG_RESULT()
-AC_MSG_RESULT([    rsync ${RSYNC_VERSION} configuration successful])
+AC_MSG_RESULT([    rsync $PACKAGE_VERSION configuration successful])
 AC_MSG_RESULT()
--- a/daemon-parm.awk
+++ b/daemon-parm.awk
@@ -0,0 +1,114 @@
+#!/usr/bin/awk -f
+
+# The caller must pass arg: daemon-parm.txt
+# The resulting code is output into daemon-parm.h
+
+BEGIN {
+    heading = "/* DO NOT EDIT THIS FILE!  It is auto-generated from a list of values in " ARGV[1] "! */\n\n"
+    sect = psect = defines = accessors = prior_ptype = ""
+    parms = "\nstatic struct parm_struct parm_table[] = {"
+    comment_fmt = "\n/********** %s **********/\n"
+    tdstruct = "typedef struct {"
+}
+
+/^\s*$/ { next }
+/^#/ { next }
+
+/^Globals:/ {
+    if (defines != "") {
+	print "The Globals section must come first!"
+	defines = ""
+	exit
+    }
+    defines = tdstruct
+    values = "\nstatic const all_vars Defaults = {\n    { /* Globals: */\n"
+    exps = exp_values = sprintf(comment_fmt, "EXP")
+    sect = "GLOBAL"
+    psect = ", P_GLOBAL, &Vars.g."
+    next
+}
+
+/^Locals:/ {
+    if (sect == "") {
+	print "The Locals section must come after the Globals!"
+	exit
+    }
+    defines = defines exps "} global_vars;\n\n" tdstruct
+    values = values exp_values "\n    }, { /* Locals: */\n"
+    exps = exp_values = sprintf(comment_fmt, "EXP")
+    sect = "LOCAL"
+    psect = ", P_LOCAL, &Vars.l."
+    next
+}
+
+/^(STRING|CHAR|PATH|INTEGER|ENUM|OCTAL|BOOL|BOOLREV|BOOL3)[ \t]/ {
+    ptype = $1
+    name = $2
+    $1 = $2 = ""
+    sub(/^[ \t]+/, "")
+
+    if (ptype != prior_ptype) {
+	comment = sprintf(comment_fmt, ptype)
+	defines = defines comment
+	values = values comment
+	parms = parms "\n"
+	accessors = accessors "\n"
+	prior_ptype = ptype
+    }
+
+    if (ptype == "STRING" || ptype == "PATH") {
+	atype = "STRING"
+	vtype = "char*"
+    } else if (ptype ~ /BOOL/) {
+	atype = vtype = "BOOL"
+    } else if (ptype == "CHAR") {
+	atype = "CHAR"
+	vtype = "char"
+    } else {
+	atype = "INTEGER"
+	vtype = "int"
+    }
+
+    # The name might be var_name|public_name
+    pubname = name
+    sub(/\|.*/, "", name)
+    sub(/.*\|/, "", pubname)
+    gsub(/_/, " ", pubname)
+    gsub(/-/, "", name)
+
+    if (ptype == "ENUM")
+	enum = "enum_" name
+    else
+	enum = "NULL"
+
+    defines = defines "\t" vtype " " name ";\n"
+    values = values "\t" $0 ", /* " name " */\n"
+    parms = parms " {\"" pubname "\", P_" ptype psect name ", " enum ", 0},\n"
+    accessors = accessors "FN_" sect "_" atype "(lp_" name ", " name ")\n"
+
+    if (vtype == "char*") {
+	exps = exps "\tBOOL " name "_EXP;\n"
+	exp_values = exp_values "\tFalse, /* " name "_EXP */\n"
+    }
+
+    next
+}
+
+/./ {
+    print "Extraneous line:" $0
+    defines = ""
+    exit
+}
+
+END {
+    if (sect != "" && defines != "") {
+	defines = defines exps "} local_vars;\n\n"
+	defines = defines tdstruct "\n\tglobal_vars g;\n\tlocal_vars l;\n} all_vars;\n"
+	values = values exp_values "\n    }\n};\n\nstatic all_vars Vars;\n"
+	parms = parms "\n {NULL, P_BOOL, P_NONE, NULL, NULL, 0}\n};\n"
+	print heading defines values parms accessors > "daemon-parm.h"
+    } else {
+	print "Failed to parse the data in " ARGV[1]
+	exit 1
+    }
+}
--- a/daemon-parm.txt
+++ b/daemon-parm.txt
@@ -0,0 +1,67 @@
+Globals: ================================================================
+
+STRING	bind_address|address	NULL
+STRING	daemon_chroot		NULL
+STRING	daemon_gid		NULL
+STRING	daemon_uid		NULL
+STRING	motd_file		NULL
+STRING	pid_file		NULL
+STRING	socket_options		NULL
+
+INTEGER	listen_backlog		5
+INTEGER	rsync_port|port		0
+
+BOOL	proxy_protocol		False
+
+Locals: =================================================================
+
+STRING	auth_users		NULL
+STRING	charset			NULL
+STRING	comment			NULL
+STRING	dont_compress		DEFAULT_DONT_COMPRESS
+STRING	early_exec		NULL
+STRING	exclude			NULL
+STRING	exclude_from		NULL
+STRING	filter			NULL
+STRING	gid			NULL
+STRING	hosts_allow		NULL
+STRING	hosts_deny		NULL
+STRING	include			NULL
+STRING	include_from		NULL
+STRING	incoming_chmod		NULL
+STRING	lock_file		DEFAULT_LOCK_FILE
+STRING	log_file		NULL
+STRING	log_format		"%o %h [%a] %m (%u) %f %l"
+STRING	name			NULL
+STRING	outgoing_chmod		NULL
+STRING	post-xfer_exec		NULL
+STRING	pre-xfer_exec		NULL
+STRING	refuse_options		NULL
+STRING	secrets_file		NULL
+STRING	syslog_tag		"rsyncd"
+STRING	uid			NULL
+
+PATH	path			NULL
+PATH	temp_dir		NULL
+
+INTEGER	max_connections		0
+INTEGER	max_verbosity		1
+INTEGER	timeout			0
+
+ENUM	syslog_facility		LOG_DAEMON
+
+BOOL	fake_super		False
+BOOL	forward_lookup		True
+BOOL	ignore_errors		False
+BOOL	ignore_nonreadable	False
+BOOL	list			True
+BOOL	read_only		True
+BOOL	reverse_lookup		True
+BOOL	strict_modes		True
+BOOL	transfer_logging	False
+BOOL	use_chroot		True
+BOOL	write_only		False
+
+BOOL3	munge_symlinks		Unset
+BOOL3	numeric_ids		Unset
+BOOL3	open_noatime		Unset
--- a/loadparm.c
+++ b/loadparm.c
@@ -48,7 +48,6 @@
 extern item_list dparam_list;

 #define strequal(a, b) (strcasecmp(a, b)==0)
-#define BOOLSTR(b) ((b) ? "Yes" : "No")

 #ifndef LOG_DAEMON
 #define LOG_DAEMON 0
@@ -56,7 +55,7 @@ extern item_list dparam_list;

 /* the following are used by loadparm for option lists */
 typedef enum {
-	P_BOOL, P_BOOLREV, P_CHAR, P_INTEGER,
+	P_BOOL, P_BOOLREV, P_BOOL3, P_CHAR, P_INTEGER,
 	P_OCTAL, P_PATH, P_STRING, P_ENUM
 } parm_type;

@@ -87,234 +86,6 @@ struct parm_struct {
 #define LP_SNUM_OK(i) ((i) >= 0 && (i) < (int)section_list.count)
 #define SECTION_PTR(s, p) (((char*)(s)) + (ptrdiff_t)(((char*)(p))-(char*)&Vars.l))

-/* This structure describes global (ie., server-wide) parameters. */
-typedef struct {
-	char *bind_address;
-	char *daemon_chroot;
-	char *daemon_gid;
-	char *daemon_uid;
-	char *motd_file;
-	char *pid_file;
-	char *socket_options;
-
-	/* Each _EXP var tracks if the associated char* var has been expanded yet or not. */
-	BOOL bind_address_EXP;
-	BOOL daemon_chroot_EXP;
-	BOOL daemon_gid_EXP;
-	BOOL daemon_uid_EXP;
-	BOOL motd_file_EXP;
-	BOOL pid_file_EXP;
-	BOOL socket_options_EXP;
-
-	int listen_backlog;
-	int rsync_port;
-
-	BOOL proxy_protocol;
-} global_vars;
-
-/* This structure describes a single section.  Their order must match the
- * initializers below, which you can accomplish by keeping each sub-section
- * sorted.  (e.g. in vim, just visually select each subsection and use !sort.)
- * NOTE: the char* variables MUST all remain at the start of the struct! */
-typedef struct {
-	char *auth_users;
-	char *charset;
-	char *comment;
-	char *dont_compress;
-	char *early_exec;
-	char *exclude;
-	char *exclude_from;
-	char *filter;
-	char *gid;
-	char *hosts_allow;
-	char *hosts_deny;
-	char *include;
-	char *include_from;
-	char *incoming_chmod;
-	char *lock_file;
-	char *log_file;
-	char *log_format;
-	char *name;
-	char *outgoing_chmod;
-	char *path;
-	char *postxfer_exec;
-	char *prexfer_exec;
-	char *refuse_options;
-	char *secrets_file;
-	char *syslog_tag;
-	char *temp_dir;
-	char *uid;
-
-	/* Each _EXP var tracks if the associated char* var has been expanded yet or not. */
-	BOOL auth_users_EXP;
-	BOOL charset_EXP;
-	BOOL comment_EXP;
-	BOOL dont_compress_EXP;
-	BOOL early_exec_EXP;
-	BOOL exclude_EXP;
-	BOOL exclude_from_EXP;
-	BOOL filter_EXP;
-	BOOL gid_EXP;
-	BOOL hosts_allow_EXP;
-	BOOL hosts_deny_EXP;
-	BOOL include_EXP;
-	BOOL include_from_EXP;
-	BOOL incoming_chmod_EXP;
-	BOOL lock_file_EXP;
-	BOOL log_file_EXP;
-	BOOL log_format_EXP;
-	BOOL name_EXP;
-	BOOL outgoing_chmod_EXP;
-	BOOL path_EXP;
-	BOOL postxfer_exec_EXP;
-	BOOL prexfer_exec_EXP;
-	BOOL refuse_options_EXP;
-	BOOL secrets_file_EXP;
-	BOOL syslog_tag_EXP;
-	BOOL temp_dir_EXP;
-	BOOL uid_EXP;
-
-	int max_connections;
-	int max_verbosity;
-	int syslog_facility;
-	int timeout;
-
-	BOOL fake_super;
-	BOOL forward_lookup;
-	BOOL ignore_errors;
-	BOOL ignore_nonreadable;
-	BOOL list;
-	BOOL munge_symlinks;
-	BOOL numeric_ids;
-	BOOL read_only;
-	BOOL reverse_lookup;
-	BOOL strict_modes;
-	BOOL transfer_logging;
-	BOOL use_chroot;
-	BOOL write_only;
-} local_vars;
-
-/* This structure describes the global variables (g) as well as the globally
- * specified values of the local variables (l), which are used when modules
- * don't specify their own values. */
-typedef struct {
-	global_vars g;
-	local_vars l;
-} all_vars;
-
-/* The application defaults for all the variables.  "Defaults" is
- * used to re-initialize "Vars" before each config-file read.
- *
- * In order to keep these sorted in the same way as the structure
- * above, use the variable name in the leading comment, including a
- * trailing ';' (to avoid a sorting problem with trailing digits). */
-static const all_vars Defaults = {
- /* ==== global_vars ==== */
- {
- /* bind_address; */		NULL,
- /* daemon_chroot; */		NULL,
- /* daemon_gid; */		NULL,
- /* daemon_uid; */		NULL,
- /* motd_file; */		NULL,
- /* pid_file; */		NULL,
- /* socket_options; */		NULL,
-
- /* bind_address_EXP; */	False,
- /* daemon_chroot_EXP; */	False,
- /* daemon_gid_EXP; */		False,
- /* daemon_uid_EXP; */		False,
- /* motd_file_EXP; */		False,
- /* pid_file_EXP; */		False,
- /* socket_options_EXP; */	False,
-
- /* listen_backlog; */		5,
- /* rsync_port; */		0,
-
- /* proxy_protocol; */		False,
- },
-
- /* ==== local_vars ==== */
- {
- /* auth_users; */		NULL,
- /* charset; */ 		NULL,
- /* comment; */ 		NULL,
- /* dont_compress; */		DEFAULT_DONT_COMPRESS,
- /* early_exec; */		NULL,
- /* exclude; */ 		NULL,
- /* exclude_from; */		NULL,
- /* filter; */			NULL,
- /* gid; */			NULL,
- /* hosts_allow; */		NULL,
- /* hosts_deny; */		NULL,
- /* include; */			NULL,
- /* include_from; */		NULL,
- /* incoming_chmod; */		NULL,
- /* lock_file; */		DEFAULT_LOCK_FILE,
- /* log_file; */		NULL,
- /* log_format; */		"%o %h [%a] %m (%u) %f %l",
- /* name; */			NULL,
- /* outgoing_chmod; */		NULL,
- /* path; */			NULL,
- /* postxfer_exec; */		NULL,
- /* prexfer_exec; */		NULL,
- /* refuse_options; */		NULL,
- /* secrets_file; */		NULL,
- /* syslog_tag; */		"rsyncd",
- /* temp_dir; */ 		NULL,
- /* uid; */			NULL,
-
- /* auth_users_EXP; */		False,
- /* charset_EXP; */		False,
- /* comment_EXP; */		False,
- /* dont_compress_EXP; */	False,
- /* early_exec_EXP; */		False,
- /* exclude_EXP; */		False,
- /* exclude_from_EXP; */	False,
- /* filter_EXP; */		False,
- /* gid_EXP; */			False,
- /* hosts_allow_EXP; */		False,
- /* hosts_deny_EXP; */		False,
- /* include_EXP; */		False,
- /* include_from_EXP; */	False,
- /* incoming_chmod_EXP; */	False,
- /* lock_file_EXP; */		False,
- /* log_file_EXP; */		False,
- /* log_format_EXP; */		False,
- /* name_EXP; */		False,
- /* outgoing_chmod_EXP; */	False,
- /* path_EXP; */		False,
- /* postxfer_exec_EXP; */	False,
- /* prexfer_exec_EXP; */	False,
- /* refuse_options_EXP; */	False,
- /* secrets_file_EXP; */	False,
- /* syslog_tag_EXP; */		False,
- /* temp_dir_EXP; */		False,
- /* uid_EXP; */			False,
-
- /* max_connections; */		0,
- /* max_verbosity; */		1,
- /* syslog_facility; */		LOG_DAEMON,
- /* timeout; */			0,
-
- /* fake_super; */		False,
- /* forward_lookup; */		True,
- /* ignore_errors; */		False,
- /* ignore_nonreadable; */	False,
- /* list; */			True,
- /* munge_symlinks; */		(BOOL)-1,
- /* numeric_ids; */		(BOOL)-1,
- /* read_only; */		True,
- /* reverse_lookup; */		True,
- /* strict_modes; */		True,
- /* transfer_logging; */	False,
- /* use_chroot; */		True,
- /* write_only; */		False,
- }
-};
-
-/* The currently configured values for all the variables. */
-static all_vars Vars;
-
 /* Stack of "Vars" values used by the &include directive. */
 static item_list Vars_stack = EMPTY_ITEM_LIST;

@@ -324,9 +95,7 @@ static item_list section_list = EMPTY_ITEM_LIST;
 static int iSectionIndex = -1;
 static BOOL bInGlobalSection = True;

-#define NUMPARAMETERS (sizeof (parm_table) / sizeof (struct parm_struct))
-
-static struct enum_list enum_facilities[] = {
+static struct enum_list enum_syslog_facility[] = {
 #ifdef LOG_AUTH
 	{ LOG_AUTH, "auth" },
 #endif
@@ -393,95 +162,27 @@ static struct enum_list enum_facilities[] = {
 	{ -1, NULL }
 };

-static struct parm_struct parm_table[] =
-{
- {"address",           P_STRING, P_GLOBAL,&Vars.g.bind_address,        NULL,0},
- {"daemon chroot",     P_STRING, P_GLOBAL,&Vars.g.daemon_chroot,       NULL,0},
- {"daemon gid",        P_STRING, P_GLOBAL,&Vars.g.daemon_gid,          NULL,0},
- {"daemon uid",        P_STRING, P_GLOBAL,&Vars.g.daemon_uid,          NULL,0},
- {"listen backlog",    P_INTEGER,P_GLOBAL,&Vars.g.listen_backlog,      NULL,0},
- {"motd file",         P_STRING, P_GLOBAL,&Vars.g.motd_file,           NULL,0},
- {"pid file",          P_STRING, P_GLOBAL,&Vars.g.pid_file,            NULL,0},
- {"port",              P_INTEGER,P_GLOBAL,&Vars.g.rsync_port,          NULL,0},
- {"proxy protocol",    P_BOOL,   P_LOCAL, &Vars.g.proxy_protocol,      NULL,0},
- {"socket options",    P_STRING, P_GLOBAL,&Vars.g.socket_options,      NULL,0},
-
- {"auth users",        P_STRING, P_LOCAL, &Vars.l.auth_users,          NULL,0},
- {"charset",           P_STRING, P_LOCAL, &Vars.l.charset,             NULL,0},
- {"comment",           P_STRING, P_LOCAL, &Vars.l.comment,             NULL,0},
- {"dont compress",     P_STRING, P_LOCAL, &Vars.l.dont_compress,       NULL,0},
- {"early exec",        P_STRING, P_LOCAL, &Vars.l.early_exec,          NULL,0},
- {"exclude from",      P_STRING, P_LOCAL, &Vars.l.exclude_from,        NULL,0},
- {"exclude",           P_STRING, P_LOCAL, &Vars.l.exclude,             NULL,0},
- {"fake super",        P_BOOL,   P_LOCAL, &Vars.l.fake_super,          NULL,0},
- {"filter",            P_STRING, P_LOCAL, &Vars.l.filter,              NULL,0},
- {"forward lookup",    P_BOOL,   P_LOCAL, &Vars.l.forward_lookup,      NULL,0},
- {"gid",               P_STRING, P_LOCAL, &Vars.l.gid,                 NULL,0},
- {"hosts allow",       P_STRING, P_LOCAL, &Vars.l.hosts_allow,         NULL,0},
- {"hosts deny",        P_STRING, P_LOCAL, &Vars.l.hosts_deny,          NULL,0},
- {"ignore errors",     P_BOOL,   P_LOCAL, &Vars.l.ignore_errors,       NULL,0},
- {"ignore nonreadable",P_BOOL,   P_LOCAL, &Vars.l.ignore_nonreadable,  NULL,0},
- {"include from",      P_STRING, P_LOCAL, &Vars.l.include_from,        NULL,0},
- {"include",           P_STRING, P_LOCAL, &Vars.l.include,             NULL,0},
- {"incoming chmod",    P_STRING, P_LOCAL, &Vars.l.incoming_chmod,      NULL,0},
- {"list",              P_BOOL,   P_LOCAL, &Vars.l.list,                NULL,0},
- {"lock file",         P_STRING, P_LOCAL, &Vars.l.lock_file,           NULL,0},
- {"log file",          P_STRING, P_LOCAL, &Vars.l.log_file,            NULL,0},
- {"log format",        P_STRING, P_LOCAL, &Vars.l.log_format,          NULL,0},
- {"max connections",   P_INTEGER,P_LOCAL, &Vars.l.max_connections,     NULL,0},
- {"max verbosity",     P_INTEGER,P_LOCAL, &Vars.l.max_verbosity,       NULL,0},
- {"munge symlinks",    P_BOOL,   P_LOCAL, &Vars.l.munge_symlinks,      NULL,0},
- {"name",              P_STRING, P_LOCAL, &Vars.l.name,                NULL,0},
- {"numeric ids",       P_BOOL,   P_LOCAL, &Vars.l.numeric_ids,         NULL,0},
- {"outgoing chmod",    P_STRING, P_LOCAL, &Vars.l.outgoing_chmod,      NULL,0},
- {"path",              P_PATH,   P_LOCAL, &Vars.l.path,                NULL,0},
-#ifdef HAVE_PUTENV
- {"post-xfer exec",    P_STRING, P_LOCAL, &Vars.l.postxfer_exec,       NULL,0},
- {"pre-xfer exec",     P_STRING, P_LOCAL, &Vars.l.prexfer_exec,        NULL,0},
-#endif
- {"read only",         P_BOOL,   P_LOCAL, &Vars.l.read_only,           NULL,0},
- {"refuse options",    P_STRING, P_LOCAL, &Vars.l.refuse_options,      NULL,0},
- {"reverse lookup",    P_BOOL,   P_LOCAL, &Vars.l.reverse_lookup,      NULL,0},
- {"secrets file",      P_STRING, P_LOCAL, &Vars.l.secrets_file,        NULL,0},
- {"strict modes",      P_BOOL,   P_LOCAL, &Vars.l.strict_modes,        NULL,0},
- {"syslog facility",   P_ENUM,   P_LOCAL, &Vars.l.syslog_facility,     enum_facilities,0},
- {"syslog tag",        P_STRING, P_LOCAL, &Vars.l.syslog_tag,          NULL,0},
- {"temp dir",          P_PATH,   P_LOCAL, &Vars.l.temp_dir,            NULL,0},
- {"timeout",           P_INTEGER,P_LOCAL, &Vars.l.timeout,             NULL,0},
- {"transfer logging",  P_BOOL,   P_LOCAL, &Vars.l.transfer_logging,    NULL,0},
- {"uid",               P_STRING, P_LOCAL, &Vars.l.uid,                 NULL,0},
- {"use chroot",        P_BOOL,   P_LOCAL, &Vars.l.use_chroot,          NULL,0},
- {"write only",        P_BOOL,   P_LOCAL, &Vars.l.write_only,          NULL,0},
- {NULL,                P_BOOL,   P_NONE,  NULL,                        NULL,0}
-};
-
-/* Initialise the Default all_vars structure. */
-void reset_daemon_vars(void)
-{
-	memcpy(&Vars, &Defaults, sizeof Vars);
-}
-
 /* Expand %VAR% references.  Any unknown vars or unrecognized
 * syntax leaves the raw chars unchanged. */
-static char *expand_vars(char *str)
+static char *expand_vars(const char *str)
 {
-	char *buf, *t, *f;
+	char *buf, *t;
+	const char *f;
 	int bufsize;

 	if (!str || !strchr(str, '%'))
-		return str;
+		return (char *)str; /* TODO change return value to const char* at some point. */

 	bufsize = strlen(str) + 2048;
 	buf = new_array(char, bufsize+1); /* +1 for trailing '\0' */

 	for (t = buf, f = str; bufsize && *f; ) {
-		if (*f == '%' && *++f != '%') {
-			char *percent = strchr(f, '%');
-			if (percent) {
+		if (*f == '%' && isUpper(f+1)) {
+			char *percent = strchr(f+1, '%');
+			if (percent && percent - f < bufsize) {
 				char *val;
-				*percent = '\0';
-				val = getenv(f);
-				*percent = '%';
+				strlcpy(t, f+1, percent - f);
+				val = getenv(t);
 				if (val) {
 					int len = strlcpy(t, val, bufsize+1);
 					if (len > bufsize)
@@ -492,7 +193,6 @@ static char *expand_vars(char *str)
 					continue;
 				}
 			}
-			f--;
 		}
 		*t++ = *f++;
 		bufsize--;
@@ -510,6 +210,8 @@ static char *expand_vars(char *str)
 	return buf;
 }

+/* Each "char* foo" has an associated "BOOL foo_EXP" that tracks if the string has been expanded yet or not. */
+
 /* NOTE: use this function and all the FN_{GLOBAL,LOCAL} ones WITHOUT a trailing semicolon! */
 #define RETURN_EXPANDED(val) {if (!val ## _EXP) {val = expand_vars(val); val ## _EXP = True;} return val ? val : "";}

@@ -534,65 +236,24 @@ static char *expand_vars(char *str)
 #define FN_LOCAL_INTEGER(fn_name, val) \
 int fn_name(int i) {return LP_SNUM_OK(i)? iSECTION(i).val : Vars.l.val;}

-FN_GLOBAL_STRING(lp_bind_address, bind_address)
-FN_GLOBAL_STRING(lp_daemon_chroot, daemon_chroot)
-FN_GLOBAL_STRING(lp_daemon_gid, daemon_gid)
-FN_GLOBAL_STRING(lp_daemon_uid, daemon_uid)
-FN_GLOBAL_STRING(lp_motd_file, motd_file)
-FN_GLOBAL_STRING(lp_pid_file, pid_file)
-FN_GLOBAL_STRING(lp_socket_options, socket_options)
+/* The following include file contains:
+ *
+ * typedef global_vars - describes global (ie., server-wide) parameters.
+ * typedef local_vars - describes a single section.
+ * typedef all_vars - a combination of global_vars & local_vars.
+ * all_vars Defaults - the default values for all the variables.
+ * all_vars Vars - tThe currently configured values for all the variables.
+ * struct parm_struct parm_table - the strings & variables for the parser.
+ * FN_{LOCAL,GLOBAL}_{TYPE}() definition for all the lp_var_name() accessors.
+ */

-FN_GLOBAL_INTEGER(lp_listen_backlog, listen_backlog)
-FN_GLOBAL_INTEGER(lp_rsync_port, rsync_port)
+#include "daemon-parm.h"

-FN_GLOBAL_BOOL(lp_proxy_protocol, proxy_protocol)
-
-FN_LOCAL_STRING(lp_auth_users, auth_users)
-FN_LOCAL_STRING(lp_charset, charset)
-FN_LOCAL_STRING(lp_comment, comment)
-FN_LOCAL_STRING(lp_dont_compress, dont_compress)
-FN_LOCAL_STRING(lp_early_exec, early_exec)
-FN_LOCAL_STRING(lp_exclude, exclude)
-FN_LOCAL_STRING(lp_exclude_from, exclude_from)
-FN_LOCAL_STRING(lp_filter, filter)
-FN_LOCAL_STRING(lp_gid, gid)
-FN_LOCAL_STRING(lp_hosts_allow, hosts_allow)
-FN_LOCAL_STRING(lp_hosts_deny, hosts_deny)
-FN_LOCAL_STRING(lp_include, include)
-FN_LOCAL_STRING(lp_include_from, include_from)
-FN_LOCAL_STRING(lp_incoming_chmod, incoming_chmod)
-FN_LOCAL_STRING(lp_lock_file, lock_file)
-FN_LOCAL_STRING(lp_log_file, log_file)
-FN_LOCAL_STRING(lp_log_format, log_format)
-FN_LOCAL_STRING(lp_name, name)
-FN_LOCAL_STRING(lp_outgoing_chmod, outgoing_chmod)
-FN_LOCAL_STRING(lp_path, path)
-FN_LOCAL_STRING(lp_postxfer_exec, postxfer_exec)
-FN_LOCAL_STRING(lp_prexfer_exec, prexfer_exec)
-FN_LOCAL_STRING(lp_refuse_options, refuse_options)
-FN_LOCAL_STRING(lp_secrets_file, secrets_file)
-FN_LOCAL_STRING(lp_syslog_tag, syslog_tag)
-FN_LOCAL_STRING(lp_temp_dir, temp_dir)
-FN_LOCAL_STRING(lp_uid, uid)
-
-FN_LOCAL_INTEGER(lp_max_connections, max_connections)
-FN_LOCAL_INTEGER(lp_max_verbosity, max_verbosity)
-FN_LOCAL_INTEGER(lp_syslog_facility, syslog_facility)
-FN_LOCAL_INTEGER(lp_timeout, timeout)
-
-FN_LOCAL_BOOL(lp_fake_super, fake_super)
-FN_LOCAL_BOOL(lp_forward_lookup, forward_lookup)
-FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
-FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
-FN_LOCAL_BOOL(lp_list, list)
-FN_LOCAL_BOOL(lp_munge_symlinks, munge_symlinks)
-FN_LOCAL_BOOL(lp_numeric_ids, numeric_ids)
-FN_LOCAL_BOOL(lp_read_only, read_only)
-FN_LOCAL_BOOL(lp_reverse_lookup, reverse_lookup)
-FN_LOCAL_BOOL(lp_strict_modes, strict_modes)
-FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
-FN_LOCAL_BOOL(lp_use_chroot, use_chroot)
-FN_LOCAL_BOOL(lp_write_only, write_only)
+/* Initialise the Default all_vars structure. */
+void reset_daemon_vars(void)
+{
+	memcpy(&Vars, &Defaults, sizeof Vars);
+}

 /* Assign a copy of v to *s.  Handles NULL strings.  We don't worry
 * about overwriting a malloc'd string because the long-running
@@ -617,19 +278,14 @@ static void init_section(local_vars *psection)
 	copy_section(psection, &Vars.l);
 }

-/* Do a case-insensitive, whitespace-ignoring string compare. */
-static int strwicmp(char *psz1, char *psz2)
+/* Do a case-insensitive, whitespace-ignoring string equality check. */
+static int strwiEQ(char *psz1, char *psz2)
 {
-	/* if BOTH strings are NULL, return TRUE, if ONE is NULL return */
-	/* appropriate value. */
+	/* If one or both strings are NULL, we return equality right away. */
 	if (psz1 == psz2)
-		return 0;
-
-	if (psz1 == NULL)
-		return -1;
-
-	if (psz2 == NULL)
 		return 1;
+	if (psz1 == NULL || psz2 == NULL)
+		return 0;

 	/* sync the strings on first non-whitespace */
 	while (1) {
@@ -637,12 +293,14 @@ static int strwicmp(char *psz1, char *psz2)
 			psz1++;
 		while (isSpace(psz2))
 			psz2++;
-		if (toUpper(psz1) != toUpper(psz2) || *psz1 == '\0' || *psz2 == '\0')
+		if (*psz1 == '\0' || *psz2 == '\0')
+			break;
+		if (toUpper(psz1) != toUpper(psz2))
 			break;
 		psz1++;
 		psz2++;
 	}
-	return *psz1 - *psz2;
+	return *psz1 == *psz2;
 }

 /* Find a section by name. Otherwise works like get_section. */
@@ -651,7 +309,7 @@ static int getsectionbyname(char *name)
 	int i;

 	for (i = section_list.count - 1; i >= 0; i--) {
-		if (strwicmp(iSECTION(i).name, name) == 0)
+		if (strwiEQ(iSECTION(i).name, name))
 			break;
 	}

@@ -691,7 +349,7 @@ static int map_parameter(char *parmname)
 		return -1;

 	for (iIndex = 0; parm_table[iIndex].label; iIndex++) {
-		if (strwicmp(parm_table[iIndex].label, parmname) == 0)
+		if (strwiEQ(parm_table[iIndex].label, parmname))
 			return iIndex;
 	}

@@ -702,16 +360,14 @@ static int map_parameter(char *parmname)
 /* Set a boolean variable from the text value stored in the passed string.
 * Returns True in success, False if the passed string does not correctly
 * represent a boolean. */
-static BOOL set_boolean(BOOL *pb, char *parmvalue)
+static BOOL set_boolean(BOOL *pb, char *parmvalue, int allow_unset)
 {
-	if (strwicmp(parmvalue, "yes") == 0
-	 || strwicmp(parmvalue, "true") == 0
-	 || strwicmp(parmvalue, "1") == 0)
+	if (strwiEQ(parmvalue, "yes") || strwiEQ(parmvalue, "true") || strwiEQ(parmvalue, "1"))
 		*pb = True;
-	else if (strwicmp(parmvalue, "no") == 0
-	      || strwicmp(parmvalue, "False") == 0
-	      || strwicmp(parmvalue, "0") == 0)
+	else if (strwiEQ(parmvalue, "no") || strwiEQ(parmvalue, "false") || strwiEQ(parmvalue, "0"))
 		*pb = False;
+	else if (allow_unset && (strwiEQ(parmvalue, "unset") || strwiEQ(parmvalue, "-1")))
+		*pb = Unset;
 	else {
 		rprintf(FLOG, "Badly formed boolean in configuration file: \"%s\".\n", parmvalue);
 		return False;
@@ -760,11 +416,15 @@ static BOOL do_parameter(char *parmname, char *parmvalue)

 	switch (parm_table[parmnum].type) {
 	case P_BOOL:
-		set_boolean(parm_ptr, parmvalue);
+		set_boolean(parm_ptr, parmvalue, False);
+		break;
+
+	case P_BOOL3:
+		set_boolean(parm_ptr, parmvalue, True);
 		break;

 	case P_BOOLREV:
-		set_boolean(parm_ptr, parmvalue);
+		set_boolean(parm_ptr, parmvalue, False);
 		*(BOOL *)parm_ptr = ! *(BOOL *)parm_ptr;
 		break;

@@ -834,7 +494,7 @@ static BOOL do_section(char *sectionname)
 		return True;
 	}

-	isglobal = strwicmp(sectionname, GLOBAL_NAME) == 0;
+	isglobal = strwiEQ(sectionname, GLOBAL_NAME);

 	/* At the end of the global section, add any --dparam items. */
 	if (bInGlobalSection && !isglobal) {
--- a/9
+++ b/9
@@ -93,7 +93,7 @@ def main():
        env_subs['VERSION'] = '1.0.0'
        env_subs['libdir'] = '/usr'
    else:
-        for fn in (fi.srcdir + 'NEWS.md', 'Makefile'):
+        for fn in (fi.srcdir + 'version.h', 'Makefile'):
            try:
                st = os.lstat(fn)
            except:
@@ -101,6 +101,11 @@ def main():
            if not fi.mtime:
                fi.mtime = st.st_mtime

+        with open(fi.srcdir + 'version.h', 'r', encoding='utf-8') as fh:
+            txt = fh.read()
+        m = re.search(r'"(.+?)"', txt)
+        env_subs['VERSION'] = m.group(1)
+
        with open('Makefile', 'r', encoding='utf-8') as fh:
            for line in fh:
                m = re.match(r'^(\w+)=(.+)', line)
@@ -112,7 +117,7 @@ def main():
                while re.search(r'\$\{', val):
                    val = re.sub(r'\$\{(\w+)\}', lambda m: env_subs[m.group(1)], val)
                env_subs[var] = val
-                if var == 'VERSION':
+                if var == 'srcdir':
                    break

    with open(fi.fn, 'r', encoding='utf-8') as fh:
--- a/options.c
+++ b/options.c
@@ -581,12 +581,15 @@ static char *istring(const char *fmt, int val)
 	return str;
 }

-static void print_capabilities(enum logcode f)
+static void print_info_flags(enum logcode f)
 {
 	STRUCT_STAT *dumstat;
 	char line_buf[75];
 	int line_len, j;
 	char *capabilities[] = {
+
+	"*Capabilities",
+
 		istring("%d-bit files", (int)(sizeof (OFF_T) * 8)),
 		istring("%d-bit inums", (int)(sizeof dumstat->st_ino * 8)), /* Don't check ino_t! */
 		istring("%d-bit timestamps", (int)(sizeof (time_t) * 8)),
@@ -661,7 +664,8 @@ static void print_capabilities(enum logcode f)
 #endif
 			"prealloc",

-	"*" /* All options after this point are hidden w/o -V -V */
+	"*Optimizations",
+
 #ifndef HAVE_SIMD
 		"no "
 #endif
@@ -681,28 +685,19 @@ static void print_capabilities(enum logcode f)
 	};

 	for (line_len = 0, j = 0; ; j++) {
-		char *cap = capabilities[j];
-		if (!cap)
-			break;
-		if (*cap == '*') {
-			if (version_opt_cnt >= 2)
-				capabilities[j]++;
-			else
-				capabilities[j] = NULL;
-			break;
-		}
-	}
-
-	for (line_len = 0, j = 0; ; j++) {
-		char *cap = capabilities[j];
-		int cap_len = cap ? strlen(cap) : 1000;
-		int need_comma = cap && capabilities[j+1] != NULL ? 1 : 0;
-		if (line_len + 1 + cap_len + need_comma >= (int)sizeof line_buf) {
+		char *cap = capabilities[j], *next_cap = cap ? capabilities[j+1] : NULL;
+		int cap_len = cap && *cap != '*' ? strlen(cap) : 1000;
+		int need_comma = next_cap && *next_cap != '*' ? 1 : 0;
+		if (line_len && line_len + 1 + cap_len + need_comma >= (int)sizeof line_buf) {
 			rprintf(f, "   %s\n", line_buf);
 			line_len = 0;
 		}
 		if (!cap)
 			break;
+		if (*cap == '*') {
+			rprintf(f, "%s:\n", cap+1);
+			continue;
+		}
 		line_len += snprintf(line_buf+line_len, sizeof line_buf - line_len, " %s%s", cap, need_comma ? "," : "");
 	}
 }
@@ -720,8 +715,7 @@ static void print_rsync_version(enum logcode f)
 	rprintf(f, "Copyright (C) 1996-" LATEST_YEAR " by Andrew Tridgell, Wayne Davison, and others.\n");
 	rprintf(f, "Web site: https://rsync.samba.org/\n");

-	rprintf(f, "Capabilities:\n");
-	print_capabilities(f);
+	print_info_flags(f);

 	rprintf(f, "Checksum list:\n");
 	get_default_nno_list(&valid_checksums, tmpbuf, sizeof tmpbuf, '(');
--- a/packaging/auto-Makefile
+++ b/packaging/auto-Makefile
@@ -0,0 +1,11 @@
+TARGETS := all install install-ssl-daemon install-all install-strip conf gen gensend reconfigure restatus \
+	proto man clean cleantests distclean test check check29 check30 installcheck splint doxygen doxygen-upload
+
+.PHONY: $(TARGETS) auto-prep
+
+$(TARGETS): auto-prep
+	make -C build $@
+
+auto-prep:
+	@if test x`packaging/prep-auto-dir` = x; then echo "auto-build-save is not setup"; exit 1; fi
+	@echo 'Build branch: '`readlink build/.branch | tr % /`
--- a/packaging/lsb/rsync.spec
+++ b/packaging/lsb/rsync.spec
@@ -1,9 +1,9 @@
 Summary: A fast, versatile, remote (and local) file-copying tool
 Name: rsync
 Version: 3.2.2
-%define fullversion %{version}pre1
-Release: 0.1.pre1
-%define srcdir src-previews
+%define fullversion %{version}
+Release: 1
+%define srcdir src
 Group: Applications/Internet
 License: GPL
 Source0: https://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-%{fullversion}.tar.gz
@@ -79,8 +79,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rsync-ssl/certs

 %changelog
-* Sat Jun 27 2020 Wayne Davison <wayne@opencoder.net>
-Released 3.2.2pre1.
+* Sat Jul 04 2020 Wayne Davison <wayne@opencoder.net>
+Released 3.2.2.

 * Fri Mar 21 2008 Wayne Davison <wayne@opencoder.net>
 Added installation of /etc/xinetd.d/rsync file and some commented-out
--- a/packaging/md2html
+++ b/packaging/md2html
@@ -32,6 +32,22 @@ blockquote pre code {
 dd p:first-of-type {
  margin-block-start: 0em;
 }
+table {
+  border-color: grey;
+  border-spacing: 0;
+}
+tr {
+  border-top: 1px solid grey;
+}
+tr:nth-child(2n) {
+  background-color: #f6f8fa;
+}
+th, td {
+  border: 1px solid #dfe2e5;
+  text-align: center;
+  padding-left: 1em;
+  padding-right: 1em;
+}
 </style>
 </head><body>
 """
@@ -73,11 +89,8 @@ def main():


 def html_via_cmarkgfm(txt):
-    return cmarkgfm.markdown_to_html(txt)
-
-
-def html_via_commonmark(txt):
-    return commonmark.HtmlRenderer().render(commonmark.Parser().parse(txt))
+    # Our NEWS.md file has a gfm table in it.
+    return cmarkgfm.github_flavored_markdown_to_html(txt)


 if __name__ == '__main__':
@@ -90,10 +103,6 @@ if __name__ == '__main__':
        import cmarkgfm
        md_parser = html_via_cmarkgfm
    except:
-        try:
-            import commonmark
-            md_parser = html_via_commonmark
-        except:
-            die("Failed to find cmarkgfm or commonmark for python3.")
+        die("Failed to find cmarkgfm for python3.")

    main()
--- a/packaging/patch-update
+++ b/packaging/patch-update
@@ -13,9 +13,9 @@ sys.path = ['packaging'] + sys.path
 from pkglib import *

 MAKE_GEN_CMDS = [
-        'make -f prepare-source.mak conf'.split(),
-        './config.status'.split(),
-        'make gen'.split(),
+        './prepare-source'.split(),
+        'cd build && if test -f config.status ; then ./config.status ; else ../configure ; fi',
+        'make -C build gen'.split(),
        ]
 TMP_DIR = "patches.gen"

@@ -31,12 +31,11 @@ def main():

    starting_branch, args.base_branch = check_git_state(args.base_branch, not args.skip_check, args.patches_dir)

-    gen_stash(starting_branch)
-    if starting_branch == 'master':
-        cmd_run('md5sum configure.ac >.gen-stash/configure.ac.sum')
-
    master_commit = latest_git_hash(args.base_branch)

+    if cmd_txt_chk(['packaging/prep-auto-dir']) == '':
+        die('You must setup an auto-build-save dir to use this script.')
+
    if args.gen:
        if os.path.lexists(TMP_DIR):
            die(f'"{TMP_DIR}" must not exist in the current directory.')
@@ -46,7 +45,7 @@ def main():
            cmd_chk(cmd)
        cmd_chk(['rsync', '-a', *gen_files, f'{TMP_DIR}/master/'])

-    last_touch = time.time()
+    last_touch = int(time.time())

    # Start by finding all patches so that we can load all possible parents.
    patches = sorted(list(get_patch_branches(args.base_branch)))
@@ -95,11 +94,10 @@ def main():
    if args.gen:
        shutil.rmtree(TMP_DIR)

-    while last_touch >= time.time():
+    while last_touch >= int(time.time()):
        time.sleep(1)
    cmd_chk(['git', 'checkout', starting_branch])
-
-    gen_unstash(starting_branch)
+    cmd_chk(['packaging/prep-auto-dir'], discard='output')


 def update_patch(patch):
@@ -119,7 +117,7 @@ def update_patch(patch):

    print(f"======== {patch} ========")

-    while args.gen and last_touch >= time.time():
+    while args.gen and last_touch >= int(time.time()):
        time.sleep(1)

    branch = f"patch/{args.base_branch}/{patch}"
@@ -129,25 +127,20 @@ def update_patch(patch):

    s = cmd_run(['git', 'merge', based_on])
    ok = s.returncode == 0
-    if not ok or args.shell:
-        gen_unstash(branch)
-        m = re.search(r'([^/]+)$', parent)
-        parent_dir = m[1]
-        if not ok:
-            print(f'"git merge {based_on}" incomplete -- please fix.')
-        os.environ['PS1'] = f"[{parent_dir}] {patch}: "
-        while True:
-            s = cmd_run([os.environ.get('SHELL', '/bin/sh')])
-            if s.returncode != 0:
-                ans = input("Abort? [n/y] ")
-                if re.match(r'^y', ans, flags=re.I):
-                    return 0
-                continue
-            cur_branch, is_clean, status_txt = check_git_status(0)
-            if is_clean:
-                break
-            print(status_txt, end='')
-        gen_stash(branch)
+    if not ok or args.cmd or args.shell:
+        cmd_chk(['packaging/prep-auto-dir'], discard='output')
+    if not ok:
+        print(f'"git merge {based_on}" incomplete -- please fix.')
+        if not run_a_shell(parent, patch):
+            return 0
+    if args.cmd:
+        if cmd_run(args.cmd).returncode != 0:
+            if not run_a_shell(parent, patch):
+                return 0
+            ok = False
+    if ok and args.shell:
+        if not run_a_shell(parent, patch):
+            return 0

    with open(f"{args.patches_dir}/{patch}.diff", 'w', encoding='utf-8') as fh:
        fh.write(description[patch])
@@ -160,7 +153,7 @@ def update_patch(patch):
            cmd_chk(['rsync', '-a', *gen_files, f"{TMP_DIR}/{patch}/"])
        else:
            gen_files = [ ]
-        last_touch = time.time()
+        last_touch = int(time.time())

        proc = cmd_pipe(['git', 'diff', based_on])
        skipping = False
@@ -195,38 +188,30 @@ def update_patch(patch):
                line =  plus_re.sub(r'+++ b/\1', line)
                fh.write(line)
            proc.communicate()
-            for fn in gen_files:
-                os.unlink(fn)

    return 1


-# The autoconf cache dir can totally mess up if 2 different *.ac files have the same mtime!
-def gen_stash_prep(branch):
-    if os.path.isdir('autom4te.cache'):
-        shutil.rmtree('autom4te.cache')
-    return '.gen-stash/' + branch.replace('/', '%') + '.tar.gz'
+def run_a_shell(parent, patch):
+    m = re.search(r'([^/]+)$', parent)
+    parent_dir = m[1]
+    os.environ['PS1'] = f"[{parent_dir}] {patch}: "

+    while True:
+        s = cmd_run([os.environ.get('SHELL', '/bin/sh')])
+        if s.returncode != 0:
+            ans = input("Abort? [n/y] ")
+            if re.match(r'^y', ans, flags=re.I):
+                return False
+            continue
+        cur_branch, is_clean, status_txt = check_git_status(0)
+        if is_clean:
+            break
+        print(status_txt, end='')

-def gen_stash(branch):
-    files = 'configure.sh config.h.in Makefile'.split()
-    for fn in files:
-        if not os.path.exists(fn):
-            return
-    if not os.path.isdir('.gen-stash'):
-        os.mkdir('.gen-stash', 0o700)
-    tar_fn = gen_stash_prep(branch)
-    cmd_run(['./prepare-source'])
-    cmd_chk(['tar', 'czf', tar_fn, *files])
+    cmd_run('rm -f build/*.o build/*/*.o')

-
-def gen_unstash(branch):
-    tar_fn = gen_stash_prep(branch)
-    if os.path.exists(tar_fn):
-        cmd_chk(['tar', 'xf', tar_fn])
-    out, rc = cmd_txt_status('md5sum --status -c .gen-stash/configure.ac.sum'.split())
-    if rc:
-        print('*' * 10, "configure.ac differs from master version", '*' * 10)
+    return True


 if __name__ == '__main__':
@@ -234,6 +219,7 @@ if __name__ == '__main__':
    parser.add_argument('--branch', '-b', dest='base_branch', metavar='BASE_BRANCH', default='master', help="The branch the patch is based on. Default: master.")
    parser.add_argument('--skip-check', action='store_true', help="Skip the check that ensures starting with a clean branch.")
    parser.add_argument('--shell', '-s', action='store_true', help="Launch a shell for every patch/BASE/* branch updated, not just when a conflict occurs.")
+    parser.add_argument('--cmd', '-c', help="Run a command in every patch branch.")
    parser.add_argument('--gen', metavar='DIR', nargs='?', const='', help='Include generated files. Optional DIR value overrides the default of using the "patches" dir.')
    parser.add_argument('--patches-dir', '-p', metavar='DIR', default='patches', help="Override the location of the rsync-patches dir. Default: patches.")
    parser.add_argument('patch_files', metavar='patches/DIFF_FILE', nargs='*', help="Specify what patch diff files to process. Default: all of them.")
--- a/packaging/pkglib.py
+++ b/packaging/pkglib.py
@@ -181,38 +181,43 @@ def mandate_gensend_hook():


 # Snag the GENFILES values out of the Makefile.in file and return them as a list.
-def get_gen_files():
+def get_gen_files(want_dir_plus_list=False):
    cont_re = re.compile(r'\\\n')

-    extras = [ ]
+    gen_files = [ ]
+
+    auto_dir = os.path.join('auto-build-save', cmd_txt('git rev-parse --abbrev-ref HEAD').strip().replace('/', '%'))

    with open('Makefile.in', 'r', encoding='utf-8') as fh:
        for line in fh:
-            if not extras:
+            if not gen_files:
                chk = re.sub(r'^GENFILES=', '', line)
                if line == chk:
                    continue
                line = chk
            m = re.search(r'\\$', line)
            line = re.sub(r'^\s+|\s*\\\n?$|\s+$', '', line)
-            extras += line.split()
+            gen_files += line.split()
            if not m:
                break

-    return extras
+    if want_dir_plus_list:
+        return (auto_dir, gen_files)
+
+    return [ os.path.join(auto_dir, fn) for fn in gen_files ]


-def get_configure_version():
-    with open('configure.ac', 'r', encoding='utf-8') as fh:
-        for line in fh:
-            m = re.match(r'^AC_INIT\(\[rsync\],\s*\[(\d.+?)\]', line)
-            if m:
-                return m[1]
-    die("Unable to find AC_INIT with version in configure.ac")
+def get_rsync_version():
+    with open('version.h', 'r', encoding='utf-8') as fh:
+        txt = fh.read()
+    m = re.match(r'^#define\s+RSYNC_VERSION\s+"(\d.+?)"', txt)
+    if m:
+        return m[1]
+    die("Unable to find RSYNC_VERSION define in version.h")


 def get_NEWS_version_info():
-    rel_re = re.compile(r'^\| \d{2} \w{3} \d{4}\s+\|\s+(?P<ver>\d+\.\d+\.\d+)\s+\|\s+(?P<pdate>\d{2} \w{3} \d{4}\s+)?\|\s+(?P<pver>\d+)\s+\|')
+    rel_re = re.compile(r'^\| \S{2} \w{3} \d{4}\s+\|\s+(?P<ver>\d+\.\d+\.\d+)\s+\|\s+(?P<pdate>\d{2} \w{3} \d{4})?\s+\|\s+(?P<pver>\d+)\s+\|')
    last_version = last_protocol_version = None
    pdate = { }

@@ -228,12 +233,11 @@ def get_NEWS_version_info():
                    pdate[m['ver']] = m['pdate']
                if m['ver'] == last_version:
                    last_protocol_version = m['pver']
-                    break

    if not last_protocol_version:
        die(f"Unable to determine protocol_version for {last_version}.")

-    return last_version, last_protocol_version
+    return last_version, last_protocol_version, pdate


 def get_protocol_versions():
--- a/packaging/prep-auto-dir
+++ b/packaging/prep-auto-dir
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+
+# This script will setup the build dir based on the current git branch and the
+# directory auto-build-save/$BRANCH.  We don't use a symlink for the build dir
+# because we want to maximize the ccache reuse, so all builds must happen in
+# the same real dir.  When a dir is moved out of auto-build-save/$BRANCH to the
+# build dir, it is replaced with a symlink so that it can still be found under
+# that dir.  The build dir also gets a .branch -> $BRANCH symlink so that we
+# can figure out the current build dir's branch.
+
+# To get started, just clone the rsync git repo and create the auto-build-save
+# dir.  If you have an existing git checkout and it is not in a pristine state,
+# run "make distclean" before creating the auto-build-save dir.
+
+auto_top='auto-build-save'
+if test -d $auto_top -a -d .git; then
+    desired_branch=`git rev-parse --abbrev-ref HEAD | tr / %`
+    auto_dir="$auto_top/$desired_branch"
+    if test -d build; then
+	cur_branch=`readlink build/.branch`
+    else
+	cur_branch='/'
+    fi
+    if test "$desired_branch" != "$cur_branch"; then
+	if test "$cur_branch" != /; then
+	    rm -f "$auto_top/$cur_branch"
+	    mv build "$auto_top/$cur_branch"
+	fi
+	test -d "$auto_dir" || mkdir "$auto_dir"
+	test -h "$auto_dir/.branch" || ln -s "$desired_branch" "$auto_dir/.branch"
+	mv "$auto_dir" build
+	ln -s ../build "$auto_dir"
+    fi
+    if test ! -h Makefile; then
+	rm -f Makefile
+	ln -s packaging/auto-Makefile Makefile
+    fi
+    echo $desired_branch
+fi
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -30,7 +30,11 @@ def main():

    signal.signal(signal.SIGINT, signal_handler)

-    gen_files = get_gen_files()
+    if cmd_txt_chk(['packaging/prep-auto-dir']) == '':
+        die('You must setup an auto-build-save dir to use this script.');
+
+    auto_dir, gen_files = get_gen_files(True)
+    gen_pathnames = [ os.path.join(auto_dir, fn) for fn in gen_files ]

    dash_line = '=' * 74

@@ -53,13 +57,13 @@ def main():

    check_git_state(args.master_branch, True, 'patches')

-    confversion = get_configure_version()
+    curversion = get_rsync_version()

    # All version values are strings!
-    lastversion, last_protocol_version = get_NEWS_version_info()
+    lastversion, last_protocol_version, pdate = get_NEWS_version_info()
    protocol_version, subprotocol_version = get_protocol_versions()

-    version = confversion
+    version = curversion
    m = re.search(r'pre(\d+)', version)
    if m:
        version = re.sub(r'pre\d+', 'pre' + str(int(m[1]) + 1), version)
@@ -89,8 +93,8 @@ def main():
        cmd_chk(['git', 'tag', '-d', v_ver])

    version = re.sub(r'[-.]*pre[-.]*', 'pre', version)
-    if 'pre' in version and not confversion.endswith('dev'):
-        lastversion = confversion
+    if 'pre' in version and not curversion.endswith('dev'):
+        lastversion = curversion

    ans = input(f"Enter the previous version to produce a patch against: [{lastversion}] ")
    if ans != '':
@@ -112,11 +116,8 @@ def main():
        release += '.' + pre

    finalversion = re.sub(r'pre\d+', '', version)
-    if protocol_version == last_protocol_version:
-        proto_changed = 'unchanged'
-        proto_change_date = ' ' * 11
-    else:
-        proto_changed = 'changed'
+    proto_changed = protocol_version != last_protocol_version
+    if proto_changed:
        if finalversion in pdate:
            proto_change_date = pdate[finalversion]
        else:
@@ -125,6 +126,8 @@ def main():
                if re.match(r'^\d\d \w\w\w \d\d\d\d$', ans):
                    break
            proto_change_date = ans
+    else:
+        proto_change_date = ' ' * 11

    if 'pre' in lastversion:
        if not pre:
@@ -153,7 +156,7 @@ release is "{release}"

 About to:
    - tweak SUBPROTOCOL_VERSION in rsync.h, if needed
-    - tweak the version in configure.ac and the spec files
+    - tweak the version in version.h and the spec files
    - tweak NEWS.md to ensure header values are correct
    - generate configure.sh, config.h.in, and proto.h
    - page through the differences
@@ -168,16 +171,15 @@ About to:
        '%define srcdir': srcdir,
        }

-    tweak_files = 'configure.ac rsync.h NEWS.md'.split()
+    tweak_files = 'version.h rsync.h NEWS.md'.split()
    tweak_files += glob.glob('packaging/*.spec')
    tweak_files += glob.glob('packaging/*/*.spec')

    for fn in tweak_files:
        with open(fn, 'r', encoding='utf-8') as fh:
            old_txt = txt = fh.read()
-        if 'configure' in fn:
-            x_re = re.compile(r'^(AC_INIT\(\[rsync\],\s*\[)\d.+?(\])', re.M)
-            txt = replace_or_die(x_re, r'\g<1>%s\2' % version, txt, f"Unable to update AC_INIT with version in {fn}")
+        if fn == 'version.h':
+            txt = f'#define RSYNC_VERSION "{version}"\n'
        elif '.spec' in fn:
            for var, val in specvars.items():
                x_re = re.compile(r'^%s .*' % re.escape(var), re.M)
@@ -186,14 +188,17 @@ About to:
            txt = replace_or_die(x_re, r'%s \1' % cl_today, txt, f"Unable to update ChangeLog header in {fn}")
        elif fn == 'rsync.h':
            x_re = re.compile('(#define\s+SUBPROTOCOL_VERSION)\s+(\d+)')
-            repl = lambda m: m[1] + ' ' + '0' if not pre or proto_changed != 'changed' else 1 if m[2] == '0' else m[2]
+            repl = lambda m: m[1] + ' ' + ('0' if not pre or proto_changed else 1 if m[2] == '0' else m[2])
            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+Protocol: .+\n' % efv)
+            x_re = re.compile(r'^<.+>\s+# 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'
-                + f"Protocol: {protocol_version} ({proto_changed})\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'
            good_top = re.sub(r'\(.*?\)', '(UNRELEASED)', repl, 1)
            msg = f"The top lines of {fn} are not in the right format.  It should be:\n" + good_top
            txt = replace_or_die(x_re, repl, txt, msg)
@@ -216,10 +221,10 @@ About to:
    srctar_name = f"{rsync_ver}.tar.gz"
    pattar_name = f"rsync-patches-{version}.tar.gz"
    diff_name = f"{rsync_lastver}-{version}.diffs.gz"
-    srctar_file = f"{dest}/{srcdir}/{srctar_name}"
-    pattar_file = f"{dest}/{srcdir}/{pattar_name}"
-    diff_file = f"{dest}/{srcdiffdir}/{diff_name}"
-    lasttar_file = f"{dest}/{lastsrcdir}/{rsync_lastver}.tar.gz"
+    srctar_file = os.path.join(dest, srcdir, srctar_name)
+    pattar_file = os.path.join(dest, srcdir, pattar_name)
+    diff_file = os.path.join(dest, srcdiffdir, diff_name)
+    lasttar_file = os.path.join(dest, lastsrcdir, rsync_lastver + '.tar.gz')

    print(f"""\
 {dash_line}
@@ -237,8 +242,7 @@ About to:
    if s.returncode:
        die('Aborting')

-    cmd_chk('make reconfigure ; make gen')
-    cmd_chk(['rsync', '-a', *gen_files, 'SaVeDiR/'])
+    cmd_chk('make gen')

    print(f'Creating any missing patch branches.')
    s = cmd_run(f'packaging/branch-from-patch --branch={args.master_branch} --add-missing')
@@ -254,9 +258,6 @@ About to:
        print(f'\nVisiting all "patch/{args.master_branch}/*" branches ...')
        cmd_run(f"packaging/patch-update --branch={args.master_branch} --skip-check --shell")

-    cmd_run("rm -f *.[o15] *.html")
-    cmd_chk('rsync -a SaVeDiR/ .'.split())
-
    if os.path.isdir('patches/.git'):
        s = cmd_run(f"cd patches && git commit -a -m 'The patches for {version}.'")
        if s.returncode:
@@ -295,12 +296,12 @@ About to:
    os.environ['PATH'] = ORIGINAL_PATH

    # Extract the generated files from the old tar.
-    tweaked_gen_files = [ f"{rsync_lastver}/{x}" for x in gen_files ]
+    tweaked_gen_files = [ os.path.join(rsync_lastver, fn) for fn in gen_files ]
    cmd_run(['tar', 'xzf', lasttar_file, *tweaked_gen_files])
    os.rename(rsync_lastver, 'a')

    print(f"Creating {diff_file} ...")
-    cmd_chk(['rsync', '-a', *gen_files, 'b/'])
+    cmd_chk(['rsync', '-a', *gen_pathnames, 'b/'])

    sed_script = r's:^((---|\+\+\+) [ab]/[^\t]+)\t.*:\1:' # CAUTION: must not contain any single quotes!
    cmd_chk(f"(git diff v{lastversion} {v_ver} -- ':!.github'; diff -upN a b | sed -r '{sed_script}') | gzip -9 >{diff_file}")
@@ -318,18 +319,13 @@ About to:
    os.mkdir(f"{rsync_ver}/patches", 0o755)
    cmd_chk(f"packaging/patch-update --skip-check --branch={args.master_branch} --gen={rsync_ver}/patches".split())

-    cmd_run("rm -f *.[o15] *.html")
-    cmd_chk('rsync -a SaVeDiR/ .'.split())
-    shutil.rmtree('SaVeDiR')
-    cmd_chk('make gen'.split())
-
    print(f"Creating {pattar_file} ...")
    cmd_chk(['fakeroot', 'tar', 'chzf', pattar_file, rsync_ver + '/patches'])
    shutil.rmtree(rsync_ver)

    print(f"Updating the other files in {dest} ...")
    md_files = 'README.md NEWS.md'.split()
-    html_files = [ fn for fn in gen_files if fn.endswith('.html') ]
+    html_files = [ fn for fn in gen_pathnames if fn.endswith('.html') ]
    cmd_chk(['rsync', '-a', *md_files, *html_files, dest])
    cmd_chk(["packaging/md2html"] + [ dest +'/'+ fn for fn in md_files ])

--- a/packaging/systemd/rsync.service
+++ b/packaging/systemd/rsync.service
@@ -16,14 +16,14 @@ RestartSec=1
 #   This is generally used for public file distribution, [...]
 #
 # So let's assume some extra security is more than welcome here. We do full
-# system protection (which makes it read-only) and hide users' homes and
+# system protection (which makes /usr, /boot, & /etc read-only) and hide
 # devices. To override these defaults, it's best to do so in the drop-in
 # directory, often done via `systemctl edit rsync.service`. The file needs
 # just the bare minimum of the right [heading] and override values.
 # See systemd.unit(5) and search for "drop-in" for full details.

 ProtectSystem=full
-ProtectHome=on
+#ProtectHome=on|off|read-only
 PrivateDevices=on
 NoNewPrivileges=on

--- a/packaging/systemd/rsync@.service
+++ b/packaging/systemd/rsync@.service
@@ -16,13 +16,13 @@ StandardError=journal
 #   This is generally used for public file distribution, [...]
 #
 # So let's assume some extra security is more than welcome here. We do full
-# system protection (which makes it read-only) and hide users' homes and
+# system protection (which makes /usr, /boot, & /etc read-only) and hide
 # devices. To override these defaults, it's best to do so in the drop-in
 # directory, often done via `systemctl edit rsync@.service`. The file needs
 # just the bare minimum of the right [heading] and override values.
 # See systemd.unit(5) and search for "drop-in" for full details.

 ProtectSystem=full
-ProtectHome=on
+#ProtectHome=on|off|read-only
 PrivateDevices=on
 NoNewPrivileges=on
--- a/30
+++ b/30
@@ -16,6 +16,26 @@ if test x"$dir" = x; then
    dir=.
 fi

+if test "$dir" = '.'; then
+    branch=`packaging/prep-auto-dir` || exit 1
+    if test x"$branch" != x; then
+	cd build || exit 1
+	dir=..
+    fi
+fi
+
+if test "$dir" != '.'; then
+    for lnk in configure.ac m4; do
+	if test ! -h $lnk; then
+	    rm -f $lnk # Just in case
+	    ln -s "$dir/$lnk" $lnk
+	fi
+    done
+    for fn in configure.sh config.h.in aclocal.m4; do
+	test ! -f $fn -a -f "$dir/$fn" && cp -p "$dir/$fn" $fn
+    done
+fi
+
 if test $# = 0; then
    set -- build
 fi
@@ -23,13 +43,16 @@ fi
 for action in "${@}"; do
    case "$action" in
    build|make)
-	(cd $dir && make -f prepare-source.mak)
+	make -f "$dir/prepare-source.mak"
 	;;
    fetch|fetchgen)
-	$dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[ca]*' $dir
 	if test "$action" = fetchgen; then
-	    $dir/rsync-ssl -iip --no-motd rsync://download.samba.org/rsyncftp/generated-files/'[^ca]*' .
+	    match='*'
+	else
+	    match='[ca]*'
 	fi
+	$dir/rsync-ssl -iipc --no-motd "rsync://download.samba.org/rsyncftp/generated-files/$match" ./
+	test $? != 0 && continue
 	sleep 1 # The following files need to be newer than aclocal.m4
 	touch configure.sh config.h.in
 	;;
@@ -39,6 +62,7 @@ for action in "${@}"; do
    *)
 	echo "Unknown action: $action"
 	exit 1
+	;;
    esac
    if test $? = 0; then
 	exit
--- a/prepare-source.mak
+++ b/prepare-source.mak
@@ -1,3 +1,6 @@
+SHELL=/bin/sh
+
+.PHONY: conf
 conf: configure.sh config.h.in

 aclocal.m4: m4/*.m4
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -521,9 +521,6 @@ your home directory (remove the '=' for that).
    list of compression algorithms, a list of compiled-in capabilities, a link
    to the rsync web site, and some license/copyright info.

-    Repeat the option (`-VV`) to include some optimization info at the end of
-    the capabilities list.
-
 0.  `--verbose`, `-v`

    This option increases the amount of information you are given during the
@@ -691,7 +688,7 @@ your home directory (remove the '=' for that).
    before-the-transfer "Does this file need to be updated?" check.

    The checksum used is auto-negotiated between the client and the server, but
-    can be overridden using either the `--checksum-choice` option or an
+    can be overridden using either the `--checksum-choice` (`--cc`) option or an
    environment variable that is discussed in that option's section.

 0.  `--archive`, `-a`
@@ -1482,8 +1479,8 @@ your home directory (remove the '=' for that).
    - `md4`
    - `none`

-    Run `rsync -V` to see the default checksum list compiled into your version
-    (which may differ from the above list).
+    Run `rsync --version` to see the default checksum list compiled into your
+    version (which may differ from the list above).

    If "none" is specified for the first (or only) name, the `--whole-file`
    option is forced on and no checksum verification is performed on the
@@ -1495,20 +1492,20 @@ your home directory (remove the '=' for that).

    When both sides of the transfer are at least 3.2.0, rsync chooses the first
    algorithm in the client's list of choices that is also in the server's list
-    of choices.  If no common checksum choice is found, the client exits with
+    of choices.  If no common checksum choice is found, rsync exits with
    an error.  If the remote rsync is too old to support checksum negotiation,
    a value is chosen based on the protocol version (which chooses between MD5
    and various flavors of MD4 based on protocol age).

    The default order can be customized by setting the environment variable
    RSYNC_CHECKSUM_LIST to a space-separated list of acceptable checksum names.
-    If the environment variable contains a "`&`" character, the string is
-    separated into the "client list & server list".  If the resulting string is
-    empty (or contains only whitespace) the default checksum list is used.
-    This method does not allow you to specify the transfer checksum separately
-    from the pre-transfer checksum, and it discards "auto" and all unknown
-    checksum names.  A list with only invalid names will result in a failed
-    negotiation.
+    If the string contains a "`&`" character, it is separated into the "client
+    string & server string", otherwise the same string
+    applies to both.  If the string (or string portion) contains no
+    non-whitespace characters, the default checksum list is used.  This method
+    does not allow you to specify the transfer checksum separately from the
+    pre-transfer checksum, and it discards "auto" and all unknown checksum
+    names.  A list with only invalid names results in a failed negotiation.

    The use of the `--checksum-choice` option overrides this environment list.

@@ -2103,8 +2100,9 @@ your home directory (remove the '=' for that).

    Rsync can also be configured (at build time) to have this option enabled by
    default (with is overridden by both the environment and the command-line).
-    Run `rsync -V` to check if this is the case, as it will display "default
-    protect-args" or "optional protect-args" depending on how it was compiled.
+    Run `rsync --version` to check if this is the case, as it will display
+    "default protect-args" or "optional protect-args" depending on how it was
+    compiled.

    This option will eventually become a new default setting at some
    as-yet-undetermined point in the future.
@@ -2291,23 +2289,25 @@ your home directory (remove the '=' for that).
    something that is useful over a slow connection.

    Rsync supports multiple compression methods and will choose one for you
-    unless you force the choice using the `--compress-choice` option.
+    unless you force the choice using the `--compress-choice` (`--zc`) option.

-    Run `rsync -V` to see the default compress list compiled into your version.
+    Run `rsync --version` to see the default compress list compiled into your
+    version.

    When both sides of the transfer are at least 3.2.0, rsync chooses the first
    algorithm in the client's list of choices that is also in the server's list
-    of choices.  If no common compress choice is found, the client exits with
+    of choices.  If no common compress choice is found, rsync exits with
    an error.  If the remote rsync is too old to support checksum negotiation,
    its list is assumed to be "zlib".

    The default order can be customized by setting the environment variable
    RSYNC_COMPRESS_LIST to a space-separated list of acceptable compression
-    names.  If the environment variable contains a "`&`" character, the string
-    is separated into the "client list & server list".  If the resulting string
-    is empty (or contains only whitespace) the default compress list is used.
-    Any unknown compression names are discarded from the list, but a list with
-    only invalid names will result in a failed negotiation.
+    names.  If the string contains a "`&`" character, it is separated into the
+    "client string & server string", otherwise the same string applies to both.
+    If the string (or string portion) contains no
+    non-whitespace characters, the default compress list is used.  Any unknown
+    compression names are discarded from the list, but a list with only invalid
+    names results in a failed negotiation.

    There are some older rsync versions that were configured to reject a `-z`
    option and require the use of `-zz` because their compression library was
@@ -2333,8 +2333,8 @@ your home directory (remove the '=' for that).
    - `zlib`
    - `none`

-    Run `rsync -V` to see the default compress list compiled into your version
-    (which may differ from the above list).
+    Run `rsync --version` to see the default compress list compiled into your
+    version (which may differ from the list above).

    Note that if you see an error about an option named `--old-compress` or
    `--new-compress`, this is rsync trying to send the `--compress-choice=zlib`
@@ -2355,8 +2355,8 @@ your home directory (remove the '=' for that).
    "off").

    The level values vary depending on the checksum in effect.  Because rsync
-    will negotiate a checksum choice by default when the remote rsync is new
-    enough, it can be good to combine this option with a `--compress-choice`
+    will negotiate a checksum choice by default (when the remote rsync is new
+    enough), it can be good to combine this option with a `--compress-choice`
    (`--zc`) option unless you're sure of the choice in effect.  For example:

    >     rsync -aiv --zc=zstd --zl=22 host:src/ dest/
@@ -2386,8 +2386,10 @@ your home directory (remove the '=' for that).
    possible.  Rsync sets the compression level on a per-file basis based on
    the file's suffix.  If the compression algorithm has an "off" level (such
    as zlib/zlibx) then no compression occurs for those files.  Other
-    algorithms have the level minimized to reduces the CPU usage as much as
-    possible.
+    algorithms that support changing the streaming level on-the-fly will have
+    the level minimized to reduces the CPU usage as much as possible for a
+    matching file.  At this time, only zlib & zlibx compression support this
+    changing of levels on a per-file basis.

    The **LIST** should be one or more file suffixes (without the dot) separated
    by slashes (`/`).  You may specify an empty string to indicate that no files
@@ -3196,8 +3198,8 @@ your home directory (remove the '=' for that).
    These options also exist in the `--daemon` mode section.

    If rsync was complied without support for IPv6, the `--ipv6` option will
-    have no effect.  The `rsync -V` output will contain "`no IPv6`" if is the
-    case.
+    have no effect.  The `rsync --version` output will contain "`no IPv6`" if
+    is the case.

 0.  `--checksum-seed=NUM`

@@ -3310,8 +3312,8 @@ The options allowed when starting an rsync daemon are as follows:
    These options also exist in the regular rsync options section.

    If rsync was complied without support for IPv6, the `--ipv6` option will
-    have no effect.  The `rsync -V` output will contain "`no IPv6`" if is the
-    case.
+    have no effect.  The `rsync --version` output will contain "`no IPv6`" if
+    is the case.

 0.  `--help`, `-h`

--- a/rsync.h
+++ b/rsync.h
@@ -20,6 +20,7 @@

 #define False 0
 #define True 1
+#define Unset (-1) /* Our BOOL values are always an int. */

 #define BLOCK_SIZE 700
 #define RSYNC_RSH_ENV "RSYNC_RSH"
@@ -297,6 +298,7 @@ enum delret {
 #include "errcode.h"

 #include "config.h"
+#include "version.h"

 /* The default RSYNC_RSH is always set in config.h. */

@@ -1276,6 +1278,7 @@ extern char *do_malloc;
 #define new_array0(type, num) ((type*)my_alloc(NULL, (num), sizeof (type), __FILE__, __LINE__))
 #define realloc_array(ptr, type, num) ((type*)my_alloc((ptr), (num), sizeof (type), __FILE__, __LINE__))

+#undef strdup
 #define strdup(s) my_strdup(s, __FILE__, __LINE__)

 /* use magic gcc attributes to catch format errors */
--- a/rsyncd.conf.5.md
+++ b/rsyncd.conf.5.md
@@ -424,6 +424,22 @@ the values of parameters.  See the GLOBAL PARAMETERS section for more details.
    Helpful hint: you probably want to specify "refuse options = delete" for a
    write-only module.

+0.  `open noatime`
+
+    When set to True, this parameter tells the rsync daemon to open files with
+    the O_NOATIME flag
+    (on systems that support it) to avoid changing the access time of the files
+    that are being transferred.  If your OS does not support the O_NOATIME flag
+    then rsync will silently ignore this option.  Note also that some
+    filesystems are mounted to avoid updating the atime on read access even
+    without the O_NOATIME flag being set.
+
+    When set to False, this parameters ensures that files on the server are not
+    opened with O_NOATIME.
+
+    When set to Unset (the default) the user controls the setting via
+    `--open-noatime`.
+
 0.  `list`

    This parameter determines whether this module is listed when the client
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -18,7 +18,7 @@ outfile="$scratchdir/rsync.out"
 makepath "$fromdir/foo"
 makepath "$fromdir/bar/baz"
 cp -p "$srcdir/configure.ac" "$fromdir/foo/config1"
-cp -p "$srcdir/config.h.in" "$fromdir/foo/config2"
+cp -p "$srcdir/config.sub" "$fromdir/foo/config2"
 cp -p "$srcdir/rsync.h" "$fromdir/bar/baz/rsync"
 chmod 600 "$fromdir"/foo/config? "$fromdir/bar/baz/rsync"
 umask 0
@@ -84,7 +84,7 @@ rm "$todir/foo/sym"
 umask 0
 ln -s ../bar/baz "$todir/foo/sym"
 umask 022
-cp -p "$srcdir/config.h.in" "$fromdir/foo/config2"
+cp -p "$srcdir/config.sub" "$fromdir/foo/config2"
 chmod 600 "$fromdir/foo/config2"
 chmod 777 "$todir/bar/baz/rsync"

--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -97,7 +97,8 @@ printmsg() {
 }

 rsync_ls_lR() {
-    find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
+    find "$@" -name .git -prune -o -name auto-build-save -prune -o -print | \
+	sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
 }

 get_testuid() {
@@ -296,8 +297,9 @@ use chroot = no
 munge symlinks = no
 hosts allow = localhost 127.0.0.0/24 192.168.0.0/16 10.0.0.0/8 $hostname
 log file = $logfile
-log format = %i %h [%a] %m (%u) %l %f%L
 transfer logging = yes
+# We don't define log format here so that the test-hidden module will default
+# to the internal static string (since we had a crash trying to tweak it).
 exclude = ? foobar.baz
 max verbosity = 4
 $uid_setting
@@ -305,16 +307,19 @@ $gid_setting

 [test-from]
 	path = $fromdir
+	log format = %i %h [%a] %m (%u) %l %f%L
 	read only = yes
 	comment = r/o

 [test-to]
 	path = $todir
+	log format = %i %h [%a] %m (%u) %l %f%L
 	read only = no
 	comment = r/w

 [test-scratch]
 	path = $scratchdir
+	log format = %i %h [%a] %m (%u) %l %f%L
 	read only = no

 [test-hidden]
--- a/token.c
+++ b/token.c
@@ -376,8 +376,7 @@ send_deflated_token(int f, int32 token, struct map_struct *buf, OFF_T offset, in
 		flush_pending = 0;
 	} else if (last_token == -2) {
 		run_start = token;
-	} else if (nb != 0 || token != last_token + 1
-		   || token >= run_start + 65536) {
+	} else if (nb != 0 || token != last_token + 1 || token >= run_start + 65536) {
 		/* output previous run */
 		r = run_start - last_run_end;
 		n = last_token - run_start;
@@ -679,7 +678,6 @@ static void send_zstd_token(int f, int32 token, struct map_struct *buf, OFF_T of

 	/* initialization */
 	if (!comp_init_done) {
-
 		zstd_cctx = ZSTD_createCCtx();
 		if (!zstd_cctx) {
 			rprintf(FERROR, "compression init failed\n");
@@ -700,10 +698,7 @@ static void send_zstd_token(int f, int32 token, struct map_struct *buf, OFF_T of
 		flush_pending = 0;
 	} else if (last_token == -2) {
 		run_start = token;
-
-	} else if (nb != 0 || token != last_token + 1
-		   || token >= run_start + 65536) {
-
+	} else if (nb != 0 || token != last_token + 1 || token >= run_start + 65536) {
 		/* output previous run */
 		r = run_start - last_run_end;
 		n = last_token - run_start;
@@ -785,7 +780,6 @@ static int32 recv_zstd_token(int f, char **data)
 	int r;

 	if (!decomp_init_done) {
-
 		zstd_dctx = ZSTD_createDCtx();
 		if (!zstd_dctx) {
 			rprintf(FERROR, "ZSTD_createDStream failed\n");
@@ -803,30 +797,31 @@ static int32 recv_zstd_token(int f, char **data)
 		decomp_init_done = 1;
 	}

-	do {
-	switch (recv_state) {
-	case r_init:
-		recv_state = r_idle;
-		rx_token = 0;
-		break;
+	for (;;) {
+		switch (recv_state) {
+		case r_init:
+			recv_state = r_idle;
+			rx_token = 0;
+			break;

-	case r_idle:
-		flag = read_byte(f);
-		if ((flag & 0xC0) == DEFLATED_DATA) {
-			n = ((flag & 0x3f) << 8) + read_byte(f);
-			read_buf(f, cbuf, n);
+		case r_idle:
+			flag = read_byte(f);
+			if ((flag & 0xC0) == DEFLATED_DATA) {
+				n = ((flag & 0x3f) << 8) + read_byte(f);
+				read_buf(f, cbuf, n);

-			zstd_in_buff.size = n;
-			zstd_in_buff.pos = 0;
+				zstd_in_buff.size = n;
+				zstd_in_buff.pos = 0;

-			recv_state = r_inflating;
+				recv_state = r_inflating;
+				break;
+			}

-		} else if (flag == END_FLAG) {
-			/* that's all folks */
-			recv_state = r_init;
-			return 0;
-
-		} else {
+			if (flag == END_FLAG) {
+				/* that's all folks */
+				recv_state = r_init;
+				return 0;
+			}
 			/* here we have a token of some kind */
 			if (flag & TOKEN_REL) {
 				rx_token += flag & 0x3f;
@@ -839,45 +834,42 @@ static int32 recv_zstd_token(int f, char **data)
 				recv_state = r_running;
 			}
 			return -1 - rx_token;
+
+		case r_inflated: /* zstd doesn't get into this state */
+			break;
+
+		case r_inflating:
+			zstd_out_buff.size = out_buffer_size;
+			zstd_out_buff.pos = 0;
+
+			r = ZSTD_decompressStream(zstd_dctx, &zstd_out_buff, &zstd_in_buff);
+			n = zstd_out_buff.pos;
+			if (ZSTD_isError(r)) {
+				rprintf(FERROR, "ZSTD decomp returned %d (%d bytes)\n", r, n);
+				exit_cleanup(RERR_STREAMIO);
+			}
+
+			/*
+			 * If the input buffer is fully consumed and the output
+			 * buffer is not full then next step is to read more
+			 * data.
+			 */
+			if (zstd_in_buff.size == zstd_in_buff.pos && n < out_buffer_size)
+				recv_state = r_idle;
+
+			if (n != 0) {
+				*data = dbuf;
+				return n;
+			}
+			break;
+
+		case r_running:
+			++rx_token;
+			if (--rx_run == 0)
+				recv_state = r_idle;
+			return -1 - rx_token;
 		}
-		break;
-
-	case r_inflating:
-		zstd_out_buff.size = out_buffer_size;
-		zstd_out_buff.pos = 0;
-
-		r = ZSTD_decompressStream(zstd_dctx, &zstd_out_buff, &zstd_in_buff);
-		n = zstd_out_buff.pos;
-		if (ZSTD_isError(r)) {
-			rprintf(FERROR, "ZSTD decomp returned %d (%d bytes)\n", r, n);
-			exit_cleanup(RERR_STREAMIO);
-		}
-
-		/*
-		 * If the input buffer is fully consumed and the output
-		 * buffer is not full then next step is to read more
-		 * data.
-		 */
-		if (zstd_in_buff.size == zstd_in_buff.pos && n < out_buffer_size)
-			recv_state = r_idle;
-
-		if (n != 0) {
-			*data = dbuf;
-			return n;
-		}
-		break;
-
-	case r_running:
-		++rx_token;
-		if (--rx_run == 0)
-			recv_state = r_idle;
-		return -1 - rx_token;
-		break;
-
-	case r_inflated:
-		break;
 	}
-	} while (1);
 }
 #endif /* SUPPORT_ZSTD */

@@ -899,8 +891,7 @@ send_compressed_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
 		flush_pending = 0;
 	} else if (last_token == -2) {
 		run_start = token;
-	} else if (nb != 0 || token != last_token + 1
-		   || token >= run_start + 65536) {
+	} else if (nb != 0 || token != last_token + 1 || token >= run_start + 65536) {
 		/* output previous run */
 		r = run_start - last_run_end;
 		n = last_token - run_start;
@@ -925,7 +916,6 @@ send_compressed_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
 		const char *next_in;

 		do {
-			char *ptr = obuf;
 			char *next_out = obuf + 2;

 			if (available_out == 0) {
@@ -940,10 +930,10 @@ send_compressed_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
 				exit_cleanup(RERR_STREAMIO);
 			}
 			if (available_out <= MAX_DATA_COUNT) {
-				ptr[0] = DEFLATED_DATA + (available_out >> 8);
-				ptr[1] = available_out;
+				obuf[0] = DEFLATED_DATA + (available_out >> 8);
+				obuf[1] = available_out;

-				write_buf(f, ptr, available_out + 2);
+				write_buf(f, obuf, available_out + 2);

 				available_out = 0;
 				nb -= available_in;
@@ -952,14 +942,14 @@ send_compressed_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
 		} while (nb != 0);
 		flush_pending = token == -2;
 	}
-	if (token == -1)
+	if (token == -1) {
 		/* end of file - clean up */
 		write_byte(f, END_FLAG);
+	}
 }

 static int32 recv_compressed_token(int f, char **data)
 {
-	static int32 saved_flag;
 	static int init_done;
 	int32 n, flag;
 	int size = MAX(LZ4_compressBound(CHUNK_SIZE), MAX_DATA_COUNT+2);
@@ -978,13 +968,9 @@ static int32 recv_compressed_token(int f, char **data)
 			recv_state = r_idle;
 			rx_token = 0;
 			break;
+
 		case r_idle:
-		case r_inflated:
-			if (saved_flag) {
-				flag = saved_flag & 0xff;
-				saved_flag = 0;
-			} else
-				flag = read_byte(f);
+			flag = read_byte(f);
 			if ((flag & 0xC0) == DEFLATED_DATA) {
 				n = ((flag & 0x3f) << 8) + read_byte(f);
 				read_buf(f, cbuf, n);
@@ -994,9 +980,6 @@ static int32 recv_compressed_token(int f, char **data)
 				break;
 			}

-			if (recv_state == r_inflated)
-				recv_state = r_idle;
-
 			if (flag == END_FLAG) {
 				/* that's all folks */
 				recv_state = r_init;
@@ -1022,10 +1005,13 @@ static int32 recv_compressed_token(int f, char **data)
 				rprintf(FERROR, "uncompress failed: %d\n", avail_out);
 				exit_cleanup(RERR_STREAMIO);
 			}
-			recv_state = r_inflated;
+			recv_state = r_idle;
 			*data = dbuf;
 			return avail_out;

+		case r_inflated: /* lz4 doesn't get into this state */
+			break;
+
 		case r_running:
 			++rx_token;
 			if (--rx_run == 0)
@@ -1033,53 +1019,7 @@ static int32 recv_compressed_token(int f, char **data)
 			return -1 - rx_token;
 		}
 	}
-
 }
-
-# if 0
-static void see_uncompressed_token(char *buf, int32 len)
-{
-	static const char *next_in;
-	static int avail_in;
-	int avail_out;
-
-	int32 blklen;
-	char hdr[5];
-
-	avail_in = 0;
-	blklen = 0;
-	hdr[0] = 0;
-	do {
-		if (avail_in == 0 && len != 0) {
-			if (blklen == 0) {
-				/* Give it a fake stored-block header. */
-				next_in = hdr;
-				avail_in = 5;
-				blklen = len;
-				if (blklen > 0xffff)
-					blklen = 0xffff;
-				hdr[1] = blklen;
-				hdr[2] = blklen >> 8;
-				hdr[3] = ~hdr[1];
-				hdr[4] = ~hdr[2];
-			} else {
-				next_in = (char *)buf;
-				avail_in = blklen;
-				if (protocol_version >= 31) /* Newer protocols avoid a data-duplicating bug */
-					buf += blklen;
-				len -= blklen;
-				blklen = 0;
-			}
-		}
-		avail_out = LZ4_decompress_safe(next_in, dbuf, avail_in, LZ4_compressBound(CHUNK_SIZE));
-		if (avail_out < 0) {
-			rprintf(FERROR, "uncompress failed: %d\n", avail_out);
-			exit_cleanup(RERR_STREAMIO);
-		}
-
-	} while (len);
-}
-# endif /* 0 */
 #endif /* SUPPORT_LZ4 */

 /**
--- a/version.h
+++ b/version.h
@@ -0,0 +1 @@
+#define RSYNC_VERSION "3.2.2"
Author	SHA1	Message	Date
Wayne Davison	194cee671d	Preparing for release of 3.2.2	2020-07-04 23:12:59 -07:00
Wayne Davison	b7c5520add	Handle tweaked NEWS headings & protocol change.	2020-07-04 23:11:46 -07:00
Wayne Davison	2bee307592	Get rid of some superfluous lz4 code.	2020-07-04 16:13:00 -07:00
Wayne Davison	85e62c330d	Tweak indentation.	2020-07-04 16:10:37 -07:00
Wayne Davison	0add026a5d	Initialize values string in a more consistent spot.	2020-07-04 14:21:15 -07:00
Wayne Davison	f4184849c4	Use module_id more consistently after it is set.	2020-07-04 10:28:39 -07:00
Wayne Davison	565cde84a7	Don't turn off the user's open-noatime unless the module is forcing the value.	2020-07-04 10:28:38 -07:00
Paul Slootman	f0e670b4c6	Add "open noatime" module option to rsyncd.conf	2020-07-04 09:30:35 -07:00
Wayne Davison	ef8951779d	Fix issue in --compress-level doc.	2020-07-03 11:58:36 -07:00
Wayne Davison	e285f8f9d2	Some NEWS and man page tweaks.	2020-07-02 22:33:40 -07:00
Wayne Davison	cb383673f6	Tweak a var name.	2020-07-02 09:34:08 -07:00
Wayne Davison	0768d620a5	Another table tweak.	2020-07-01 14:20:14 -07:00
Wayne Davison	d640d78f91	Change how protocol changes are mentioned; fix table in html.	2020-07-01 14:14:24 -07:00
Wayne Davison	544b3d8b3b	A few more systemd tweaks.	2020-07-01 12:10:14 -07:00
Wayne Davison	ce12142c45	Don't set systemd ProtectHome=on by default.	2020-07-01 10:41:13 -07:00
Wayne Davison	c83a81ca38	Move name exceptions into the txt file.	2020-07-01 09:05:21 -07:00
Wayne Davison	d88db22ae8	Add support for the remaining parser types.	2020-07-01 08:15:12 -07:00
Wayne Davison	a1cc50ba96	Preparing for release of 3.2.2pre3	2020-06-30 23:17:50 -07:00
Wayne Davison	feb2fff894	Put the optimizations into their own list.	2020-06-30 19:31:59 -07:00
Wayne Davison	7d30490ef4	Simplify the daemon parameter definitions The code now derives all the struct defines, default value assignments, parser-param defines, and lp_foo() accessor functions from a single list of daemon parameters.	2020-06-30 19:30:28 -07:00
Wayne Davison	317beebef8	Avoid crash of transfer logging w/default log format.	2020-06-30 12:16:52 -07:00
Wayne Davison	7a413c9722	Avoid strdup redefinition warning.	2020-06-30 08:27:20 -07:00
Wayne Davison	5be7363297	Avoid bloating the src-dir scan.	2020-06-29 21:45:56 -07:00
Wayne Davison	646784f0e5	Move the new target after "all".	2020-06-29 20:04:54 -07:00
Wayne Davison	18ed3f0279	More patch-update improvements; configure.ac tweak; Makefile tweaks.	2020-06-29 19:53:05 -07:00
Wayne Davison	00dd50a00c	Preparing for release of 3.2.2pre2	2020-06-28 19:54:38 -07:00
Wayne Davison	7039d14616	Improve the per-branch build dir support The release script & the patch management script now require the use of an auto-build-save dir that makes it much easier to keep the generated files from melding together, and remembers the configure setup for each patch branch.	2020-06-28 19:42:25 -07:00
Wayne Davison	ec3c9f2f5a	Improve alternate build-dir support We now put the configure.sh, config.h.in, and aclocal.m4 files in the alternate build dir along with the other generated files. This requires that we create symlinks for configure.ac & m4 in the build dir, which is handled on the first run of configure or prepare-source. I also changed the patch-branch handling away from the .gen-stash dir to an automatic build/$PATCH subdir idiom that will keep each branch's configuration separated. These automatic build dirs are only used when there is a .git dir, a build/master dir, and no top-dir Makefile. You'll also want to have package/make early on your path for optimal ease of use.	2020-06-28 15:12:10 -07:00
Wayne Davison	3b4f5fb891	Move the version string out of configure.ac.	2020-06-28 15:02:19 -07:00
Wayne Davison	76064b1bf2	Fix rebuilding configure.sh in an alternate build dir	2020-06-28 12:55:43 -07:00
Wayne Davison	8df766917e	A bit more man page & NEWS tweaking.	2020-06-28 09:21:29 -07:00
Wayne Davison	299430a6c1	Lack of "saw" values now reported as "INVALID"; tweak a comment.	2020-06-27 23:14:35 -07:00