diff --git a/.gitignore b/.gitignore index a76a595..d7feae3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /pypy-*-src.tar.bz2 -/pypy2-v5.4.0-src.tar.bz2 +/pypy2-*-src.tar.bz2 diff --git a/009-raise-an-error-when-STARTTLS-fails.patch b/009-raise-an-error-when-STARTTLS-fails.patch deleted file mode 100644 index 102b323..0000000 --- a/009-raise-an-error-when-STARTTLS-fails.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 935f806ae382a45620873dea0eafc536c9e01323 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Thu, 30 Jun 2016 14:51:24 +0200 -Subject: [PATCH] Raise an error when STARTTLS fails - -CVE-2016-0772 python: smtplib StartTLS stripping attack -rhbz#1303647: https://bugzilla.redhat.com/show_bug.cgi?id=1303647 -rhbz#1351679: https://bugzilla.redhat.com/show_bug.cgi?id=1351679 - -Based on an upstream change by Benjamin Peterson -- in changeset 101886:b3ce713fb9be 2.7 -- https://hg.python.org/cpython/rev/b3ce713fb9be ---- - lib-python/2.7/smtplib.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib-python/2.7/smtplib.py b/lib-python/2.7/smtplib.py -index 8388b98..e1651c0 100755 ---- a/lib-python/2.7/smtplib.py -+++ b/lib-python/2.7/smtplib.py -@@ -656,6 +656,11 @@ 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=[], --- -2.9.0 - diff --git a/pypy.spec b/pypy.spec index dfde5e4..454eca3 100644 --- a/pypy.spec +++ b/pypy.spec @@ -1,5 +1,5 @@ Name: pypy -Version: 5.4.0 +Version: 5.6.0 Release: 1%{?dist} Summary: Python implementation with a Just-In-Time compiler @@ -12,7 +12,7 @@ License: MIT and Python and UCD URL: http://pypy.org/ # Not currently supported on these arches -ExcludeArch: aarch64 s390 s390x +ExcludeArch: aarch64 s390 # High-level configuration of the build: @@ -96,7 +96,7 @@ ExcludeArch: aarch64 s390 s390x %global src_name %{name}2-v%{version}-src %ifarch %{ix86} x86_64 %{arm} %{power64} -%global with_jit 1 +%global with_jit 0 %else %global with_jit 0 %endif @@ -152,13 +152,6 @@ Patch0: 006-always-log-stdout.patch # community that won't make sense outside of it). [Sorry to be a killjoy] Patch1: 007-remove-startup-message.patch -# CVE-2016-0772 python: smtplib StartTLS stripping attack -# rhbz#1303647: https://bugzilla.redhat.com/show_bug.cgi?id=1303647 -# rhbz#1351679: https://bugzilla.redhat.com/show_bug.cgi?id=1351679 -# FIXED UPSTREAM: https://hg.python.org/cpython/rev/b3ce713fb9be -# Raise an error when STARTTLS fails -Patch2: 009-raise-an-error-when-STARTTLS-fails.patch - # Build-time requirements: # pypy's can be rebuilt using itself, rather than with CPython; doing so @@ -167,7 +160,7 @@ Patch2: 009-raise-an-error-when-STARTTLS-fails.patch # Turn it off with this boolean, to revert back to rebuilding using CPython # and avoid a cycle in the build-time dependency graph: -%global use_self_when_building 1 +%global use_self_when_building 0 %if 0%{use_self_when_building} BuildRequires: pypy %global bootstrap_python_interp pypy @@ -380,7 +373,7 @@ BuildPyPy() { # Reduce memory usage on arm during installation %ifarch %{arm} -PYPY_GC_MAX_DELTA=200MB pypy --jit loop_longevity=300 ../../rpython/bin/rpython -Ojit targetpypystandalone +#PYPY_GC_MAX_DELTA=200MB pypy --jit loop_longevity=300 ../../rpython/bin/rpython -Ojit targetpypystandalone %endif # The generated C code leads to many thousands of warnings of the form: @@ -714,6 +707,10 @@ CheckPyPy %{name}-c-stackless %changelog +* Mon Nov 14 2016 Peter Robinson 5.6.0-1 +- Update to 5.6.0 +- Bootstrap mode for Power64 and s390x + * Thu Sep 01 2016 Michal Cyprian - 5.4.0-1 - Update to 5.4.0 diff --git a/sources b/sources index 9b5acf5..2a4ba1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c806bea7ecbb999fffeea3a06e6462e8 pypy2-v5.4.0-src.tar.bz2 +c3fc7187061fec762269496f1f5daa86 pypy2-v5.6.0-src.tar.bz2