The branch, master has been updated via 194cee67 Preparing for release of 3.2.2 via b7c5520a Handle tweaked NEWS headings & protocol change. from 2bee3075 Get rid of some superfluous lz4 code.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 194cee671d5e178f20c4494f41911fa8db942935 Author: Wayne Davison <wa...@opencoder.net> Date: Sat Jul 4 23:12:59 2020 -0700 Preparing for release of 3.2.2 commit b7c5520adddbe40266c05118cc156482e66ceb82 Author: Wayne Davison <wa...@opencoder.net> Date: Sat Jul 4 22:41:16 2020 -0700 Handle tweaked NEWS headings & protocol change. ----------------------------------------------------------------------- Summary of changes: NEWS.md | 4 ++-- packaging/lsb/rsync.spec | 10 +++++----- packaging/pkglib.py | 5 ++--- packaging/release-rsync | 20 +++++++++++--------- version.h | 2 +- 5 files changed, 21 insertions(+), 20 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS.md b/NEWS.md index cb0d5436..8a104282 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ <a name="3.2.2"></a> -# NEWS for rsync 3.2.2 (UNRELEASED) +# NEWS for rsync 3.2.2 (4 Jul 2020) ## Changes in this version: @@ -4143,7 +4143,7 @@ | RELEASE DATE | VER. | DATE OF COMMIT\* | PROTOCOL | |--------------|--------|------------------|-------------| -| ?? Jul 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 | diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec index 56591d26..939e4647 100644 --- 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}pre3 -Release: 0.1.pre3 -%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 -* Tue Jun 30 2020 Wayne Davison <wa...@opencoder.net> -Released 3.2.2pre3. +* Sat Jul 04 2020 Wayne Davison <wa...@opencoder.net> +Released 3.2.2. * Fri Mar 21 2008 Wayne Davison <wa...@opencoder.net> Added installation of /etc/xinetd.d/rsync file and some commented-out diff --git a/packaging/pkglib.py b/packaging/pkglib.py index e0a3fe8c..b201bf77 100644 --- a/packaging/pkglib.py +++ b/packaging/pkglib.py @@ -217,7 +217,7 @@ def get_rsync_version(): 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 = { } @@ -233,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(): diff --git a/packaging/release-rsync b/packaging/release-rsync index 05ec577a..d1a3f590 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -60,7 +60,7 @@ def main(): 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 = curversion @@ -116,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: @@ -129,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: @@ -189,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) diff --git a/version.h b/version.h index 16b02f15..34fbda49 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define RSYNC_VERSION "3.2.2pre3" +#define RSYNC_VERSION "3.2.2" -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs