deleted file mode 100644

@@ -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

-+++ 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

-

deleted file mode 100644

@@ -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

-+++ 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

-

deleted file mode 100644

@@ -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

-+++ 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

-

deleted file mode 100644

@@ -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

-+++ 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

-

@@ -1,15 +1,11 @@

 Summary:        Fast incremental file transfer. 

 Name:           rsync

-Version:        3.1.2

-Release:        4%{?dist}

+Version:        3.1.3

+Release:        1%{?dist}

 License:        GPLv3+

 URL:            https://rsync.samba.org/

 Source0:        https://download.samba.org/pub/rsync/src/%{name}-%{version}.tar.gz

-%define sha1    rsync=0d4c7fb7fe3fc80eeff922a7c1d81df11dbb8a1a

-Patch0:         rsync-CVE-2017-16548.patch

-Patch1:         rsync-CVE-2017-17433.patch

-Patch2:         rsync-CVE-2017-17434-1.patch

-Patch3:         rsync-CVE-2017-17434-2.patch

+%define sha1    rsync=82e7829c0b3cefbd33c233005341e2073c425629

 Group:          Appication/Internet

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -19,10 +15,6 @@ Requires:       systemd

 Rsync is a fast and extraordinarily versatile file copying tool. It can copy locally, to/from another host over any remote shell, or to/from a remote rsync daemon. It offers a large number of options that control every aspect of its behavior and permit very flexible specification of the set of files to be copied. It is famous for its delta-transfer algorithm, which reduces the amount of data sent over the network by sending only the differences between the source files and the existing files in the destination. Rsync is widely used for backups and mirroring and as an improved copy command for everyday use.

 %prep

 %setup -q

-%patch0 -p1

-%patch1 -p1

-%patch2 -p1

-%patch3 -p1

 %build

 %configure --prefix=/usr

 make %{?_smp_mflags}

@@ -59,6 +51,8 @@ EOF

 %{_libdir}/systemd/system/rsyncd.service

 %{_sysconfdir}/rsyncd.conf

 %changelog

+*   Tue May 01 2018 Xiaolin Li <xiaolinl@vmware.com> 3.1.3-1

+-   Updated to version 3.1.3, fix CVE-2018-5764

 *   Wed Dec 27 2017 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-4

 -   Fix CVE-2017-17433, CVE-2017-17434

 *   Wed Nov 29 2017 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-3