Hello,
Here is a diff for py-twisted to upgrade to 20.3.0 to solve
CVE-2020-10108 and CVE-2020-10109.
Regards
Index: Makefile
===
RCS file: /cvs/ports/devel/py-twisted/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 12 Jul 2019 20:45:55 - 1.14
+++ Makefile 24 Mar 2020 07:56:42 -
@@ -2,12 +2,11 @@
COMMENT = asynchronous networking Python framework
-MODPY_EGG_VERSION = 18.9.0
+MODPY_EGG_VERSION = 20.3.0
EXTRACT_SUFX = .tar.bz2
DISTNAME = Twisted-${MODPY_EGG_VERSION}
PKGNAME = py-twisted-${MODPY_EGG_VERSION}
-REVISION = 1
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/py-twisted/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 10 Nov 2018 20:52:35 - 1.5
+++ distinfo 24 Mar 2020 07:56:42 -
@@ -1,2 +1,2 @@
-SHA256 (Twisted-18.9.0.tar.bz2) = KUvixr+Erndt8vyY5699ZTfhxeYKRtM8POKhl2d9o5U=
-SIZE (Twisted-18.9.0.tar.bz2) = 3088398
+SHA256 (Twisted-20.3.0.tar.bz2) = 1yxVtdVuF2VjuR0RlS0TsBr4clxiPkmNtVB7ZhT8HhA=
+SIZE (Twisted-20.3.0.tar.bz2) = 3127793
Index: patches/patch-src_twisted_conch_test_test_ckeygen_py
===
RCS file: /cvs/ports/devel/py-twisted/patches/patch-src_twisted_conch_test_test_ckeygen_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_twisted_conch_test_test_ckeygen_py
--- patches/patch-src_twisted_conch_test_test_ckeygen_py 25 May 2018 10:42:38 - 1.1
+++ patches/patch-src_twisted_conch_test_test_ckeygen_py 24 Mar 2020 07:56:42 -
@@ -3,19 +3,16 @@ $OpenBSD: patch-src_twisted_conch_test_t
Index: src/twisted/conch/test/test_ckeygen.py
--- src/twisted/conch/test/test_ckeygen.py.orig
+++ src/twisted/conch/test/test_ckeygen.py
-@@ -68,9 +68,9 @@ class KeyGenTests(TestCase):
- def _testrun(self, keyType, keySize=None):
+@@ -66,7 +66,7 @@ class KeyGenTests(TestCase):
+
+ def _testrun(self, keyType, keySize=None, privateKeySubtype=None):
filename = self.mktemp()
- if keySize is None:
--subprocess.call(['ckeygen', '-t', keyType, '-f', filename, '--no-passphrase'])
-+subprocess.call(['ckeygen${MODPY_BIN_SUFFIX}', '-t', keyType, '-f', filename, '--no-passphrase'])
- else:
--subprocess.call(['ckeygen', '-t', keyType, '-f', filename, '--no-passphrase',
-+subprocess.call(['ckeygen${MODPY_BIN_SUFFIX}', '-t', keyType, '-f', filename, '--no-passphrase',
- '-b', keySize])
- privKey = Key.fromFile(filename)
- pubKey = Key.fromFile(filename + '.pub')
-@@ -94,7 +94,7 @@ class KeyGenTests(TestCase):
+-args = ['ckeygen', '-t', keyType, '-f', filename, '--no-passphrase']
++args = ['ckeygen${MODPY_BIN_SUFFIX}', '-t', keyType, '-f', filename, '--no-passphrase']
+ if keySize is not None:
+ args.extend(['-b', keySize])
+ if privateKeySubtype is not None:
+@@ -100,7 +100,7 @@ class KeyGenTests(TestCase):
def test_runBadKeytype(self):
filename = self.mktemp()
with self.assertRaises(subprocess.CalledProcessError):
Index: patches/patch-src_twisted_python__setup_py
===
RCS file: /cvs/ports/devel/py-twisted/patches/patch-src_twisted_python__setup_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_twisted_python__setup_py
--- patches/patch-src_twisted_python__setup_py 10 Nov 2018 20:52:35 - 1.4
+++ patches/patch-src_twisted_python__setup_py 24 Mar 2020 07:56:42 -
@@ -8,7 +8,7 @@ https://github.com/twisted/twisted/commi
Index: src/twisted/python/_setup.py
--- src/twisted/python/_setup.py.orig
+++ src/twisted/python/_setup.py
-@@ -139,15 +139,15 @@ _EXTRAS_REQUIRE['osx_platform'] = _EXTRAS_REQUIRE['mac
+@@ -146,15 +146,15 @@ _EXTRAS_REQUIRE['osx_platform'] = _EXTRAS_REQUIRE['mac
# Scripts provided by Twisted on Python 2 and 3.
_CONSOLE_SCRIPTS = [
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-twisted/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 20 Aug 2018 21:35:11 - 1.4
+++ pkg/PLIST 24 Mar 2020 07:56:43 -
@@ -31,6 +31,8 @@ bin/tkconch${MODPY_BIN_SUFFIX}
bin/trial${MODPY_BIN_SUFFIX}
bin/twist${MODPY_BIN_SUFFIX}
bin/twistd${MODPY_BIN_SUFFIX}
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/Twisted-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Twisted-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/Twisted-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -179,14 +181,10 @@ lib/python${MODPY_VERSION}/site-packages
