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.diff -r1.107 -r1.108 pkgsrc/net/rsync/Makefile
(adam)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.107 2018/01/27 04:21:18 snj Exp $ | 1 | # $NetBSD: Makefile,v 1.108 2018/01/29 11:32:59 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= rsync-3.1.2 | 3 | DISTNAME= rsync-3.1.3 | |
4 | PKGREVISION= 3 | |||
5 | CATEGORIES= net | 4 | CATEGORIES= net | |
6 | MASTER_SITES= http://rsync.samba.org/ftp/rsync/ | 5 | MASTER_SITES= http://rsync.samba.org/ftp/rsync/ | |
7 | MASTER_SITES+= http://rsync.samba.org/ftp/rsync/old-versions/ | 6 | MASTER_SITES+= http://rsync.samba.org/ftp/rsync/old-versions/ | |
8 | MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/network/rsync/ | 7 | MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/network/rsync/ | |
9 | 8 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://rsync.samba.org/ | 10 | HOMEPAGE= http://rsync.samba.org/ | |
12 | COMMENT= Network file distribution/synchronisation utility | 11 | COMMENT= Network file distribution/synchronisation utility | |
13 | LICENSE= gnu-gpl-v3 | 12 | LICENSE= gnu-gpl-v3 | |
14 | 13 | |||
15 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/doc/rsync | 14 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/doc/rsync | |
16 | 15 | |||
17 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes |
@@ -1,13 +1,8 @@ | @@ -1,13 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.47 2018/01/27 04:21:18 snj Exp $ | 1 | $NetBSD: distinfo,v 1.48 2018/01/29 11:32:59 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (rsync-3.1.2.tar.gz) = 0d4c7fb7fe3fc80eeff922a7c1d81df11dbb8a1a | 3 | SHA1 (rsync-3.1.3.tar.gz) = 82e7829c0b3cefbd33c233005341e2073c425629 | |
4 | RMD160 (rsync-3.1.2.tar.gz) = f7d6c0c9752af8d9eb933cffc6032c1763490a04 | 4 | RMD160 (rsync-3.1.3.tar.gz) = 95a040e0c32e09d01f37fc7d2defd2c41a184db6 | |
5 | SHA512 (rsync-3.1.2.tar.gz) = 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b | 5 | SHA512 (rsync-3.1.3.tar.gz) = 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 | |
6 | Size (rsync-3.1.2.tar.gz) = 892724 bytes | 6 | Size (rsync-3.1.3.tar.gz) = 905908 bytes | |
7 | SHA1 (patch-Makefile.in) = df3479e93de86524a391433a3d6e6108a797835a | 7 | SHA1 (patch-Makefile.in) = 14d261cc65d00864bfb0acdba1d5a8bdf989c288 | |
8 | SHA1 (patch-ab) = 98aa07a50314e3309b48f803d6febb1138eae1f2 | |||
9 | SHA1 (patch-authenticate.c) = 0612fb141cea1509b882df78f1b90fa52b1092b0 | 8 | SHA1 (patch-authenticate.c) = 0612fb141cea1509b882df78f1b90fa52b1092b0 | |
10 | SHA1 (patch-options.c) = f5c163f457bf108cd9646d09f1253583326cc000 | |||
11 | SHA1 (patch-receiver.c) = 5bf0b7ceaaf79e0fd5f93e1c433162e9248fe37c | |||
12 | SHA1 (patch-rsync.c) = e390038a9592d9bc3e77ebc2aabfa62bdd6778b3 | |||
13 | SHA1 (patch-xattrs.c) = 9883ea79a60c786dd5a3dc74f4872621823c9377 |
@@ -1,15 +1,32 @@ | @@ -1,15 +1,32 @@ | |||
1 | $NetBSD: patch-Makefile.in,v 1.1 2015/11/13 13:41:39 wiz Exp $ | 1 | $NetBSD: patch-Makefile.in,v 1.2 2018/01/29 11:32:59 adam Exp $ | |
2 | 2 | |||
3 | https://bugzilla.samba.org/show_bug.cgi?id=11594 | 3 | https://bugzilla.samba.org/show_bug.cgi?id=11594 | |
4 | Fix installation. | |||
4 | 5 | |||
5 | --- Makefile.in.orig 2013-06-15 23:40:10.000000000 +0000 | 6 | --- Makefile.in.orig 2016-07-20 15:34:26.000000000 +0000 | |
6 | +++ Makefile.in | 7 | +++ Makefile.in | |
7 | @@ -205,7 +205,7 @@ proto: proto.h-tstamp | 8 | @@ -66,12 +66,9 @@ CHECK_OBJS=tls.o testrun.o getgroups.o g | |
9 | all: Makefile rsync$(EXEEXT) rsync-ssl stunnel-rsync stunnel-rsyncd.conf @MAKE_MAN@ | |||
10 | ||||
11 | install: all | |||
12 | - -${MKDIR_P} ${DESTDIR}${bindir} | |||
13 | - ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir} | |||
14 | - -${MKDIR_P} ${DESTDIR}${mandir}/man1 | |||
15 | - -${MKDIR_P} ${DESTDIR}${mandir}/man5 | |||
16 | - if test -f rsync.1; then ${INSTALLMAN} -m 644 rsync.1 ${DESTDIR}${mandir}/man1; fi | |||
17 | - if test -f rsyncd.conf.5; then ${INSTALLMAN} -m 644 rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi | |||
18 | + ${BSD_INSTALL_PROGRAM} rsync$(EXEEXT) ${DESTDIR}${bindir} | |||
19 | + if test -f rsync.1; then ${BSD_INSTALL_MAN} rsync.1 ${DESTDIR}${mandir}/man1; fi | |||
20 | + if test -f rsyncd.conf.5; then ${BSD_INSTALL_MAN} rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi | |||
21 | ||||
22 | install-ssl-client: rsync-ssl stunnel-rsync | |||
23 | -${MKDIR_P} ${DESTDIR}${bindir} | |||
24 | @@ -209,7 +206,7 @@ proto: proto.h-tstamp | |||
8 | proto.h: proto.h-tstamp | 25 | proto.h: proto.h-tstamp | |
9 | @if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi | 26 | @if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi | |
10 | 27 | |||
11 | -proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h | 28 | -proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h | |
12 | +proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c | 29 | +proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c | |
13 | perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c | 30 | perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c | |
14 | 31 | |||
15 | man: rsync.1 rsyncd.conf.5 man-copy | 32 | man: rsync.1 rsyncd.conf.5 man-copy |