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

-maintenance.scm?id=339eef40f85a08609bb711557a67945173b490cb'>tree</a><a href='/guix/commit/tests/gnu-maintenance.scm?id=339eef40f85a08609bb711557a67945173b490cb'>commit</a><a href='/guix/diff/tests/gnu-maintenance.scm?id=339eef40f85a08609bb711557a67945173b490cb'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/gnu-maintenance.scm'>
<input type='hidden' name='id' value='339eef40f85a08609bb711557a67945173b490cb'/><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=339eef40f85a08609bb711557a67945173b490cb'>root</a>/<a href='/guix/log/tests?id=339eef40f85a08609bb711557a67945173b490cb'>tests</a>/<a href='/guix/log/tests/gnu-maintenance.scm?id=339eef40f85a08609bb711557a67945173b490cb'>gnu-maintenance.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/tests/gnu-maintenance.scm?id=339eef40f85a08609bb711557a67945173b490cb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-04-03 14:19:09 +0200'>2016-04-03</span></td><td><a href='/guix/commit/tests/gnu-maintenance.scm?id=a9edb211e733b8b34e67ec3b4450567e9376986f'>build: Add a Guile custom test driver using SRFI-64.</a><span class='msg-avail'>...</span></td><td>Mathieu Lirzin</td></tr>
<tr><td><span title='2015-12-07 23:32:01 +0100'>2015-12-07</span></td><td><a href='/guix/commit/tests/gnu-maintenance.scm?id=202440e07a9dd40dc4b9814a91c67e24554d53c1'>gnu-maintenance: Add tests for 'release-file?'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>