The branch, master has been updated
via def595c5 Remove useless comment.
via 68b1ce1d Only run git describe if .git exists in the $srcdir.
via 5a4116e5 Start 3.2.6dev going.
from 024bf1d8 Do more path cleaning in add_implied_include(); make
u.slash_cnt more accurate.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit def595c55960504328b5bfa45c08c42a90382076
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Aug 15 21:56:37 2022 -0700
Remove useless comment.
commit 68b1ce1dc3605a8b79594ba5e8e29577ea6dc42c
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Aug 15 21:52:13 2022 -0700
Only run git describe if .git exists in the $srcdir.
commit 5a4116e553551ed314eea4bc85db8f54fd5fd03b
Author: Wayne Davison <wa...@opencoder.net>
Date: Mon Aug 15 19:01:56 2022 -0700
Start 3.2.6dev going.
-----------------------------------------------------------------------
Summary of changes:
NEWS.md | 15 +++++++++++++++
exclude.c | 2 +-
mkgitver | 5 ++++-
version.h | 2 +-
4 files changed, 21 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS.md b/NEWS.md
index e32600c5..8b9624a2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,17 @@
+# NEWS for rsync 3.2.6 (UNRELEASED)
+
+## Changes in this version:
+
+### BUG FIXES:
+
+- More path-cleaning in the file-list verification code to handle some rejected
+ args.
+
+- Fixed a bug in the internal MD4 checksum code that could cause the digest
+ to be incorrect part of the time (the openssl version was/is fine).
+
+------------------------------------------------------------------------------
+
# NEWS for rsync 3.2.5 (14 Aug 2022)
## Changes in this version:
@@ -4541,6 +4555,7 @@
| RELEASE DATE | VER. | DATE OF COMMIT\* | PROTOCOL |
|--------------|--------|------------------|-------------|
+| ?? Dec 2022 | 3.2.6 | | 31 |
| 14 Aug 2022 | 3.2.5 | | 31 |
| 15 Apr 2022 | 3.2.4 | | 31 |
| 06 Aug 2020 | 3.2.3 | | 31 |
diff --git a/exclude.c b/exclude.c
index 296d69df..730d04ef 100644
--- a/exclude.c
+++ b/exclude.c
@@ -372,7 +372,7 @@ void free_implied_include_partial_string()
void add_implied_include(const char *arg, int skip_daemon_module)
{
int arg_len, saw_wild = 0, saw_live_open_brkt = 0, backslash_cnt = 0;
- int slash_cnt = 0; /* We know we're adding a leading slash. */
+ int slash_cnt = 0;
const char *cp;
char *p;
if (trust_sender_args)
diff --git a/mkgitver b/mkgitver
index 49aa150b..43156c65 100755
--- a/mkgitver
+++ b/mkgitver
@@ -1,7 +1,10 @@
#!/bin/sh
srcdir=`dirname $0`
-gitver=`git describe --abbrev=8 2>/dev/null`
+
+if [ -e "$srcdir/.git" ]; then
+ gitver=`git describe --abbrev=8 2>/dev/null`
+fi
if [ ! -f git-version.h ]; then
touch git-version.h
diff --git a/version.h b/version.h
index 82aa78f2..fac4fa4b 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
-#define RSYNC_VERSION "3.2.5"
+#define RSYNC_VERSION "3.2.6dev"
#define MAINTAINER_TZ_OFFSET -7.0
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
