net-misc/rsync: revbump

7 files changed, 18 insertions, 162 deletions

diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 87500d8c..37665bcb 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1 +1,2 @@
 DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
+DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
deleted file mode 100644
index d06607cf..00000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-X-Git-Url: https://git.samba.org/rsync.git/?p=rsync.git;a=blobdiff_plain;f=xattrs.c;h=4867e6f5b8ad2934d43b06f3b99b7b3690a6dc7a;hp=68305d7559b34f5cc2f196b74429b82fa6ff49dd;hb=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hpb=bc112b0e7feece62ce98708092306639a8a53cce
-
-diff --git a/xattrs.c b/xattrs.c
-index 68305d7..4867e6f 100644
---- a/xattrs.c
-+++ b/xattrs.c
-@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
- 			out_of_memory("receive_xattr");
- 		name = ptr + dget_len + extra_len;
- 		read_buf(f, name, name_len);
-+		if (name_len < 1 || name[name_len-1] != '\0') {
-+			rprintf(FERROR, "Invalid xattr name received (missing trailing \\0).\n");
-+			exit_cleanup(RERR_FILEIO);
-+		}
- 		if (dget_len == datum_len)
- 			read_buf(f, ptr, dget_len);
- 		else {
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
deleted file mode 100644
index 0cc9b825..00000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Wayne Davison <wayned@samba.org>
-Date: Sun, 3 Dec 2017 23:49:56 +0000 (-0800)
-Subject: Fix issue with earlier path-check (fixes "make check")
-X-Git-Url: https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=f5e8a17e093065fb20fea00a29540fe2c7896441;hp=5509597decdbd7b91994210f700329d8a35e70a1
-
-Fix issue with earlier path-check (fixes "make check")
----
-
-diff --git a/receiver.c b/receiver.c
-index 9c46242..75cb00d 100644
---- a/receiver.c
-+++ b/receiver.c
-@@ -574,15 +574,15 @@ int recv_files(int f_in, int f_out, char *local_name)
- 			file = dir_flist->files[cur_flist->parent_ndx];
- 		fname = local_name ? local_name : f_name(file, fbuf);
- 
--		if (daemon_filter_list.head
--		    && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
-+		if (DEBUG_GTE(RECV, 1))
-+			rprintf(FINFO, "recv_files(%s)\n", fname);
-+
-+		if (daemon_filter_list.head && (*fname != '.' || fname[1] != '\0')
-+		 && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
- 			rprintf(FERROR, "attempt to hack rsync failed.\n");
- 			exit_cleanup(RERR_PROTOCOL);
- 		}
- 
--		if (DEBUG_GTE(RECV, 1))
--			rprintf(FINFO, "recv_files(%s)\n", fname);
--
- #ifdef SUPPORT_XATTRS
- 		if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
- 		 && !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
deleted file mode 100644
index 0ab8de1f..00000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e06d40029cfdce9d0f73d87cfd4edaf54be9c51 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 2 Nov 2017 23:44:19 -0700
-Subject: [PATCH] Check fname in recv_files sooner.
-
----
- receiver.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: rsync-3.1.2/receiver.c
-===================================================================
---- rsync-3.1.2.orig/receiver.c
-+++ rsync-3.1.2/receiver.c
-@@ -580,6 +580,12 @@ int recv_files(int f_in, int f_out, char
- 			file = dir_flist->files[cur_flist->parent_ndx];
- 		fname = local_name ? local_name : f_name(file, fbuf);
- 
-+		if (daemon_filter_list.head
-+		    && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
-+			rprintf(FERROR, "attempt to hack rsync failed.\n");
-+			exit_cleanup(RERR_PROTOCOL);
-+		}
-+
- 		if (DEBUG_GTE(RECV, 1))
- 			rprintf(FINFO, "recv_files(%s)\n", fname);
- 
-@@ -651,12 +657,6 @@ int recv_files(int f_in, int f_out, char
- 
- 		cleanup_got_literal = 0;
- 
--		if (daemon_filter_list.head
--		    && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
--			rprintf(FERROR, "attempt to hack rsync failed.\n");
--			exit_cleanup(RERR_PROTOCOL);
--		}
--
- 		if (read_batch) {
- 			int wanted = redoing
- 				   ? we_want_redo(ndx)
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
deleted file mode 100644
index aeb8c2ee..00000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5509597decdbd7b91994210f700329d8a35e70a1 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 16 Nov 2017 17:26:03 -0800
-Subject: [PATCH] Check daemon filter against fnamecmp in recv_files().
-
----
- receiver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: rsync-3.1.2/receiver.c
-===================================================================
---- rsync-3.1.2.orig/receiver.c
-+++ rsync-3.1.2/receiver.c
-@@ -728,7 +728,7 @@ int recv_files(int f_in, int f_out, char
- 				break;
- 			}
- 			if (!fnamecmp || (daemon_filter_list.head
--			  && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {
-+			  && check_filter(&daemon_filter_list, FLOG, fnamecmp, 0) < 0)) {
- 				fnamecmp = fname;
- 				fnamecmp_type = FNAMECMP_FNAME;
- 			}
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
deleted file mode 100644
index 5b94efa0..00000000
--- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 70aeb5fddd1b2f8e143276f8d5a085db16c593b9 Mon Sep 17 00:00:00 2001
-From: Jeriko One <jeriko.one@gmx.us>
-Date: Thu, 16 Nov 2017 17:05:42 -0800
-Subject: [PATCH] Sanitize xname in read_ndx_and_attrs.
-
----
- rsync.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: rsync-3.1.2/rsync.c
-===================================================================
---- rsync-3.1.2.orig/rsync.c
-+++ rsync-3.1.2/rsync.c
-@@ -50,6 +50,7 @@ extern int flist_eof;
- extern int file_old_total;
- extern int keep_dirlinks;
- extern int make_backups;
-+extern int sanitize_paths;
- extern struct file_list *cur_flist, *first_flist, *dir_flist;
- extern struct chmod_mode_struct *daemon_chmod_modes;
- #ifdef ICONV_OPTION
-@@ -397,6 +398,11 @@ int read_ndx_and_attrs(int f_in, int f_o
- 	if (iflags & ITEM_XNAME_FOLLOWS) {
- 		if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
- 			exit_cleanup(RERR_PROTOCOL);
-+
-+		if (sanitize_paths) {
-+			sanitize_path(buf, buf, "", 0, SP_DEFAULT);
-+			len = strlen(buf);
-+		}
- 	} else {
- 		*buf = '\0';
- 		len = -1;
diff --git a/net-misc/rsync/rsync-3.1.2-r2.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
index 2302d9a2..b4a9c2da 100644
--- a/net-misc/rsync/rsync-3.1.2-r2.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit eutils flag-o-matic prefix systemd
 
@@ -12,9 +12,8 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ ${PV} != *_pre ]] ; then
+[[ ${PV} = *_pre* ]] || \
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
 IUSE="acl examples iconv ipv6 static stunnel xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
@@ -25,34 +24,34 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.2-CVE-2017-16548.patch
-	"${FILESDIR}"/${PN}-3.1.2-CVE-2017-17433.patch
-	"${FILESDIR}"/${PN}-3.1.2-CVE-2017-17434-part1.patch
-	"${FILESDIR}"/${PN}-3.1.2-CVE-2017-17434-part2.patch
-	"${FILESDIR}"/${PN}-3.1.2-CVE-2017-17433-fixup.patch
+PATCHES=( 
 	"${FILESDIR}"/${PN}-fix-musl-ipv6.patch
 )
 
-S=${WORKDIR}/${P/_/}
+S="${WORKDIR}/${P/_/}"
 
 src_configure() {
 	use static && append-ldflags -static
-	econf \
-		--without-included-popt \
-		$(use_enable acl acl-support) \
-		$(use_enable xattr xattr-support) \
-		$(use_enable ipv6) \
-		$(use_enable iconv) \
+	local myeconfargs=(
 		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable ipv6)
+		$(use_enable xattr xattr-support)
+	)
+	econf "${myeconfargs[@]}"
 	touch proto.h-tstamp #421625
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
+
 	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
 	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
 	dodoc NEWS OLDNEWS README TODO tech_report.tex
+
 	insinto /etc
 	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
 
@@ -72,10 +71,10 @@ src_install() {
 	if use examples ; then
 		exeinto /usr/share/rsync
 		doexe support/*
-		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+		rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c}
 	fi
 
-	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+	eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd*
 
 	systemd_dounit "${FILESDIR}/rsyncd.service"
 }