Processed: Re: Bug#829135: jessie-pu: package python2.7/2.7.9-2+deb8u1

[Debian Bug Tracking System]

Processing control commands:

> tag -1 pending
Bug #829135 [release.debian.org] jessie-pu: package python2.7/2.7.9-2+deb8u1
Added tag(s) pending.

-- 
829135: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829135
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

Bug#829135: jessie-pu: package python2.7/2.7.9-2+deb8u1

[Julien Cristau]

Control: tag -1 pending

On Wed, Aug  3, 2016 at 20:34:31 +0200, Moritz Mühlenhoff wrote:

> On Tue, Jul 12, 2016 at 09:55:23PM +0100, Adam D. Barratt wrote:
> > Control: tags -1 + confirmed
> > 
> > On Thu, 2016-06-30 at 22:17 +0200, Moritz Muehlenhoff wrote:
> > > +python2.7 (2.7.9-2+deb8u1) jessie; urgency=medium
> > > +
> > > +  * Backport upstream commit b3ce713fb9beebfff9848cefa0acbd59acc68fe9
> > > +to address StartTLS stripping attack in smtplib (CVE-2016-0772)
> > > +  * Backport upstream commit 985fc64c60d6adffd1138b6cc46df388ca91ca5d
> > > +to address integer overflow in zipimporter (CVE-2016-5636)
> > > +  * Backport upstream commit 1c45047c51020d46246385949d5c02e026d47320
> > > +to address HTTP header injection (CVE-2016-5699)
> > 
> > Please go ahead.
> 
> Uploaded.
> 
Marked for acceptance into proposed-updates.

Cheers,
Julien

Bug#829135: jessie-pu: package python2.7/2.7.9-2+deb8u1

[Moritz Mühlenhoff]

On Tue, Jul 12, 2016 at 09:55:23PM +0100, Adam D. Barratt wrote:
> Control: tags -1 + confirmed
> 
> On Thu, 2016-06-30 at 22:17 +0200, Moritz Muehlenhoff wrote:
> > +python2.7 (2.7.9-2+deb8u1) jessie; urgency=medium
> > +
> > +  * Backport upstream commit b3ce713fb9beebfff9848cefa0acbd59acc68fe9
> > +to address StartTLS stripping attack in smtplib (CVE-2016-0772)
> > +  * Backport upstream commit 985fc64c60d6adffd1138b6cc46df388ca91ca5d
> > +to address integer overflow in zipimporter (CVE-2016-5636)
> > +  * Backport upstream commit 1c45047c51020d46246385949d5c02e026d47320
> > +to address HTTP header injection (CVE-2016-5699)
> 
> Please go ahead.

Uploaded.

Cheers,
Moritz

Bug#829135: jessie-pu: package python2.7/2.7.9-2+deb8u1

[Adam D. Barratt]

Control: tags -1 + confirmed

On Thu, 2016-06-30 at 22:17 +0200, Moritz Muehlenhoff wrote:
> +python2.7 (2.7.9-2+deb8u1) jessie; urgency=medium
> +
> +  * Backport upstream commit b3ce713fb9beebfff9848cefa0acbd59acc68fe9
> +to address StartTLS stripping attack in smtplib (CVE-2016-0772)
> +  * Backport upstream commit 985fc64c60d6adffd1138b6cc46df388ca91ca5d
> +to address integer overflow in zipimporter (CVE-2016-5636)
> +  * Backport upstream commit 1c45047c51020d46246385949d5c02e026d47320
> +to address HTTP header injection (CVE-2016-5699)

Please go ahead.

Regards,

Adam

Processed: Re: Bug#829135: jessie-pu: package python2.7/2.7.9-2+deb8u1

[Debian Bug Tracking System]

Processing control commands:

> tags -1 + confirmed
Bug #829135 [release.debian.org] jessie-pu: package python2.7/2.7.9-2+deb8u1
Added tag(s) confirmed.

-- 
829135: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829135
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

Bug#829135: jessie-pu: package python2.7/2.7.9-2+deb8u1

[Moritz Muehlenhoff]

Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

Attached debdiff fixes a few non-severe security issues in python2.7
and has been tested for a few days on a live system.

Cheers,
Moritz

diff -u python2.7-2.7.9/debian/changelog python2.7-2.7.9/debian/changelog
--- python2.7-2.7.9/debian/changelog
+++ python2.7-2.7.9/debian/changelog
@@ -1,3 +1,14 @@
+python2.7 (2.7.9-2+deb8u1) jessie; urgency=medium
+
+  * Backport upstream commit b3ce713fb9beebfff9848cefa0acbd59acc68fe9
+to address StartTLS stripping attack in smtplib (CVE-2016-0772)
+  * Backport upstream commit 985fc64c60d6adffd1138b6cc46df388ca91ca5d
+to address integer overflow in zipimporter (CVE-2016-5636)
+  * Backport upstream commit 1c45047c51020d46246385949d5c02e026d47320
+to address HTTP header injection (CVE-2016-5699)
+
+ -- Moritz Mühlenhoff   Wed, 29 Jun 2016 00:02:23 +0200
+
 python2.7 (2.7.9-2) unstable; urgency=medium
 
   * python2.7-minimal: Make Pre-Depends mangling more robust. Closes: #779294.
diff -u python2.7-2.7.9/debian/patches/series.in 
python2.7-2.7.9/debian/patches/series.in
--- python2.7-2.7.9/debian/patches/series.in
+++ python2.7-2.7.9/debian/patches/series.in
@@ -66,0 +67,4 @@
+CVE-2016-0772.diff
+CVE-2016-5636.diff
+CVE-2016-5699.diff
+
only in patch2:
unchanged:
--- python2.7-2.7.9.orig/debian/patches/CVE-2016-0772.diff
+++ python2.7-2.7.9/debian/patches/CVE-2016-0772.diff
@@ -0,0 +1,25 @@
+
+# HG changeset patch
+# User Benjamin Peterson 
+# Date 1465676202 25200
+# Node ID b3ce713fb9beebfff9848cefa0acbd59acc68fe9
+# Parent  3017e41b0c99d24e88faf1de447f230e2f64d122
+raise an error when STARTTLS fails
+
+diff --git a/Lib/smtplib.py b/Lib/smtplib.py
+--- a/Lib/smtplib.py
 b/Lib/smtplib.py
+@@ -656,7 +656,12 @@ class SMTP:
+ self.ehlo_resp = None
+ self.esmtp_features = {}
+ self.does_esmtp = 0
++else:
++# RFC 3207:
++# 501 Syntax error (no parameters allowed)
++# 454 TLS not available due to temporary reason
++raise SMTPResponseException(resp, reply)
+ return (resp, reply)
+ 
+ def sendmail(self, from_addr, to_addrs, msg, mail_options=[],
+ 
+
only in patch2:
unchanged:
--- python2.7-2.7.9.orig/debian/patches/CVE-2016-5636.diff
+++ python2.7-2.7.9/debian/patches/CVE-2016-5636.diff
@@ -0,0 +1,24 @@
+
+# HG changeset patch
+# User Benjamin Peterson 
+# Date 1453357424 28800
+# Node ID 985fc64c60d6adffd1138b6cc46df388ca91ca5d
+# Parent  7ec954b9fc54448a35b56d271340ba109eb381b9
+prevent buffer overflow in get_data (closes #26171)
+
+diff --git a/Modules/zipimport.c b/Modules/zipimport.c
+--- a/Modules/zipimport.c
 b/Modules/zipimport.c
+@@ -895,6 +895,11 @@ get_data(char *archive, PyObject *toc_en
+ PyMarshal_ReadShortFromFile(fp);/* local header size */
+ file_offset += l;   /* Start of file data */
+ 
++if (data_size > LONG_MAX - 1) {
++fclose(fp);
++PyErr_NoMemory();
++return NULL;
++}
+ raw_data = PyString_FromStringAndSize((char *)NULL, compress == 0 ?
+   data_size : data_size + 1);
+ if (raw_data == NULL) {
+
only in patch2:
unchanged:
--- python2.7-2.7.9.orig/debian/patches/CVE-2016-5699.diff
+++ python2.7-2.7.9/debian/patches/CVE-2016-5699.diff
@@ -0,0 +1,147 @@
+
+# HG changeset patch
+# User Serhiy Storchaka 
+# Date 1426151571 -7200
+# Node ID 1c45047c51020d46246385949d5c02e026d47320
+# Parent  36bd5add973285cce9d3ec7e068bbb20c9080565
+Issue #22928: Disabled HTTP header injections in httplib.
+Original patch by Demian Brecht.
+
+diff --git a/Lib/httplib.py b/Lib/httplib.py
+--- a/Lib/httplib.py
 b/Lib/httplib.py
+@@ -68,6 +68,7 @@ Req-sent-unread-response   _CS_REQ_S
+ 
+ from array import array
+ import os
++import re
+ import socket
+ from sys import py3kwarning
+ from urlparse import urlsplit
+@@ -218,6 +219,34 @@ MAXAMOUNT = 1048576
+ # maximum amount of headers accepted
+ _MAXHEADERS = 100
+ 
++# Header name/value ABNF (http://tools.ietf.org/html/rfc7230#section-3.2)
++#
++# VCHAR  = %x21-7E
++# obs-text   = %x80-FF
++# header-field   = field-name ":" OWS field-value OWS
++# field-name = token
++# field-value= *( field-content / obs-fold )
++# field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
++# field-vchar= VCHAR / obs-text
++#
++# obs-fold   = CRLF 1*( SP / HTAB )
++#; obsolete line folding
++#; see Section 3.2.4
++
++# token  = 1*tchar
++#
++# tchar  = "!" / "#" / "$" / "%" / "&" / "'" / "*"
++#/ "+" / "-" / "." / "^" / "_" / "`" / "|" / "~"
++#/ DIGIT / ALPHA
++#; any VCHAR, except delimiters
++#
++# VCHAR defined in http://tools.ietf.org/html/rfc5234#appendix-B.1
++
++# the