[SCM] The rsync repository. - branch master updated
The branch, master has been updated via d88db22a Add support for the remaining parser types. from a1cc50ba Preparing for release of 3.2.2pre3 https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log - commit d88db22ae8aa3f75b21d897bd16587a85f0804e5 Author: Wayne Davison Date: Wed Jul 1 08:07:07 2020 -0700 Add support for the remaining parser types. --- Summary of changes: daemon-parm.awk | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/daemon-parm.awk b/daemon-parm.awk index efc15474..8fc4c237 100755 --- a/daemon-parm.awk +++ b/daemon-parm.awk @@ -8,7 +8,7 @@ BEGIN { sect = psect = defines = accessors = prior_ptype = "" values = "\nstatic const all_vars Defaults = {\n{ /* Globals: */\n" params = "\nstatic struct parm_struct parm_table[] = {" -exp_line = "\n/** EXP **/\n" +comment_fmt = "\n/** %s **/\n" tdstruct = "typedef struct {" } @@ -22,7 +22,7 @@ BEGIN { exit } defines = tdstruct -exps = exp_values = exp_line +exps = exp_values = sprintf(comment_fmt, "EXP") sect = "GLOBAL" psect = ", P_GLOBAL, &Vars.g." next @@ -35,21 +35,22 @@ BEGIN { } defines = defines exps "} global_vars;\n\n" tdstruct values = values exp_values "\n}, { /* Locals: */\n" -exps = exp_values = exp_line +exps = exp_values = sprintf(comment_fmt, "EXP") sect = "LOCAL" psect = ", P_LOCAL, &Vars.l." next } -/^(STRING|PATH|INTEGER|ENUM|BOOL)/ { +/^(STRING|CHAR|PATH|INTEGER|ENUM|OCTAL|BOOL|BOOLREV)[ \t]/ { ptype = $1 name = $2 $1 = $2 = "" sub(/^[ \t]+/, "") if (ptype != prior_ptype) { - defines = defines "\n/** " ptype " **/\n" - values = values "\n/** " ptype " **/\n" + comment = sprintf(comment_fmt, ptype) + defines = defines comment + values = values comment params = params "\n" accessors = accessors "\n" prior_ptype = ptype @@ -58,8 +59,11 @@ BEGIN { if (ptype == "STRING" || ptype == "PATH") { atype = "STRING" vtype = "char*" -} else if (ptype == "BOOL") { +} else if (ptype == "BOOL" || ptype == "BOOLREV") { atype = vtype = "BOOL" +} else if (ptype == "CHAR") { + atype = "CHAR" + vtype = "char" } else { atype = "INTEGER" vtype = "int" -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch master updated
The branch, master has been updated via c83a81ca Move name exceptions into the txt file. from d88db22a Add support for the remaining parser types. https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log - commit c83a81ca385187151a00813d6ce185bccac81999 Author: Wayne Davison Date: Wed Jul 1 09:05:21 2020 -0700 Move name exceptions into the txt file. --- Summary of changes: daemon-parm.awk | 18 +++--- daemon-parm.txt | 4 ++-- 2 files changed, 9 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/daemon-parm.awk b/daemon-parm.awk index 8fc4c237..0166a9e3 100755 --- a/daemon-parm.awk +++ b/daemon-parm.awk @@ -69,16 +69,12 @@ BEGIN { vtype = "int" } -# We have 2 variables that don't match their conf string. Oh well... -if (name == "bind_address") - spname = "address" -else if (name == "rsync_port") - spname = "port" -else { - spname = name - gsub(/_/, " ", spname) - gsub(/-/, "", name) -} +# The name might be var_name|public_name +pubname = name +sub(/\|.*/, "", name) +sub(/.*\|/, "", pubname) +gsub(/_/, " ", pubname) +gsub(/-/, "", name) if (ptype == "ENUM") enum = "enum_" name @@ -87,7 +83,7 @@ BEGIN { defines = defines "\t" vtype " " name ";\n" values = values "\t" $0 ", /* " name " */\n" -params = params " {\"" spname "\", P_" ptype psect name ", " enum ", 0},\n" +params = params " {\"" pubname "\", P_" ptype psect name ", " enum ", 0},\n" accessors = accessors "FN_" sect "_" atype "(lp_" name ", " name ")\n" if (vtype == "char*") { diff --git a/daemon-parm.txt b/daemon-parm.txt index 36ae5115..83ecc980 100644 --- a/daemon-parm.txt +++ b/daemon-parm.txt @@ -1,6 +1,6 @@ Globals: -STRING bind_addressNULL +STRING bind_address|addressNULL STRING daemon_chroot NULL STRING daemon_gid NULL STRING daemon_uid NULL @@ -9,7 +9,7 @@ STRING pid_fileNULL STRING socket_options NULL INTEGERlisten_backlog 5 -INTEGERrsync_port 0 +INTEGERrsync_port|port 0 BOOL proxy_protocol False -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch master updated
The branch, master has been updated via ce12142c Don't set systemd ProtectHome=on by default. from c83a81ca Move name exceptions into the txt file. https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log - commit ce12142c459788b611da5f5d525e0486822b043a Author: Wayne Davison Date: Wed Jul 1 10:40:02 2020 -0700 Don't set systemd ProtectHome=on by default. --- Summary of changes: NEWS.md | 10 ++ packaging/systemd/rsync.service | 2 +- packaging/systemd/rsync@.service | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS.md b/NEWS.md index 2b192b38..e30d9903 100644 --- a/NEWS.md +++ b/NEWS.md @@ -39,6 +39,11 @@ Protocol: 31 (unchanged) also allows you to specify the value via the RSYNC_MAX_ALLOC environment variable. + - The default systemd config was changed to remove the `ProtectHome=on` + setting since rsync is often used to serve files in /home and this seemed a + bit too strict. Feel free to use `systemctl edit rsync` to add that + restriction to your own setup, if you like. + - 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. @@ -98,6 +103,11 @@ Protocol: 31 (unchanged) ### ENHANCEMENTS: + - The default systemd config was made a bit stricter by default. For + instance, `ProtectHome=on` was added. You can override this using the + standard `systemctl edit rsync` and add a line to turn that off under a + `[Service]` heading. + - The use of `--backup-dir=STR` now implies `--backup`. - Added `--zl=NUM` as a short-hand for `--compress-level=NUM`. diff --git a/packaging/systemd/rsync.service b/packaging/systemd/rsync.service index fafe72b3..5955db9e 100644 --- a/packaging/systemd/rsync.service +++ b/packaging/systemd/rsync.service @@ -23,7 +23,7 @@ RestartSec=1 # See systemd.unit(5) and search for "drop-in" for full details. ProtectSystem=full -ProtectHome=on +#ProtectHome=on PrivateDevices=on NoNewPrivileges=on diff --git a/packaging/systemd/rsync@.service b/packaging/systemd/rsync@.service index e1f48da8..3168cb61 100644 --- a/packaging/systemd/rsync@.service +++ b/packaging/systemd/rsync@.service @@ -23,6 +23,6 @@ StandardError=journal # See systemd.unit(5) and search for "drop-in" for full details. ProtectSystem=full -ProtectHome=on +#ProtectHome=on PrivateDevices=on NoNewPrivileges=on -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch master updated
The branch, master has been updated via 544b3d8b A few more systemd tweaks. from ce12142c Don't set systemd ProtectHome=on by default. https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log - commit 544b3d8b3b07279ba53ce4dcff656a7fc70156b8 Author: Wayne Davison Date: Wed Jul 1 11:36:00 2020 -0700 A few more systemd tweaks. --- Summary of changes: NEWS.md | 19 +++ packaging/systemd/rsync.service | 4 ++-- packaging/systemd/rsync@.service | 4 ++-- 3 files changed, 15 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS.md b/NEWS.md index e30d9903..14284729 100644 --- a/NEWS.md +++ b/NEWS.md @@ -40,9 +40,10 @@ Protocol: 31 (unchanged) variable. - The default systemd config was changed to remove the `ProtectHome=on` - setting since rsync is often used to serve files in /home and this seemed a - bit too strict. Feel free to use `systemctl edit rsync` to add that - restriction to your own setup, if you like. + 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 @@ -103,11 +104,6 @@ Protocol: 31 (unchanged) ### ENHANCEMENTS: - - The default systemd config was made a bit stricter by default. For - instance, `ProtectHome=on` was added. You can override this using the - standard `systemctl edit rsync` and add a line to turn that off under a - `[Service]` heading. - - The use of `--backup-dir=STR` now implies `--backup`. - Added `--zl=NUM` as a short-hand for `--compress-level=NUM`. @@ -201,6 +197,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 diff --git a/packaging/systemd/rsync.service b/packaging/systemd/rsync.service index 5955db9e..8a0b5820 100644 --- 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 diff --git a/packaging/systemd/rsync@.service b/packaging/systemd/rsync@.service index 3168cb61..63ba0c7c 100644 --- 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 -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch master updated
The branch, master has been updated via d640d78f Change how protocol changes are mentioned; fix table in html. from 544b3d8b A few more systemd tweaks. https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log - commit d640d78f91ecf47a76dd0da6785a476294e67c7a Author: Wayne Davison Date: Wed Jul 1 13:56:12 2020 -0700 Change how protocol changes are mentioned; fix table in html. --- Summary of changes: NEWS.md | 157 -- packaging/md2html | 27 ++ 2 files changed, 75 insertions(+), 109 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS.md b/NEWS.md index 14284729..113a976e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,9 +2,7 @@ # NEWS for rsync 3.2.2 (UNRELEASED) -Protocol: 31 (unchanged) - -## Changes since 3.2.1: +## Changes in this version: ### BUG FIXES: @@ -77,9 +75,7 @@ Protocol: 31 (unchanged) # NEWS for rsync 3.2.1 (22 Jun 2020) -Protocol: 31 (unchanged) - -## Changes since 3.2.0: +## Changes in this version: ### BUG FIXES: @@ -142,9 +138,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: @@ -356,9 +350,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: @@ -428,9 +420,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: @@ -496,9 +486,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: @@ -618,9 +606,11 @@ Protocol: 31 (unchanged) # NEWS for rsync 3.1.0 (28 Sep 2013) -Protocol: 31 (changed) +## Changes in this version: + +### PROTOCOL NUMBER: -## Changes since 3.0.9: + - The protocol number was changed to 31. ### OUTPUT CHANGES: @@ -867,9 +857,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: @@ -929,9 +917,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: @@ -1070,9 +1056,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: @@ -1140,9 +1124,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: @@ -1201,9 +1183,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: @@ -1268,9 +1248,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: @@ -1338,9 +1316,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: @@ -1431,9 +1407,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: @@ -1455,9 +1429,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: @@ -1595,9 +1567,11 @@ Protocol: 30 (unchanged) # NEWS for rsync 3.0.0 (1 Mar 2008) -Protocol: 30 (changed) +## Changes in this version: + +### PROTOCOL NUMBER: -## Changes since 2.6.9: + - The protocol number was changed to 30. ### NOTABLE CHANGES IN BEHAVIOR: @@ -1944,9 +1918,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: @@ -2106,9 +2078,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: @@ -2178,9 +2148,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: @@ -2504,9 +2472,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
[SCM] The rsync repository. - branch master updated
The branch, master has been updated via 0768d620 Another table tweak. from d640d78f Change how protocol changes are mentioned; fix table in html. https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log - commit 0768d620a5005b1e5425abc17d2f3989a2309558 Author: Wayne Davison Date: Wed Jul 1 14:20:14 2020 -0700 Another table tweak. --- Summary of changes: NEWS.md | 2 +- packaging/md2html | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS.md b/NEWS.md index 113a976e..eb8f724c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4140,7 +4140,7 @@ | RELEASE DATE | VER. | DATE OF COMMIT\* | PROTOCOL| |--||--|-| -| ?? Jun 2020 | 3.2.2 | | 31 | +| ?? 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 | diff --git a/packaging/md2html b/packaging/md2html index c6904810..0ee7c405 100755 --- a/packaging/md2html +++ b/packaging/md2html @@ -35,7 +35,6 @@ dd p:first-of-type { table { border-color: grey; border-spacing: 0; - width: 100%%; } tr { border-top: 1px solid grey; @@ -45,6 +44,9 @@ tr:nth-child(2n) { } th, td { border: 1px solid #dfe2e5; + text-align: center; + padding-left: 1em; + padding-right: 1em; } -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs