[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Sun Jan 16 03:16:18 UTC 2022
The branch, master has been updated
via d2cc1149 Get md-convert to output the release html files in the right dir.
via c3b553a9 Preparing for release of 3.2.4pre2
via eb0b4158 Use standard "git diff" for full diff highlighting support.
from 3c0bb7ff Even more man page improvements.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d2cc1149b3546b0e9103e03aa91c1bedd14579b4
Author: Wayne Davison <wayne at opencoder.net>
Date: Sat Jan 15 18:59:11 2022 -0800
Get md-convert to output the release html files in the right dir.
commit c3b553a93f7090bcbb89c08405f1a5f1c175c864
Author: Wayne Davison <wayne at opencoder.net>
Date: Sat Jan 15 17:21:01 2022 -0800
Preparing for release of 3.2.4pre2
commit eb0b41587c9ce3479685e339bd1f4bd864473c7b
Author: Wayne Davison <wayne at opencoder.net>
Date: Sat Jan 15 17:20:11 2022 -0800
Use standard "git diff" for full diff highlighting support.
-----------------------------------------------------------------------
Summary of changes:
access.c | 2 +-
acls.c | 2 +-
backup.c | 2 +-
clientname.c | 2 +-
clientserver.c | 2 +-
flist.c | 2 +-
generator.c | 2 +-
ifuncs.h | 2 +-
itypes.h | 2 +-
lib/sysxattrs.c | 2 +-
log.c | 2 +-
main.c | 2 +-
md-convert | 3 +++
packaging/lsb/rsync.spec | 8 ++++----
packaging/release-rsync | 4 ++--
progress.c | 2 +-
receiver.c | 2 +-
rsync.c | 2 +-
rsync.h | 2 +-
runtests.sh | 2 +-
sender.c | 2 +-
syscall.c | 2 +-
t_stub.c | 2 +-
testsuite/backup.test | 2 +-
testsuite/chmod-temp-dir.test | 2 +-
testsuite/chmod.test | 2 +-
testsuite/compare-dest.test | 2 +-
testsuite/delete.test | 2 +-
testsuite/exclude.test | 2 +-
testsuite/fuzzy.test | 2 +-
testsuite/itemize.test | 2 +-
testsuite/merge.test | 2 +-
testsuite/wildmatch.test | 2 +-
tls.c | 2 +-
token.c | 2 +-
util1.c | 2 +-
version.h | 2 +-
xattrs.c | 2 +-
38 files changed, 44 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/access.c b/access.c
index 0e076b2d..b6afce37 100644
--- a/access.c
+++ b/access.c
@@ -2,7 +2,7 @@
* Routines to authenticate access to a daemon (hosts allow/deny).
*
* Copyright (C) 1998 Andrew Tridgell
- * Copyright (C) 2004-2021 Wayne Davison
+ * Copyright (C) 2004-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/acls.c b/acls.c
index 5658274d..12e662cf 100644
--- a/acls.c
+++ b/acls.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2006-2021 Wayne Davison
+ * Copyright (C) 2006-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/backup.c b/backup.c
index 9d266ef4..686cb297 100644
--- a/backup.c
+++ b/backup.c
@@ -2,7 +2,7 @@
* Backup handling code.
*
* Copyright (C) 1999 Andrew Tridgell
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/clientname.c b/clientname.c
index e0f76203..ea94894b 100644
--- a/clientname.c
+++ b/clientname.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1992-2001 Andrew Tridgell <tridge at samba.org>
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2002-2021 Wayne Davison
+ * Copyright (C) 2002-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/clientserver.c b/clientserver.c
index 8852076b..8e30f99f 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge at samba.org>
* Copyright (C) 2001-2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2002-2021 Wayne Davison
+ * Copyright (C) 2002-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/flist.c b/flist.c
index 4f749bca..d72ba609 100644
--- a/flist.c
+++ b/flist.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2002-2021 Wayne Davison
+ * Copyright (C) 2002-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/generator.c b/generator.c
index 1abe036b..3a45b4bd 100644
--- a/generator.c
+++ b/generator.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/ifuncs.h b/ifuncs.h
index b5823b78..956fc22e 100644
--- a/ifuncs.h
+++ b/ifuncs.h
@@ -1,6 +1,6 @@
/* Inline functions for rsync.
*
- * Copyright (C) 2007-2021 Wayne Davison
+ * Copyright (C) 2007-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/itypes.h b/itypes.h
index 0e23c85b..0a7111f1 100644
--- a/itypes.h
+++ b/itypes.h
@@ -1,6 +1,6 @@
/* Inline functions for rsync.
*
- * Copyright (C) 2007-2021 Wayne Davison
+ * Copyright (C) 2007-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/sysxattrs.c b/lib/sysxattrs.c
index e747de37..ca08d131 100644
--- a/lib/sysxattrs.c
+++ b/lib/sysxattrs.c
@@ -2,7 +2,7 @@
* Extended attribute support for rsync.
*
* Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 2003-2020 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
* Written by Jay Fenlason.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/log.c b/log.c
index 6c50d0e0..44344e2a 100644
--- a/log.c
+++ b/log.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge at samba.org>
* Copyright (C) 2000-2001 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/main.c b/main.c
index 0378f3f3..31a28f51 100644
--- a/main.c
+++ b/main.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996-2001 Andrew Tridgell <tridge at samba.org>
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/md-convert b/md-convert
index f95f34b7..900fef16 100755
--- a/md-convert
+++ b/md-convert
@@ -172,6 +172,8 @@ def parse_md_file(mdfn):
if fi.want_manpage:
output_list += [ (fi.name, fi.man_out) ]
for fn, txt in output_list:
+ if args.dest and args.dest != '.':
+ fn = os.path.join(args.dest, fn)
if os.path.lexists(fn):
os.unlink(fn)
print("Wrote:", fn)
@@ -543,6 +545,7 @@ def die(*msg):
if __name__ == '__main__':
parser = argparse.ArgumentParser(description="Output html and (optionally) nroff for markdown pages.", add_help=False)
parser.add_argument('--test', action='store_true', help="Just test the parsing without outputting any files.")
+ parser.add_argument('--dest', metavar='DIR', help="Put files into DIR instead of the current directory.")
parser.add_argument('--debug', '-D', action='count', default=0, help='Output copious info on the html parsing. Repeat for even more.')
parser.add_argument("--help", "-h", action="help", help="Output this help message and exit.")
parser.add_argument("mdfiles", nargs='+', help="The source .md files to convert.")
diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec
index f6f9135d..d5c5354e 100644
--- a/packaging/lsb/rsync.spec
+++ b/packaging/lsb/rsync.spec
@@ -1,8 +1,8 @@
Summary: A fast, versatile, remote (and local) file-copying tool
Name: rsync
Version: 3.2.4
-%define fullversion %{version}pre1
-Release: 0.1.pre1
+%define fullversion %{version}pre2
+Release: 0.1.pre2
%define srcdir src-previews
Group: Applications/Internet
License: GPL
@@ -79,8 +79,8 @@ rm -rf $RPM_BUILD_ROOT
%dir /etc/rsync-ssl/certs
%changelog
-* Sun Jan 02 2022 Wayne Davison <wayne at opencoder.net>
-Released 3.2.4pre1.
+* Sat Jan 15 2022 Wayne Davison <wayne at opencoder.net>
+Released 3.2.4pre2.
* Fri Mar 21 2008 Wayne Davison <wayne at opencoder.net>
Added installation of /etc/xinetd.d/rsync file and some commented-out
diff --git a/packaging/release-rsync b/packaging/release-rsync
index 0ffc1095..78f1676f 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -230,7 +230,7 @@ About to:
cmd_chk(['packaging/year-tweak'])
print(dash_line)
- cmd_run("git diff --color | less -p '^diff .*'")
+ cmd_run("git diff")
srctar_name = f"{rsync_ver}.tar.gz"
pattar_name = f"rsync-patches-{version}.tar.gz"
@@ -341,7 +341,7 @@ About to:
md_files = 'README.md NEWS.md INSTALL.md'.split()
html_files = [ fn for fn in gen_pathnames if fn.endswith('.html') ]
cmd_chk(['rsync', '-a', *md_files, *html_files, dest])
- cmd_chk(["./md-convert"] + [ dest +'/'+ fn for fn in md_files ])
+ cmd_chk(["./md-convert", "--dest", dest, *md_files])
cmd_chk(f"git log --name-status | gzip -9 >{dest}/ChangeLog.gz")
diff --git a/progress.c b/progress.c
index 6af96b98..87207fbf 100644
--- a/progress.c
+++ b/progress.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2020 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/receiver.c b/receiver.c
index 48d31d8d..90e1685b 100644
--- a/receiver.c
+++ b/receiver.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/rsync.c b/rsync.c
index 2bcf8dc6..102e72ed 100644
--- a/rsync.c
+++ b/rsync.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/rsync.h b/rsync.h
index 5670d334..41a014c3 100644
--- a/rsync.h
+++ b/rsync.h
@@ -2,7 +2,7 @@
* Copyright (C) 1996, 2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/runtests.sh b/runtests.sh
index 5c204dc9..0c463bec 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,7 +1,7 @@
#! /bin/sh
# Copyright (C) 2001, 2002 by Martin Pool <mbp at samba.org>
-# Copyright (C) 2003-2021 Wayne Davison
+# Copyright (C) 2003-2022 Wayne Davison
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version
diff --git a/sender.c b/sender.c
index 837a83bd..92724c81 100644
--- a/sender.c
+++ b/sender.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/syscall.c b/syscall.c
index 390abb36..c037349b 100644
--- a/syscall.c
+++ b/syscall.c
@@ -4,7 +4,7 @@
*
* Copyright (C) 1998 Andrew Tridgell
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/t_stub.c b/t_stub.c
index e4816b8f..a9ce5848 100644
--- a/t_stub.c
+++ b/t_stub.c
@@ -3,7 +3,7 @@
* functions, so that module test harnesses can run standalone.
*
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/testsuite/backup.test b/testsuite/backup.test
index c479b460..4de38674 100644
--- a/testsuite/backup.test
+++ b/testsuite/backup.test
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2004-2021 Wayne Davison
+# Copyright (C) 2004-2022 Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
diff --git a/testsuite/chmod-temp-dir.test b/testsuite/chmod-temp-dir.test
index 3f0251ff..362d9d99 100644
--- a/testsuite/chmod-temp-dir.test
+++ b/testsuite/chmod-temp-dir.test
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2004-2021 Wayne Davison
+# Copyright (C) 2004-2022 Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
diff --git a/testsuite/chmod.test b/testsuite/chmod.test
index 6cc589c5..1646a9c8 100644
--- a/testsuite/chmod.test
+++ b/testsuite/chmod.test
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2004-2021 Wayne Davison
+# Copyright (C) 2004-2022 Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
diff --git a/testsuite/compare-dest.test b/testsuite/compare-dest.test
index ff2af33c..126daedd 100644
--- a/testsuite/compare-dest.test
+++ b/testsuite/compare-dest.test
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2004-2021 Wayne Davison
+# Copyright (C) 2004-2022 Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
diff --git a/testsuite/delete.test b/testsuite/delete.test
index c720bbcb..2a9df7c9 100644
--- a/testsuite/delete.test
+++ b/testsuite/delete.test
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2005-2021 Wayne Davison
+# Copyright (C) 2005-2022 Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
diff --git a/testsuite/exclude.test b/testsuite/exclude.test
index ef4ba355..4b1a1a05 100644
--- a/testsuite/exclude.test
+++ b/testsuite/exclude.test
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2003-2021 Wayne Davison
+# Copyright (C) 2003-2022 Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
diff --git a/testsuite/fuzzy.test b/testsuite/fuzzy.test
index f8372aa3..101ffd3c 100644
--- a/testsuite/fuzzy.test
+++ b/testsuite/fuzzy.test
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2005-2021 Wayne Davison
+# Copyright (C) 2005-2022 Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index 1b66d2d7..7c29f696 100644
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2005-2021 Wayne Davison
+# Copyright (C) 2005-2022 Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
diff --git a/testsuite/merge.test b/testsuite/merge.test
index 7fccc40d..17050a1d 100644
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2004-2021 Wayne Davison
+# Copyright (C) 2004-2022 Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
diff --git a/testsuite/wildmatch.test b/testsuite/wildmatch.test
index 6673364c..cfe75841 100644
--- a/testsuite/wildmatch.test
+++ b/testsuite/wildmatch.test
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2003-2021 Wayne Davison
+# Copyright (C) 2003-2022 Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).
diff --git a/tls.c b/tls.c
index 0ddb579d..e6b0708a 100644
--- a/tls.c
+++ b/tls.c
@@ -2,7 +2,7 @@
* Trivial ls for comparing two directories after running an rsync.
*
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/token.c b/token.c
index d65869d4..c108b3af 100644
--- a/token.c
+++ b/token.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/util1.c b/util1.c
index a9e0fd24..fa334329 100644
--- a/util1.c
+++ b/util1.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2021 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/version.h b/version.h
index 4f6a2cfd..191dbf03 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define RSYNC_VERSION "3.2.4pre1"
+#define RSYNC_VERSION "3.2.4pre2"
diff --git a/xattrs.c b/xattrs.c
index e7d98660..1f2bfacd 100644
--- a/xattrs.c
+++ b/xattrs.c
@@ -3,7 +3,7 @@
* Written by Jay Fenlason, vaguely based on the ACLs patch.
*
--
The rsync repository.
More information about the rsync-cvs
mailing list