aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/cvs-2017-12836.patch
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2019-07-10 14:53:04 +0300
committerEfraim Flashner <efraim@flashner.co.il>2019-07-10 21:33:48 +0300
commitbba3c489701693c59315efed001b37d6fa014a6c (patch)
tree0ad82ff897f25910a0cb121b0e01aff93fbe76d3 /gnu/packages/patches/cvs-2017-12836.patch
parent5a4e5c26cc3fb24e0e7f6a2d95f03396f3d0b014 (diff)
downloadguix-bba3c489701693c59315efed001b37d6fa014a6c.tar
guix-bba3c489701693c59315efed001b37d6fa014a6c.tar.gz
gnu: cvs: Rename patch file.
* gnu/packages/version-control.scm (cvs)[source]: Rename patch. * gnu/packages/patches/cvs-2017-12836.patch: Rename to ... * gnu/packages/patches/cvs-CVE-2018-12836.patch: ... this. * gnu/local.mk (dist_patch_DATA): Register it.
Diffstat (limited to 'gnu/packages/patches/cvs-2017-12836.patch')
-rw-r--r--gnu/packages/patches/cvs-2017-12836.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/gnu/packages/patches/cvs-2017-12836.patch b/gnu/packages/patches/cvs-2017-12836.patch
deleted file mode 100644
index 507ab0f7d0..0000000000
--- a/gnu/packages/patches/cvs-2017-12836.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix CVE-2017-12836:
-
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=2017-12836
-https://security-tracker.debian.org/tracker/CVE-2017-12836
-
-Patch adpated from Debian (comments and changelog annotations removed):
-
-https://anonscm.debian.org/cgit/collab-maint/cvs.git/commit/?h=stretch&id=41e077396e35efb6c879951f44c62dd8a1d0f094
-
-From 41e077396e35efb6c879951f44c62dd8a1d0f094 Mon Sep 17 00:00:00 2001
-From: mirabilos <m@mirbsd.org>
-Date: Sat, 12 Aug 2017 03:17:18 +0200
-Subject: Fix CVE-2017-12836 (Closes: #871810) for stretch
-
----
- debian/changelog | 6 ++++++
- src/rsh-client.c | 10 ++++++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/rsh-client.c b/src/rsh-client.c
-index fe0cfc4..1fc860d 100644
---- a/src/rsh-client.c
-+++ b/src/rsh-client.c
-@@ -105,6 +106,9 @@ start_rsh_server (cvsroot_t *root, struct buffer **to_server_p,
- rsh_argv[i++] = argvport;
- }
-
-+ /* Only non-option arguments from here. (CVE-2017-12836) */
-+ rsh_argv[i++] = "--";
-+
- rsh_argv[i++] = root->hostname;
- rsh_argv[i++] = cvs_server;
- if (readonlyfs)
-@@ -189,6 +193,8 @@ start_rsh_server (cvsroot_t *root, struct buffer **to_server_p,
- *p++ = argvport;
- }
-
-+ *p++ = "--";
-+
- *p++ = root->hostname;
- *p++ = command;
- *p++ = NULL;
---
-cgit v0.12
-