Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/rsync rsync: updated to 3.2.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/b8860c8c5a2a
branches: trunk
changeset: 435389:b8860c8c5a2a
user: adam <adam%pkgsrc.org@localhost>
date: Tue Jul 07 06:54:03 2020 +0000
description:
rsync: updated to 3.2.2
NEWS for rsync 3.2.2
BUG FIXES:
- Avoid a crash when a daemon module enables `transfer logging` without
setting a `log format` value.
- Fixed installing rsync-ssl script from an alternate build dir.
- Fixed the updating of configure.sh from an alternate build dir.
- Apple requires the asm function name to begin with an underscore.
- Avoid a test failure in the daemon test when --atimes is disabled.
ENHANCEMENTS:
- Allow the server side to restrict checksum & compression choices via the
same environment variables the client uses. The env vars can be divided
into "client list & server list" by the "`&`" char or the same list can
apply to both.
- Simplify how the negotiation environment variables apply when interacting
with an older rsync and also when a list contains only invalid names.
- Do not allow a negotiated checksum or compression choice of "none" unless
the user authorized it via an environment variable or command-line option.
- Added the `--max-alloc=SIZE` option to be able to override the memory
allocator's sanity-check limit. It defaults to 1G (as before) but the error
message when exceeding it specifically mentions the new option so that you
can differentiate an out-of-memory error from a failure of this limit. It
also allows you to specify the value via the RSYNC_MAX_ALLOC environment
variable.
- Add the "open atime" daemon parameter to allow a daemon to always enable or
disable the use of O_NOATIME (the default is to let the user control it).
- The default systemd config was changed to remove the `ProtectHome=on`
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
code and added some missing sanity-checking of allocations.
- Put optimizations into their own list in the `--version` output.
- Improved the man page a bit more.
PACKAGING RELATED:
- Prepared the checksum code for an upcoming xxHash release that provides new
XXH3 (64-bit) & XXH128 (128-bit) checksum routines. These will not be
compiled into rsync until the xxhash v0.8.0 include files are installed on
the build host, and that release is a few weeks away at the time this was
written. So, if it's now the future and you have packaged and installed
xxhash-0.8.0-devel, a fresh rebuild of rsync 3.2.2 will give you the new
checksum routines. Just make sure that the new rsync package depends on
xxhash >= 0.8.0.
DEVELOPER RELATED:
- Moved the version number out of configure.ac into its own version.h file so
that we don't need to reconfigure just because the version number changes.
- Moved the daemon parameter list into daemon-parm.txt so that an awk script
can create the interrelated structs and accessors that loadparm.c needs.
diffstat:
net/rsync/Makefile | 4 ++--
net/rsync/distinfo | 14 +++++++-------
net/rsync/patches/patch-Makefile.in | 18 +++++++++---------
net/rsync/patches/patch-authenticate.c | 10 +++++-----
4 files changed, 23 insertions(+), 23 deletions(-)
diffs (105 lines):
diff -r cafc9e93bda2 -r b8860c8c5a2a net/rsync/Makefile
--- a/net/rsync/Makefile Tue Jul 07 06:52:33 2020 +0000
+++ b/net/rsync/Makefile Tue Jul 07 06:54:03 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.113 2020/06/30 11:56:14 adam Exp $
+# $NetBSD: Makefile,v 1.114 2020/07/07 06:54:03 adam Exp $
-DISTNAME= rsync-3.2.1
+DISTNAME= rsync-3.2.2
CATEGORIES= net
MASTER_SITES= http://rsync.samba.org/ftp/rsync/
MASTER_SITES+= http://rsync.samba.org/ftp/rsync/old-versions/
diff -r cafc9e93bda2 -r b8860c8c5a2a net/rsync/distinfo
--- a/net/rsync/distinfo Tue Jul 07 06:52:33 2020 +0000
+++ b/net/rsync/distinfo Tue Jul 07 06:54:03 2020 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.49 2020/06/30 11:56:14 adam Exp $
+$NetBSD: distinfo,v 1.50 2020/07/07 06:54:03 adam Exp $
-SHA1 (rsync-3.2.1.tar.gz) = b00af97012cf1cb4b567e28e89c6365a651a24c9
-RMD160 (rsync-3.2.1.tar.gz) = 5e766682e2d2ea1194cf8cb13d21caa81d3a87ba
-SHA512 (rsync-3.2.1.tar.gz) = 80d639ab56a993de8016115fe15794bb9aa7012e4a8300402954760566a821c230af9dcdb19143d70663497a830289212ce329fb0c4fd5c4b6f392d850e5fd8c
-Size (rsync-3.2.1.tar.gz) = 1051665 bytes
-SHA1 (patch-Makefile.in) = 45e47fc610428a26542abf2b0657aeaa22c27794
-SHA1 (patch-authenticate.c) = 0612fb141cea1509b882df78f1b90fa52b1092b0
+SHA1 (rsync-3.2.2.tar.gz) = f73d49bcac52016894a29339701d390fe1a9aac9
+RMD160 (rsync-3.2.2.tar.gz) = 0de1f851925437e08d794db341189ead54e36620
+SHA512 (rsync-3.2.2.tar.gz) = 78107cf423e9259a7f7e9bf5527a956b648107aba72ea88b4267ae6334539342501d3c060efbc87235563b0253a12c382c4bb1f73335e68a62ff53aa905f9169
+Size (rsync-3.2.2.tar.gz) = 1057001 bytes
+SHA1 (patch-Makefile.in) = 8c2f80302ad504a40381c4c4e9396a1fd259e13f
+SHA1 (patch-authenticate.c) = 39b60b2a0742c8b161c2923f89828bd604aa7e83
diff -r cafc9e93bda2 -r b8860c8c5a2a net/rsync/patches/patch-Makefile.in
--- a/net/rsync/patches/patch-Makefile.in Tue Jul 07 06:52:33 2020 +0000
+++ b/net/rsync/patches/patch-Makefile.in Tue Jul 07 06:54:03 2020 +0000
@@ -1,18 +1,18 @@
-$NetBSD: patch-Makefile.in,v 1.3 2020/06/30 11:56:14 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2020/07/07 06:54:03 adam Exp $
https://bugzilla.samba.org/show_bug.cgi?id=11594
Fix installation.
---- Makefile.in.orig 2020-06-21 19:55:24.000000000 +0000
+--- Makefile.in.orig 2020-07-01 02:30:28.000000000 +0000
+++ Makefile.in
-@@ -76,13 +76,13 @@ all: Makefile rsync$(EXEEXT) stunnel-rsy
+@@ -73,13 +73,13 @@ all: Makefile rsync$(EXEEXT) stunnel-rsy
.PHONY: install
install: all
-${MKDIR_P} ${DESTDIR}${bindir}
- ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
-- ${INSTALLCMD} -m 755 rsync-ssl ${DESTDIR}${bindir}
+- ${INSTALLCMD} -m 755 $(srcdir)/rsync-ssl ${DESTDIR}${bindir}
+ ${BSD_INSTALL_PROGRAM} rsync$(EXEEXT) ${DESTDIR}${bindir}
-+ ${BSD_INSTALL_SCRIPT} rsync-ssl ${DESTDIR}${bindir}
++ ${BSD_INSTALL_SCRIPT} $(srcdir)/rsync-ssl ${DESTDIR}${bindir}
-${MKDIR_P} ${DESTDIR}${mandir}/man1
-${MKDIR_P} ${DESTDIR}${mandir}/man5
- if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi
@@ -24,12 +24,12 @@
install-ssl-daemon: stunnel-rsyncd.conf
-${MKDIR_P} ${DESTDIR}/etc/stunnel
-@@ -227,7 +227,7 @@ proto: proto.h-tstamp
+@@ -231,7 +231,7 @@ proto: proto.h-tstamp
proto.h: proto.h-tstamp
@if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi
--proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
-+proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c
- $(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c
+-proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h daemon-parm.h
++proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
+ $(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c daemon-parm.h
.PHONY: man
diff -r cafc9e93bda2 -r b8860c8c5a2a net/rsync/patches/patch-authenticate.c
--- a/net/rsync/patches/patch-authenticate.c Tue Jul 07 06:52:33 2020 +0000
+++ b/net/rsync/patches/patch-authenticate.c Tue Jul 07 06:54:03 2020 +0000
@@ -1,21 +1,21 @@
-$NetBSD: patch-authenticate.c,v 1.3 2017/11/10 06:59:16 spz Exp $
+$NetBSD: patch-authenticate.c,v 1.4 2020/07/07 06:54:03 adam Exp $
3.1.2 is not vulnerable to CVE-2017-15994, the code is different,
but not allowing fallback to MD4 for passwords is a good idea by now.
Patch from
https://git.samba.org/?p=rsync.git;a=blobdiff;f=authenticate.c;h=a106b0f60a8cb88e37080bc5e2a58ce28c66f379;hp=d60ee20b6b53a9351efbdf175f36525ead220de6;hb=9a480deec4d20277d8e20bc55515ef0640ca1e55;hpb=c252546ceeb0925eb8a4061315e3ff0a8c55b48b
---- authenticate.c.orig 2015-08-24 18:54:00.000000000 +0000
+--- authenticate.c.orig 2020-06-26 03:54:21.000000000 +0000
+++ authenticate.c
-@@ -22,6 +22,7 @@
- #include "itypes.h"
+@@ -23,6 +23,7 @@
+ #include "ifuncs.h"
extern int read_only;
+extern int protocol_version;
extern char *password_file;
/***************************************************************************
-@@ -237,6 +238,11 @@ char *auth_server(int f_in, int f_out, i
+@@ -238,6 +239,11 @@ char *auth_server(int f_in, int f_out, i
if (!users || !*users)
return "";
Home |
Main Index |
Thread Index |
Old Index