main/rsync: security upgrade to 3.1.3 (CVE-2018-5764)

fixes #8679

5 files changed, 10 insertions, 156 deletions

diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index 5193335248..8970909a06 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rsync
-pkgver=3.1.2
-pkgrel=3
+pkgver=3.1.3
+pkgrel=0
 pkgdesc="A file transfer program to keep remote files in sync"
 url="http://samba.anu.edu.au/rsync/"
 arch="all"
@@ -14,11 +14,6 @@ source="http://$pkgname.samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz
 	rsyncd.confd
 	rsyncd.conf
 	rsyncd.logrotate
-
-	CVE-2017-16548.patch
-	CVE-2017-17433.patch
-	CVE-2017-17434-1.patch
-	CVE-2017-17434-2.patch
 	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -29,6 +24,8 @@ prepare() {
 }
 
 # secfixes:
+#   3.1.3-r0:
+#     - CVE-2018-5764
 #   3.1.2-r3:
 #     - CVE-2017-16548
 #     - CVE-2017-17433
@@ -59,30 +56,18 @@ package() {
 	install -D -m 644 ../rsyncd.logrotate ${pkgdir}/etc/logrotate.d/rsyncd
 }
 
-md5sums="0f758d7e000c0f7f7d3792610fad70cb  rsync-3.1.2.tar.gz
+md5sums="1581a588fde9d89f6bc6201e8129afaf  rsync-3.1.3.tar.gz
 cd237feca33f6a120fee76499652a460  rsyncd.initd
 e5e62e8cef29e09c22e8ba8152ec1751  rsyncd.confd
 a99211a14af1766ba849035241cd5bb2  rsyncd.conf
-169cafc6907a4c3787bb0462e9d6a5c2  rsyncd.logrotate
-6be77245994b5711e445cd798538d2dd  CVE-2017-16548.patch
-c4ceda2f5a721c3cd9f5bf257ad0f940  CVE-2017-17433.patch
-7e10c6e4bde7e003a9478c0d0f7c9f64  CVE-2017-17434-1.patch
-c0ac930bb57cdf481f7f8e22793d0d96  CVE-2017-17434-2.patch"
-sha256sums="ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2  rsync-3.1.2.tar.gz
+169cafc6907a4c3787bb0462e9d6a5c2  rsyncd.logrotate"
+sha256sums="55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0  rsync-3.1.3.tar.gz
 c70ba2400123b75c869e6e3eb25108ba21d748cc3008889112cec627515fa1de  rsyncd.initd
 de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5  rsyncd.confd
 2c00ca760c26bd7d6e1d8306d48eb9b27d876516c354f6d37c458871d5ac012f  rsyncd.conf
-eb54100686a253d4d14c9c67fcc20f92d88c0616692bffea899c6a8f8f980c7c  rsyncd.logrotate
-c3c903a09b6a0d38c6aff326c32f8031375f9f0014d701b84a66d2f3bca0d1e3  CVE-2017-16548.patch
-5166ef417fdcdd2a86da009fd36cfb9f3029b7bbcb455ec89c8993c166232314  CVE-2017-17433.patch
-933c2007610b621dd5325e5127e222c00c14bc7ca917a214ea58100e170af671  CVE-2017-17434-1.patch
-62df413a8382d588adec050bab4daee3ce0e1c9b36728341a759b4e71dfa352e  CVE-2017-17434-2.patch"
-sha512sums="4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b  rsync-3.1.2.tar.gz
+eb54100686a253d4d14c9c67fcc20f92d88c0616692bffea899c6a8f8f980c7c  rsyncd.logrotate"
+sha512sums="8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99  rsync-3.1.3.tar.gz
 27f99ee64b99bb57fe3da55fc93fefc33326175fdcad01a3d93dea3aa61daaf21cd9b1063be572fa8abc5d2d444f2e64f0f6f64241176ae53bf61f9e4cb0dca9  rsyncd.initd
 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3  rsyncd.confd
 5bcd339bac70d7c2efc2a028852efb9a4a78d8b7b114979763d29d0b378afceb753954c31cca5dfb05dadd88479e5c875626e297ba31a57ee3da5ecad29dbd6d  rsyncd.conf
-b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5  rsyncd.logrotate
-a2f571bfdb5e37021ff8fee8bc80d624ccd83020e3fd5cf4119d477bb0fcdc57dab7d0f433a95136a1e259ba136e05f28d1a052ae2237805ddc611329ecb5679  CVE-2017-16548.patch
-3cfc9ea4abdf288e2f524570f9f115a34f089a44eec5a73a3d5da34d64a8843d729c5cbcaecfcadb5f309ee98c11583a7d607d3eb55011cf77f9df49886f6eff  CVE-2017-17433.patch
-f678175eb524505823e8ae7760c2a8e5189d2e09c03244ca88e6e2294707a76d430f52096fb1e498a13ddb8943a80ed588df66d682233c0e5243b52f57a1b5f5  CVE-2017-17434-1.patch
-065f79b8b9c0ae827b0ba9abddc37af75f7e8759b4f51551182e21e07ea030e6704233540515e0745b54117899b8fc259f40b30b04a558b54306aa2e2a37e36a  CVE-2017-17434-2.patch"
+b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5  rsyncd.logrotate"
diff --git a/main/rsync/CVE-2017-16548.patch b/main/rsync/CVE-2017-16548.patch
deleted file mode 100644
index de6feba88e..0000000000
--- a/main/rsync/CVE-2017-16548.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1 Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayned@samba.org>
-Date: Sun, 5 Nov 2017 11:33:15 -0800
-Subject: [PATCH] Enforce trailing \0 when receiving xattr name values. Fixes
- bug 13112.
-
----
- xattrs.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-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 {
--- 
-1.9.1
-
diff --git a/main/rsync/CVE-2017-17433.patch b/main/rsync/CVE-2017-17433.patch
deleted file mode 100644
index ecfad8c79f..0000000000
--- a/main/rsync/CVE-2017-17433.patch
+++ /dev/null
@@ -1,42 +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(-)
-
-diff --git a/receiver.c b/receiver.c
-index baae3a9..9fdafa1 100644
---- a/receiver.c
-+++ b/receiver.c
-@@ -574,6 +574,12 @@ 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) {
-+			rprintf(FERROR, "attempt to hack rsync failed.\n");
-+			exit_cleanup(RERR_PROTOCOL);
-+		}
-+
- 		if (DEBUG_GTE(RECV, 1))
- 			rprintf(FINFO, "recv_files(%s)\n", fname);
- 
-@@ -645,12 +651,6 @@ int recv_files(int f_in, int f_out, char *local_name)
- 
- 		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)
--- 
-1.9.1
-
diff --git a/main/rsync/CVE-2017-17434-1.patch b/main/rsync/CVE-2017-17434-1.patch
deleted file mode 100644
index 466ea16d3a..0000000000
--- a/main/rsync/CVE-2017-17434-1.patch
+++ /dev/null
@@ -1,25 +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(-)
-
-diff --git a/receiver.c b/receiver.c
-index 9fdafa1..9c46242 100644
---- a/receiver.c
-+++ b/receiver.c
-@@ -722,7 +722,7 @@ int recv_files(int f_in, int f_out, char *local_name)
- 				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;
- 			}
--- 
-1.9.1
-
diff --git a/main/rsync/CVE-2017-17434-2.patch b/main/rsync/CVE-2017-17434-2.patch
deleted file mode 100644
index a372d2a615..0000000000
--- a/main/rsync/CVE-2017-17434-2.patch
+++ /dev/null
@@ -1,36 +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(+)
-
-diff --git a/rsync.c b/rsync.c
-index b82e598..a0945ba 100644
---- a/rsync.c
-+++ b/rsync.c
-@@ -49,6 +49,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
-@@ -396,6 +397,11 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
- 	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;
--- 
-1.9.1
-