Received: by mail.netbsd.org (Postfix, from userid 605) id 5B87484D54; Mon, 29 Jan 2018 11:33:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AC66784D4A for ; Mon, 29 Jan 2018 11:33:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id IN68uVfIdLyn for ; Mon, 29 Jan 2018 11:33:00 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E888C84CD8 for ; Mon, 29 Jan 2018 11:32:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DCA75FBDE; Mon, 29 Jan 2018 11:32:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1517225579141100" MIME-Version: 1.0 Date: Mon, 29 Jan 2018 11:32:59 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/net/rsync To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180129113259.DCA75FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1517225579141100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Jan 29 11:32:59 UTC 2018 Modified Files: pkgsrc/net/rsync: Makefile distinfo pkgsrc/net/rsync/patches: patch-Makefile.in Removed Files: pkgsrc/net/rsync/patches: patch-ab patch-options.c patch-receiver.c patch-rsync.c patch-xattrs.c Log Message: rsync: updated to 3.1.3 Changes since 3.1.2: SECURITY FIXES: - Fixed a buffer overrun in the protocol's handling of xattr names and ensure that the received name is null terminated. - Fix an issue with --protect-args where the user could specify the arg in the protected-arg list and short-circuit some of the arg-sanitizing code. BUG FIXES: - Don't output about a new backup dir without appropriate info verbosity. - Fixed some issues with the sort functions in support/rsyncstats script. - Added a way to specify daemon config lists (e.g. users, groups, etc) that contain spaces (see "auth users" in the latest rsyncd.conf manpage). - If a backup fails (e.g. full disk) rsync exits with an error. - Fixed a problem with a doubled --fuzzy option combined with --link-dest. - Avoid invalid output in the summary if either the start or end time had an error. - We don't allow a popt alias to affect the --daemon or --server options. - Fix daemon exclude code to disallow attribute changes in addition to disallowing transfers. - Don't force nanoseconds to match if a non-transferred, non-checksummed file only passed the quick-check w/o comparing nanosecods. ENHANCEMENTS: - Added the ability for rsync to compare nanosecond times in its file-check comparisons, and added support nanosecond times on Mac OS X. - Added a short-option (-@) for --modify-window. - Added the --checksum-choice=NAME[,NAME] option to choose the checksum algorithms. - Added hashing of xattr names (with using -X) to improve the handling of files with large numbers of xattrs. - Added a way to filter xattr names using include/exclude/filter rules (see the --xattrs option in the manpage for details). - Added "daemon chroot|uid|gid" to the daemon config (in addition to the old chroot|uid|gid settings that affect the daemon's transfer process). - Added "syslog tag" to the daemon configuration. - Some manpage improvements. DEVELOPER RELATED: - Tweak the "make" output when yodl isn't around to create the man pages. - Changed an obsolete autoconf compile macro. - Support newer yodl versions when converting man pages. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 pkgsrc/net/rsync/Makefile cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/rsync/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/rsync/patches/patch-Makefile.in cvs rdiff -u -r1.16 -r0 pkgsrc/net/rsync/patches/patch-ab cvs rdiff -u -r1.1 -r0 pkgsrc/net/rsync/patches/patch-options.c \ pkgsrc/net/rsync/patches/patch-receiver.c \ pkgsrc/net/rsync/patches/patch-rsync.c \ pkgsrc/net/rsync/patches/patch-xattrs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1517225579141100 Content-Disposition: inline Content-Length: 3843 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/rsync/Makefile diff -u pkgsrc/net/rsync/Makefile:1.107 pkgsrc/net/rsync/Makefile:1.108 --- pkgsrc/net/rsync/Makefile:1.107 Sat Jan 27 04:21:18 2018 +++ pkgsrc/net/rsync/Makefile Mon Jan 29 11:32:59 2018 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.107 2018/01/27 04:21:18 snj Exp $ +# $NetBSD: Makefile,v 1.108 2018/01/29 11:32:59 adam Exp $ -DISTNAME= rsync-3.1.2 -PKGREVISION= 3 +DISTNAME= rsync-3.1.3 CATEGORIES= net MASTER_SITES= http://rsync.samba.org/ftp/rsync/ MASTER_SITES+= http://rsync.samba.org/ftp/rsync/old-versions/ Index: pkgsrc/net/rsync/distinfo diff -u pkgsrc/net/rsync/distinfo:1.47 pkgsrc/net/rsync/distinfo:1.48 --- pkgsrc/net/rsync/distinfo:1.47 Sat Jan 27 04:21:18 2018 +++ pkgsrc/net/rsync/distinfo Mon Jan 29 11:32:59 2018 @@ -1,13 +1,8 @@ -$NetBSD: distinfo,v 1.47 2018/01/27 04:21:18 snj Exp $ +$NetBSD: distinfo,v 1.48 2018/01/29 11:32:59 adam Exp $ -SHA1 (rsync-3.1.2.tar.gz) = 0d4c7fb7fe3fc80eeff922a7c1d81df11dbb8a1a -RMD160 (rsync-3.1.2.tar.gz) = f7d6c0c9752af8d9eb933cffc6032c1763490a04 -SHA512 (rsync-3.1.2.tar.gz) = 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b -Size (rsync-3.1.2.tar.gz) = 892724 bytes -SHA1 (patch-Makefile.in) = df3479e93de86524a391433a3d6e6108a797835a -SHA1 (patch-ab) = 98aa07a50314e3309b48f803d6febb1138eae1f2 +SHA1 (rsync-3.1.3.tar.gz) = 82e7829c0b3cefbd33c233005341e2073c425629 +RMD160 (rsync-3.1.3.tar.gz) = 95a040e0c32e09d01f37fc7d2defd2c41a184db6 +SHA512 (rsync-3.1.3.tar.gz) = 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 +Size (rsync-3.1.3.tar.gz) = 905908 bytes +SHA1 (patch-Makefile.in) = 14d261cc65d00864bfb0acdba1d5a8bdf989c288 SHA1 (patch-authenticate.c) = 0612fb141cea1509b882df78f1b90fa52b1092b0 -SHA1 (patch-options.c) = f5c163f457bf108cd9646d09f1253583326cc000 -SHA1 (patch-receiver.c) = 5bf0b7ceaaf79e0fd5f93e1c433162e9248fe37c -SHA1 (patch-rsync.c) = e390038a9592d9bc3e77ebc2aabfa62bdd6778b3 -SHA1 (patch-xattrs.c) = 9883ea79a60c786dd5a3dc74f4872621823c9377 Index: pkgsrc/net/rsync/patches/patch-Makefile.in diff -u pkgsrc/net/rsync/patches/patch-Makefile.in:1.1 pkgsrc/net/rsync/patches/patch-Makefile.in:1.2 --- pkgsrc/net/rsync/patches/patch-Makefile.in:1.1 Fri Nov 13 13:41:39 2015 +++ pkgsrc/net/rsync/patches/patch-Makefile.in Mon Jan 29 11:32:59 2018 @@ -1,10 +1,27 @@ -$NetBSD: patch-Makefile.in,v 1.1 2015/11/13 13:41:39 wiz Exp $ +$NetBSD: patch-Makefile.in,v 1.2 2018/01/29 11:32:59 adam Exp $ https://bugzilla.samba.org/show_bug.cgi?id=11594 +Fix installation. ---- Makefile.in.orig 2013-06-15 23:40:10.000000000 +0000 +--- Makefile.in.orig 2016-07-20 15:34:26.000000000 +0000 +++ Makefile.in -@@ -205,7 +205,7 @@ proto: proto.h-tstamp +@@ -66,12 +66,9 @@ CHECK_OBJS=tls.o testrun.o getgroups.o g + all: Makefile rsync$(EXEEXT) rsync-ssl stunnel-rsync stunnel-rsyncd.conf @MAKE_MAN@ + + install: all +- -${MKDIR_P} ${DESTDIR}${bindir} +- ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${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 +- if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi ++ ${BSD_INSTALL_PROGRAM} rsync$(EXEEXT) ${DESTDIR}${bindir} ++ if test -f rsync.1; then ${BSD_INSTALL_MAN} rsync.1 ${DESTDIR}${mandir}/man1; fi ++ if test -f rsyncd.conf.5; then ${BSD_INSTALL_MAN} rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi + + install-ssl-client: rsync-ssl stunnel-rsync + -${MKDIR_P} ${DESTDIR}${bindir} +@@ -209,7 +206,7 @@ proto: proto.h-tstamp proto.h: proto.h-tstamp @if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi --_----------=_1517225579141100--