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

fcc39864dba82e14895afbe841091091366c96bc'>tree</a><a href='/guix/commit/gnu/packages/fcitx.scm?id=fcc39864dba82e14895afbe841091091366c96bc'>commit</a><a href='/guix/diff/gnu/packages/fcitx.scm?id=fcc39864dba82e14895afbe841091091366c96bc'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/fcitx.scm'>
<input type='hidden' name='id' value='fcc39864dba82e14895afbe841091091366c96bc'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=fcc39864dba82e14895afbe841091091366c96bc'>root</a>/<a href='/guix/log/gnu?id=fcc39864dba82e14895afbe841091091366c96bc'>gnu</a>/<a href='/guix/log/gnu/packages?id=fcc39864dba82e14895afbe841091091366c96bc'>packages</a>/<a href='/guix/log/gnu/packages/fcitx.scm?id=fcc39864dba82e14895afbe841091091366c96bc'>fcitx.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/fcitx.scm?id=fcc39864dba82e14895afbe841091091366c96bc&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-01-31 09:22:48 +0100'>2021-01-31</span></td><td><a href='/guix/commit/gnu/packages/fcitx.scm?id=7152d7568116bb19da986465db93a9b811bee577'>gnu: Add fcitx-qt5.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/fcitx.scm (fcitx-qt5): New variable.

Signed-off-by: Leo Prikler &lt;leo.prikler@student.tugraz.at&gt;
</span></span></td><td>Raghav Gururajan</td></tr>
<tr><td><span title='2020-09-22 11:02:58 +0200'>2020-09-22</span></td><td><a href='/guix/commit/gnu/packages/fcitx.scm?id=7e463dd16b7e273011f0beafa57a89fa2d525f8b'>gnu: fcitx: Update to 4.2.9.8.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/fcitx.scm(fcitx): Update to 4.2.9.8.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Zhu Zihao</td></tr>
<tr><td><span title='2020-08-18 22:54:06 +0200'>2020-08-18</span></td><td><a href='/guix/commit/gnu/packages/fcitx.scm?id=d3ed745e4704fba1ef74c95363acd9a3f99b88f7'>gnu: Add presage.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/fcitx.scm (presage): New variable.

Signed-off-by: Danny Milosavljevic &lt;dannym@scratchpost.org&gt;
</span></span></td><td>Raghav Gururajan</td></tr>