commit: 278a9bb52b5298b1b5a91353d12644df97c75afb Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sat May 12 15:29:10 2018 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Sat May 12 20:19:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278a9bb5
net-misc/rsync: remove unused patches (cherry picked from commit e1a20f4114d41d76ef0681456001de6356f13d43) Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/8369 .../rsync/files/rsync-3.1.2-CVE-2017-16548.patch | 17 ---------- .../files/rsync-3.1.2-CVE-2017-17433-fixup.patch | 33 ------------------ .../rsync/files/rsync-3.1.2-CVE-2017-17433.patch | 39 ---------------------- .../files/rsync-3.1.2-CVE-2017-17434-part1.patch | 22 ------------ .../files/rsync-3.1.2-CVE-2017-17434-part2.patch | 33 ------------------ 5 files changed, 144 deletions(-) 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 d06607cf772..00000000000 --- 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 0cc9b8256dd..00000000000 --- a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Wayne Davison <[email protected]> -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 0ab8de1fce3..00000000000 --- 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 <[email protected]> -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 aeb8c2ee33c..00000000000 --- 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 <[email protected]> -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 5b94efa0c1a..00000000000 --- 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 <[email protected]> -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;
