diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-12-03 08:52:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-12-03 08:52:17 +0100 |
| commit | 194451347dc60092132d06b84a83c5205d79299a (patch) | |
| tree | 828475b685c349cdd7b74c09beb7336d38bdf6f0 /gnu/packages/patches/python2-CVE-2018-1060.patch | |
| parent | 37c6f11f8dfa1880db86a3510c9e50990304d76c (diff) | |
| parent | 8cddb0d6363d13f74de5409ef29b7913228f49b9 (diff) | |
| download | guix-194451347dc60092132d06b84a83c5205d79299a.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/patches/python2-CVE-2018-1060.patch')
| -rw-r--r-- | gnu/packages/patches/python2-CVE-2018-1060.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/gnu/packages/patches/python2-CVE-2018-1060.patch b/gnu/packages/patches/python2-CVE-2018-1060.patch deleted file mode 100644 index 5eb7ccfbc9..0000000000 --- a/gnu/packages/patches/python2-CVE-2018-1060.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 - |