[SCM] The rsync repository. - branch master updated
The branch, master has been updated
via 4c4fce51 Add some comments about protocol versions.
via 6816b313 Simplify where version.h is included.
from e94bad1c Preparing for release of 3.2.3
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -
commit 4c4fce51072c9189cfb11b52aa54fed79f5741bd
Author: Wayne Davison
Date: Fri Aug 7 16:20:48 2020 -0700
Add some comments about protocol versions.
commit 6816b3137899f8cceb2ec0ba8dc27ae9a270fe7b
Author: Wayne Davison
Date: Thu Aug 6 21:10:46 2020 -0700
Simplify where version.h is included.
---
Summary of changes:
Makefile.in | 4 ++--
rsync.h | 19 ++-
usage.c | 1 +
3 files changed, 17 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index d935651a..2b55d9f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ ASM_x86_64=lib/md5-asm-x86_64.o
GENFILES=configure.sh aclocal.m4 config.h.in 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 version.h
+ lib/pool_alloc.h lib/mdigest.h lib/md-defines.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 \
@@ -99,7 +99,7 @@ rsync$(EXEEXT): $(OBJS)
$(OBJS): $(HEADERS)
$(CHECK_OBJS): $(HEADERS)
tls.o xattrs.o: lib/sysxattrs.h
-usage.o: latest-year.h help-rsync.h help-rsyncd.h git-version.h
default-cvsignore.h
+usage.o: version.h latest-year.h help-rsync.h help-rsyncd.h git-version.h
default-cvsignore.h
loadparm.o: default-dont-compress.h daemon-parm.h
flist.o: rounding.h
diff --git a/rsync.h b/rsync.h
index 0f5304ee..345a68a6 100644
--- a/rsync.h
+++ b/rsync.h
@@ -108,12 +108,22 @@
#define BITS_EQUAL(b1,b2,mask) (((unsigned)(b1) & (unsigned)(mask)) \
== ((unsigned)(b2) & (unsigned)(mask)))
-/* update this if you make incompatible changes */
+/* Update this if you make incompatible changes and ALSO update the
+ * SUBPROTOCOL_VERSION if it is not a final (offical) release. */
#define PROTOCOL_VERSION 31
-/* This is used when working on a new protocol version in CVS, and should
- * be a new non-zero value for each CVS change that affects the protocol.
- * It must ALWAYS be 0 when the protocol goes final (and NEVER before)! */
+/* This is used when working on a new protocol version or for any unofficial
+ * protocol tweaks. It should be a non-zero value for each pre-release repo
+ * change that affects the protocol. The official pre-release versions should
+ * start with 1 (after incrementing the PROTOCOL_VERSION) and go up by 1 for
+ * each new protocol change. For unofficial changes, pick a fairly large
+ * random number that will hopefully not collide with anyone else's unofficial
+ * protocol. It must ALWAYS be 0 when the protocol goes final (and official)
+ * and NEVER before! When rsync negotiates a protocol match, it will only
+ * allow the newest protocol to be used if the SUBPROTOCOL_VERSION matches.
+ * All older protocol versions MUST be compatible with the final, official
+ * release of the protocol, so don't tweak the code to change the protocol
+ * behavior for an older protocol version. */
#define SUBPROTOCOL_VERSION 0
/* We refuse to interoperate with versions that are not in this range.
@@ -300,7 +310,6 @@ enum delret {
#include "errcode.h"
#include "config.h"
-#include "version.h"
/* The default RSYNC_RSH is always set in config.h. */
diff --git a/usage.c b/usage.c
index 66857bb4..2b5f3761 100644
--- a/usage.c
+++ b/usage.c
@@ -18,6 +18,7 @@
*/
#include "rsync.h"
+#include "version.h"
#include "latest-year.h"
#include "git-version.h"
#include "default-cvsignore.h"
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
Re: Rsync 3.2.3 released
On Thu, Aug 6, 2020 at 10:46 PM Rupert Gallagher wrote: > I noted that rsync writes a gmon file on the source path and leaves it > there when it terminates. Nope, it doesn't. You'll need to figure out what's going on with your setup. Also, I have 12GB of cache in ecc ram that rsync is not using. > It uses whatever memory it needs plus whatever filesystem caching your OS provides. ..wayne.. -- Please use reply-all for most replies to avoid omitting the mailing list. To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
Re: Rsync 3.2.3 released
On Thu, Aug 6, 2020 at 11:48 PM Michal Ruprich wrote: > I see that a couple of patches from the rsync-patches tar have > disappeared, like acls.diff or xattrs.diff yet I don't see the changes in > the code. Is there a reason for their removal? > Various things were removed that had limited value or were something that had no chance of ever being merged. The acls & xattrs diffs were never needed for any released rsync, but some distros may want to keep applying their own version of the patches if they think they have pre-3.0.0 rsyncs hanging around that have pre-release xattrs/acls support (so after 12 years I'll let them deal with any remaining effects of their distributing pre-release patches). I'll probably be removing some more patches soon as I weed through them. One example of something that will probably go away is the source-filter_dest-filter.diff -- it's marked as being very dangerous and thus never something that would go in an official release (so it would be horrible if someone ignored the cautions and distributed an rsync with that applied). ..wayne.. -- Please use reply-all for most replies to avoid omitting the mailing list. To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
Re: Rsync 3.2.3 released
Hi Wayne, I see that a couple of patches from the rsync-patches tar have disappeared, like acls.diff or xattrs.diff yet I don't see the changes in the code. Is there a reason for their removal? Were they applied differently on the code and are no longer needed? Thanks for any info on this. Regards, Michal Ruprich On 8/7/20 7:45 AM, Rupert Gallagher via rsync wrote: > Rsync 3.2.2 ransfer rate on my pet hardware is really poor, so every > improvement counts. > > I noted that rsync writes a gmon file on the source path and leaves it > there when it terminates. When the source path is read-only, rsync > complains that it cannot write in it. For optimal use of the input > bus, no write commands should be used there. Can you look into it? > > Also, I have 12GB of cache in ecc ram that rsync is not using. I can > tell because I see frantic io from the leds of the disks when rsync is > the only running process. Can you add an option to maximise the use of > ram cache? > > Thank you! > > > Original Message > On 7 Aug 2020, 07:15, Wayne Davison via rsync < rsync@lists.samba.org> > wrote: > I have released rsync 3.2.3. It contains a smattering of bug fixes > and various enhancements. > > To see a summary of all the recent changes, visit this link: > > https://rsync.samba.org/ < href=>ftp/rsync/NEWS#3.2.3">https://rsync.samba.org/ftp/rsync/NEWS#3.2.3 > > You can download the source tar file and its signature from here: > > https://rsync.samba.org/ < href=>ftp/rsync/rsync-3.2.3.tar.gz">https://rsync.samba.org/ftp/rsync/rsync-3.2.3.tar.gz > https://rsync.samba.org/ < href=>ftp/rsync/rsync-3.2.3.tar.gz">https://rsync.samba.org/ftp/rsync/rsync-3.2.3.tar.gz.asc > > See the website for other downloads, including diffs, patches, etc.: > > https://rsync.samba.org/ > > See also rsync on github: > > https://github.com/WayneD/rsync > > ..wayne.. > -- Please use reply-all for most replies to avoid omitting the mailing list. To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
