[Python-modules-commits] [twisted] 07/07: Drop used patches
Free Ekanayaka
freee at moszumanska.debian.org
Mon Aug 28 17:40:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
freee pushed a commit to branch master
in repository twisted.
commit 44d20266575a23f2d6fd0c32ce06e0bf1f5734e4
Author: Free Ekanayaka <free.ekanayaka at canonical.com>
Date: Mon Aug 28 07:17:28 2017 +0000
Drop used patches
tmp
---
debian/changelog | 6 +++
debian/patches/0001-wxpython3.0.patch | 8 +--
debian/patches/0007-openssl-1.1.0.patch | 94 ---------------------------------
debian/patches/series | 1 -
4 files changed, 10 insertions(+), 99 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a94d333..0e06c54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
twisted (17.5.0-1) unstable; urgency=medium
* New upstream version 17.5.0
+ * Drop unused patches
+ * Refresh 0002-combinedlog.patch
+ * Add new build-dependency on Python hyperlink
+ * Drop deprecated portmap.so (see upstream's #8464)
+ * Bump build dependency on Python automat (>= 0.6.0)
+ * Add patches for failing tests
-- Free Ekanayaka <freee at debian.org> Sun, 27 Aug 2017 09:24:58 +0000
diff --git a/debian/patches/0001-wxpython3.0.patch b/debian/patches/0001-wxpython3.0.patch
index c30bd0f..9fa12a9 100644
--- a/debian/patches/0001-wxpython3.0.patch
+++ b/debian/patches/0001-wxpython3.0.patch
@@ -8,12 +8,12 @@ Fix imports from the wx package.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/twisted/internet/wxreactor.py b/src/twisted/internet/wxreactor.py
-index 71e861a..6713de0 100644
+index a6c968d..1a73626 100644
--- a/src/twisted/internet/wxreactor.py
+++ b/src/twisted/internet/wxreactor.py
-@@ -25,11 +25,11 @@ real applications.
+@@ -29,11 +29,11 @@ except ImportError:
+ from Queue import Empty, Queue
- import Queue
try:
- from wx import PySimpleApp as wxPySimpleApp, CallAfter as wxCallAfter, \
+ from wx import App as wxApp, CallAfter as wxCallAfter, \
@@ -25,7 +25,7 @@ index 71e861a..6713de0 100644
from twisted.python import log, runtime
from twisted.internet import _threadedselect
-@@ -125,7 +125,7 @@ class WxReactor(_threadedselect.ThreadedSelectReactor):
+@@ -129,7 +129,7 @@ class WxReactor(_threadedselect.ThreadedSelectReactor):
if not hasattr(self, "wxapp"):
log.msg("registerWxApp() was not called on reactor, "
"registering my own wxApp instance.")
diff --git a/debian/patches/0007-openssl-1.1.0.patch b/debian/patches/0007-openssl-1.1.0.patch
deleted file mode 100644
index 82db886..0000000
--- a/debian/patches/0007-openssl-1.1.0.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: Free Ekanayaka <freee at debian.org>
-Date: Thu, 10 Nov 2016 09:05:18 +0000
-Subject: openssl-1.1.0
-
-Fix tests breakages with OpenSSL 1.1.0
----
- src/twisted/protocols/test/test_tls.py | 4 ++++
- src/twisted/test/test_ssl.py | 10 +++-------
- src/twisted/test/test_sslverify.py | 2 +-
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/twisted/protocols/test/test_tls.py b/src/twisted/protocols/test/test_tls.py
-index 8027a00..1f78085 100644
---- a/src/twisted/protocols/test/test_tls.py
-+++ b/src/twisted/protocols/test/test_tls.py
-@@ -782,6 +782,7 @@ class TLSMemoryBIOTests(TestCase):
- clientConnectionLost.addCallback(cbDisconnected)
- return clientConnectionLost
-
-+ test_disorderlyShutdown.skip = "Broken with OpenSSL 1.1.0"
-
- def test_loseConnectionAfterHandshake(self):
- """
-@@ -1409,6 +1410,7 @@ class TLSProducerTests(TestCase):
- """
- self.registerProducerAfterConnectionLost(True)
-
-+ test_streamingProducerAfterConnectionLost.skip = "Broken with OpenSSL 1.1.0"
-
- def test_nonStreamingProducerAfterConnectionLost(self):
- """
-@@ -1418,6 +1420,8 @@ class TLSProducerTests(TestCase):
- """
- self.registerProducerAfterConnectionLost(False)
-
-+ test_nonStreamingProducerAfterConnectionLost.skip = "Broken with OpenSSL 1.1.0"
-+
-
-
- class NonStreamingProducerTests(TestCase):
-diff --git a/src/twisted/test/test_ssl.py b/src/twisted/test/test_ssl.py
-index b329046..1d7144b 100644
---- a/src/twisted/test/test_ssl.py
-+++ b/src/twisted/test/test_ssl.py
-@@ -184,7 +184,7 @@ def generateCertificateObjects(organization, organizationalUnit):
- @return: a tuple of (key, request, certificate) objects.
- """
- pkey = crypto.PKey()
-- pkey.generate_key(crypto.TYPE_RSA, 512)
-+ pkey.generate_key(crypto.TYPE_RSA, 4096)
- req = crypto.X509Req()
- subject = req.get_subject()
- subject.O = organization
-@@ -662,14 +662,11 @@ class DefaultOpenSSLContextFactoryTests(unittest.TestCase):
- def test_method(self):
- """
- L{ssl.DefaultOpenSSLContextFactory.getContext} returns an SSL context
-- which can use SSLv3 or TLSv1 but not SSLv2.
-+ which can use SSLv3 or TLSv1.
- """
- # SSLv23_METHOD allows SSLv2, SSLv3, or TLSv1
- self.assertEqual(self.context._method, SSL.SSLv23_METHOD)
-
-- # And OP_NO_SSLv2 disables the SSLv2 support.
-- self.assertTrue(self.context._options & SSL.OP_NO_SSLv2)
--
- # Make sure SSLv3 and TLSv1 aren't disabled though.
- self.assertFalse(self.context._options & SSL.OP_NO_SSLv3)
- self.assertFalse(self.context._options & SSL.OP_NO_TLSv1)
-@@ -711,10 +708,9 @@ class ClientContextFactoryTests(unittest.TestCase):
- def test_method(self):
- """
- L{ssl.ClientContextFactory.getContext} returns a context which can use
-- SSLv3 or TLSv1 but not SSLv2.
-+ SSLv3 or TLSv1.
- """
- self.assertEqual(self.context._method, SSL.SSLv23_METHOD)
-- self.assertTrue(self.context._options & SSL.OP_NO_SSLv2)
- self.assertFalse(self.context._options & SSL.OP_NO_SSLv3)
- self.assertFalse(self.context._options & SSL.OP_NO_TLSv1)
-
-diff --git a/src/twisted/test/test_sslverify.py b/src/twisted/test/test_sslverify.py
-index acc05cd..26d6f55 100644
---- a/src/twisted/test/test_sslverify.py
-+++ b/src/twisted/test/test_sslverify.py
-@@ -132,7 +132,7 @@ def counter(counter=itertools.count()):
-
- def makeCertificate(**kw):
- keypair = PKey()
-- keypair.generate_key(TYPE_RSA, 768)
-+ keypair.generate_key(TYPE_RSA, 4096)
-
- certificate = X509()
- certificate.gmtime_adj_notBefore(0)
diff --git a/debian/patches/series b/debian/patches/series
index 2a8f48c..4fb17e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
0006-fix-sphinx-import-path.patch
0008-sort-option-keys.patch
0009-no-stderr-in-test_ckeygen.patch
-0007-openssl-1.1.0.patch
0010-handle-setlocale-test-failure.patch
0010-spurious-failure-in-setup-unit-tests.patch
0011-fix-broken-sslverify-tests.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/twisted.git
More information about the Python-modules-commits
mailing list