summary refs log tree commit diff
path: root/gnu/packages/patches/rsync-CVE-2017-17434-pt2.patch
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-01-30 08:14:16 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2018-01-30 09:25:35 +0100
commitb598965866ed93a9ce0ee5b2cd9ac4ef7109ec9b (patch)
tree512d79842b5bf57a91627c243fcebeec3073e6c6 /gnu/packages/patches/rsync-CVE-2017-17434-pt2.patch
parent865741166bb5af9bd641698cd6fd64fd1a7de8a7 (diff)
downloadguix-b598965866ed93a9ce0ee5b2cd9ac4ef7109ec9b.tar.gz
gnu: rsync: Update to 3.1.3.
* gnu/packages/rsync.scm (rsync): Update to 3.1.3.
[source]: Remove patches for fixed CVEs.
[properties]: Remove field.
* packages/patches/rsync-CVE-2017-16548.patch: Delete file.
* packages/patches/rsync-CVE-2017-17433.patch: Delete file.
* packages/patches/rsync-CVE-2017-17433-fix-tests.patch: Delete file.
* packages/patches/rsync-CVE-2017-17434-pt1.patch: Delete file.
* packages/patches/rsync-CVE-2017-17434-pt2.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/patches/rsync-CVE-2017-17434-pt2.patch')
-rw-r--r--gnu/packages/patches/rsync-CVE-2017-17434-pt2.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/gnu/packages/patches/rsync-CVE-2017-17434-pt2.patch b/gnu/packages/patches/rsync-CVE-2017-17434-pt2.patch
deleted file mode 100644
index fad19d01fb..0000000000
--- a/gnu/packages/patches/rsync-CVE-2017-17434-pt2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-17434
-https://git.samba.org/?p=rsync.git;a=patch;h=70aeb5fddd1b2f8e143276f8d5a085db16c593b9
-
-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
-