Fix CVE-2018-1060:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1060

Taken from upstream commit (sans test and NEWS):
https://github.com/python/cpython/commit/e052d40cea15f582b50947f7d906b39744dc62a2

diff --git a/Lib/poplib.py b/Lib/poplib.py
index b91e5f72d2ca..a238510b38fc 100644
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -274,7 +274,7 @@ def rpop(self, user):
         return self._shortcmd('RPOP %s' % user)
 
 
-    timestamp = re.compile(r'\+OK.*(<[^>]+>)')
+    timestamp = re.compile(br'\+OK.[^<]*(<.*>)')
 
     def apop(self, user, secret):
         """Authorisation


<input type='hidden' name='id' value='74ca1190e916ca78c582ddbc984799fb45dd50ef'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=74ca1190e916ca78c582ddbc984799fb45dd50ef'>refs</a><a class='active' href='/guix/log/nix/libutil/util.hh'>log</a><a href='/guix/tree/nix/libutil/util.hh?id=74ca1190e916ca78c582ddbc984799fb45dd50ef'>tree</a><a href='/guix/commit/nix/libutil/util.hh?id=74ca1190e916ca78c582ddbc984799fb45dd50ef'>commit</a><a href='/guix/diff/nix/libutil/util.hh?id=74ca1190e916ca78c582ddbc984799fb45dd50ef'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libutil/util.hh'>
<input type='hidden' name='id' value='74ca1190e916ca78c582ddbc984799fb45dd50ef'/><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=74ca1190e916ca78c582ddbc984799fb45dd50ef'>root</a>/<a href='/guix/log/nix?id=74ca1190e916ca78c582ddbc984799fb45dd50ef'>nix</a>/<a href='/guix/log/nix/libutil?id=74ca1190e916ca78c582ddbc984799fb45dd50ef'>libutil</a>/<a href='/guix/log/nix/libutil/util.hh?id=74ca1190e916ca78c582ddbc984799fb45dd50ef'>util.hh</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/nix/libutil/util.hh?id=74ca1190e916ca78c582ddbc984799fb45dd50ef&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-08 22:30:07 +0100'>2020-12-08</span></td><td><a href='/guix/commit/nix/libutil/util.hh?id=2e308238ad09e9527f9b8c3ec4a90b6b05a93367'>daemon: 'Agent' constructor takes a list of environment variables.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libutil/util.hh (struct Agent)[Agent]: Add 'env' parameter.
* nix/libutil/util.cc (Agent::Agent): Honor it.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-14 15:42:55 +0200'>2020-09-14</span></td><td><a href='/guix/commit/nix/libutil/util.hh?id=ee9dff34f9317509cb2b833d07a0d5e01a36a4ae'>daemon: Move 'Agent' to libutil.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/build.cc (DerivationGoal::tryBuildHook): Add "offload" to
'args' and pass settings.guixProgram as the first argument to
Agent::Agent.
(pathNullDevice, commonChildInit, Agent, Agent::Agent)
(Agent::~Agent): Move to...
* nix/libutil/util.cc: ... here.
* nix/libutil/util.hh (struct Agent, commonChildInit): New
declarations.
</span></span></td><td>Ludovic Courtès</td></tr>