sslyze: 2.1.1 bump with deps and clean ups

dev-python/dataclasses/Manifest

@@ -0,0 +1 @@
+DIST dataclasses-0.6.tar.gz 36819 BLAKE2B d1bd90ba1316c2f9426e11e1391450a169376488235f5d483180f81fb4287582cc174e1019b03729e92f0b4fa60300f4916f0fd65ee2d8870953be3ee42022fd SHA512 6e1d47bf1282fd04942dbe99f69b5b066442f9bd3bf3395b94b9471b4a8cac7fbc756b3b1d418098060ce206e8404442cf7094b13529f5ef32f1ff1b086989ba

dev-python/dataclasses/dataclasses-0.6.ebuild

@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport implementation of PEP 557, Data Classes for Python 3.6"
+HOMEPAGE="https://github.com/ericvsmith/dataclasses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"

dev-python/nassl/Manifest

@@ -1,7 +1,6 @@
-DIST nassl-2.1.0.tar.gz 207482 BLAKE2B fb7b8602c5537110ca888dc77ef1037458c5b3b6dccf2104aae82893ee1d27030a9488f60251c623902e4dfa6c92cd5123a8becafab01f87470d19cdfe681d10 SHA512 aa3cc1d7201c25b530180f2c74a3f204c55f68e1392ff38599494bdc38d073c4b2dea01a9193853c1310064965ef9c55e6a08ce5b49f43ecdc0282b876f8aa46
 DIST nassl-2.1.1.tar.gz 207146 BLAKE2B 25a94488129cb85ec1067890ca83638955f08e2755e23fece8a0de60453a06b96b198e86d772b5685c744a042f1e4cf17f3c1871f413377420f28c464eae54dc SHA512 77c5487f43e7128fce3c1143f61977497014cb770276b792aececd212844cc3f7adac1a640fea48d409033e6328435f9936d2a9df69804b1be1088297e324ba5
 DIST nassl-2.1.2.tar.gz 207747 BLAKE2B 66d4c684249d2387100256a8f95cb199b40ed5085115f1db392a60caae96dd3e184868e34d94aac6011d60bac1353d0f92c5b567203e8a054a57c1ae1b8ed817 SHA512 6afef2eb670d25dae81d66fa9e78f3e702e61beda98cd26256ebf385ee44cd6e1822cdeee525473441b4fbf1e0fe0c6511cadf5174e3a0a143f98de52a8f6344
+DIST nassl-2.2.0.tar.gz 204247 BLAKE2B 6efd2b621c5e86c2b139140b56731e34e6d0c235a7b924e5f718d14b81e748ace0fd2eb9735906e591a78ffb452f8986112be19ca6a7bb719889840b4a64a5ca SHA512 75dc81adb2c01663dbb9b8f4e7d457e206c53ea988e55024c09bcfae16a9f13915b718721624377a8e0330e1fcc6019dbc3a8925a53a791d7f2582c0a6f9202f
 DIST openssl-OpenSSL_1_0_2e.zip 7242974 BLAKE2B c3e2a67d60067416627d0b61e4ee465488f329e1e9730ffe9980cc075caf583021ed3439d4fc1a504e039504f4b828b144a6673155171cb088ccc80fb8b8f222 SHA512 96ec9e8eff65387238ca523b7e5b3d330098a446af86ec1772e24eda99e63ef28364b5fa32e89f4dad2a38f07da9dd2a53f93eacf8040f94e93f03297f4a0508
-DIST openssl-OpenSSL_1_1_1-pre9.zip 19726750 BLAKE2B 63ddf944d4e58b4d1b7efb971f67de3b5daacb09a553082e5f21cceb908db99168c4d42471c0583bba1348037ddb6e103d12cbbaa7d685b8fda71e0991062b56 SHA512 fa05d51adadff802aceeff6f348f913eab631b630ef69f3da6dffaf76be6e01323911ae241b1a3f88519917f017acdb033425bbf1864168cb0c58dd3b46a0c44
 DIST openssl-OpenSSL_1_1_1.zip 17160238 BLAKE2B 9ff0510c112e9054a683896ec493e5fb76a88d281a28c0ef577ec722f8ba05129e00e62ca82e72d750785c2bd2ebf0365d977b417f6cecf9d3de12e75631f2d6 SHA512 9db4bf391739f4e835bcfda10533d49a7231508faf25d88d880dfadc98ffd3b503d58879368ff17bed33d7775c1f0eb6991aa71d6888f50c5ad65b2d221be18e
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae

dev-python/nassl/files/ceeeda49b280648d76b0928e97cbcb1e398cb392.patch

@@ -1,73 +0,0 @@
-From ceeeda49b280648d76b0928e97cbcb1e398cb392 Mon Sep 17 00:00:00 2001
-From: Alban Diquet <nabla.c0d3@gmail.com>
-Date: Sat, 22 Sep 2018 21:14:51 -0700
-Subject: [PATCH] Add a --do-not-clean build command; fixes #42
-
----
- build_tasks.py | 31 ++++++++++++++++++-------------
- 1 file changed, 18 insertions(+), 13 deletions(-)
-
-diff --git a/build_tasks.py b/build_tasks.py
-index 2bc0836..91bcf9b 100644
---- a/build_tasks.py
-+++ b/build_tasks.py
-@@ -342,34 +342,36 @@ def include_path(self) -> Path:
-         return self.src_path
- 
- 
--
- @task
--def build_zlib(ctx):
-+def build_zlib(ctx, do_not_clean=False):
-     print('ZLIB: Starting...')
-     zlib_cfg = ZlibBuildConfig(CURRENT_PLATFORM)
--    zlib_cfg.clean()
--    zlib_cfg.fetch_source()
-+    if do_not_clean:
-+        zlib_cfg.clean()
-+        zlib_cfg.fetch_source()
-     zlib_cfg.build(ctx)
-     print('ZLIB: All done')
- 
- 
- @task
--def build_legacy_openssl(ctx):
-+def build_legacy_openssl(ctx, do_not_clean=False):
-     print('OPENSSL LEGACY: Starting...')
-     ssl_legacy_cfg = LegacyOpenSslBuildConfig(CURRENT_PLATFORM)
--    ssl_legacy_cfg.clean()
--    ssl_legacy_cfg.fetch_source()
-+    if do_not_clean:
-+        ssl_legacy_cfg.clean()
-+        ssl_legacy_cfg.fetch_source()
-     zlib_cfg = ZlibBuildConfig(CURRENT_PLATFORM)
-     ssl_legacy_cfg.build(ctx, zlib_lib_path=zlib_cfg.libz_path, zlib_include_path=zlib_cfg.include_path)
-     print('OPENSSL LEGACY: All done')
- 
- 
- @task
--def build_modern_openssl(ctx):
-+def build_modern_openssl(ctx, do_not_clean=False):
-     print('OPENSSL MODERN: Starting...')
-     ssl_modern_cfg = ModernOpenSslBuildConfig(CURRENT_PLATFORM)
--    ssl_modern_cfg.clean()
--    ssl_modern_cfg.fetch_source()
-+    if do_not_clean:
-+        ssl_modern_cfg.clean()
-+        ssl_modern_cfg.fetch_source()
-     zlib_cfg = ZlibBuildConfig(CURRENT_PLATFORM)
-     ssl_modern_cfg.build(ctx, zlib_lib_path=zlib_cfg.libz_path, zlib_include_path=zlib_cfg.include_path)
-     print('OPENSSL MODERN: All done')
-@@ -391,6 +393,9 @@ def build_nassl(ctx):
-     ctx.run(f'python setup.py build_ext -i {extra_args}')
- 
- 
--@task(pre=[build_zlib, build_legacy_openssl, build_modern_openssl, build_nassl])
--def build_all(ctx):
--    pass
-+@task
-+def build_all(ctx, do_not_clean=False):
-+    build_zlib(ctx, do_not_clean)
-+    build_legacy_openssl(ctx, do_not_clean)
-+    build_modern_openssl(ctx, do_not_clean)
-+    build_nassl(ctx)

dev-python/nassl/files/no_fetch.patch

@@ -1,20 +0,0 @@
---- a/nassl-2.1.0/build_tasks.py.orig	2018-08-27 11:24:25.000000000 +0800
-+++ b/nassl-2.1.0/build_tasks.py	2018-08-29 09:56:49.248986644 +0800
-@@ -79,16 +79,7 @@
-     def fetch_source(self) -> None:
-         """Download the tar archive that contains the source code for the library.
-         """
--        import requests  # Do not import at the top that this file can be imported by setup.py
--        with TemporaryFile() as temp_file:
--            # Download the source archive
--            request = requests.get(self.src_tar_gz_url)
--            temp_file.write(request.content)
--            # Rewind the file
--            temp_file.seek(0)
--            # Extract the content of the archive
--            tar_file = tarfile.open(fileobj=temp_file)
--            tar_file.extractall(path=_DEPS_PATH)
-+        pass
- 
-     @abstractmethod
-     def build(self, ctx: Context) -> None:

dev-python/nassl/nassl-2.1.0.ebuild

@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit eutils distutils-r1 flag-o-matic
-
-#something to investigate in https://github.com/nabla-c0d3/sslyze/issues/101
-#can system packages be used?
-MY_OPENSSL_MODERN="OpenSSL_1_1_1-pre9"
-MY_OPENSSL_LEGACY="OpenSSL_1_0_2e"
-MY_ZLIB="zlib-1.2.11"
-
-DESCRIPTION="Experimental Python wrapper for OpenSSL"
-HOMEPAGE="https://github.com/nabla-c0d3/nassl"
-SRC_URI="https://github.com/nabla-c0d3/nassl/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/openssl/openssl/archive/${MY_OPENSSL_LEGACY}.zip -> openssl-${MY_OPENSSL_LEGACY}.zip
-	https://github.com/openssl/openssl/archive/${MY_OPENSSL_MODERN}.zip -> openssl-${MY_OPENSSL_MODERN}.zip
-	http://zlib.net/${MY_ZLIB}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/python-typing[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	dev-python/invoke[${PYTHON_USEDEP}]"
-#test? pytest
-#mypy
-#flake8
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare(){
-	epatch "${FILESDIR}/no_fetch.patch"
-	mkdir deps
-	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_LEGACY}" "${S}/deps"
-	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_MODERN}" "${S}/deps"
-	ln -s "${WORKDIR}/${MY_ZLIB}" "${S}/deps"
-
-	python3 /usr/bin/invoke build.zlib
-	python3 /usr/bin/invoke build.legacy-openssl
-	python3 /usr/bin/invoke build.modern-openssl
-
-	eapply_user
-}

dev-python/nassl/nassl-2.2.0.ebuild

@@ -1,18 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit eutils distutils-r1 flag-o-matic
 
+#openssl system can be used optionally
 #something to investigate in https://github.com/nabla-c0d3/sslyze/issues/101
-#can system packages be used?
-MY_OPENSSL_MODERN="OpenSSL_1_1_1-pre9"
+#see tags in "build_tasks.py" file
+MY_OPENSSL_MODERN="OpenSSL_1_1_1"
 MY_OPENSSL_LEGACY="OpenSSL_1_0_2e"
 MY_ZLIB="zlib-1.2.11"
 
-DESCRIPTION="Experimental Python wrapper for OpenSSL"
+DESCRIPTION="Experimental OpenSSL wrapper for Python 3.6+ and SSLyze"
 HOMEPAGE="https://github.com/nabla-c0d3/nassl"
 SRC_URI="https://github.com/nabla-c0d3/nassl/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/openssl/openssl/archive/${MY_OPENSSL_LEGACY}.zip -> openssl-${MY_OPENSSL_LEGACY}.zip
@@ -25,17 +26,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/python-typing[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
 	dev-python/invoke[${PYTHON_USEDEP}]"
-#test? pytest
-#mypy
-#flake8
 
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 src_prepare(){
-	epatch "${FILESDIR}/ceeeda49b280648d76b0928e97cbcb1e398cb392.patch"
 	mkdir deps
 	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_LEGACY}" "${S}/deps"
 	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_MODERN}" "${S}/deps"

dev-python/tls_parser/tls_parser-1.2.1.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1
 

net-analyzer/sslyze/Manifest

@@ -1,3 +1,2 @@
-DIST sslyze-2.0.1.tar.gz 9669587 BLAKE2B 821a2883259dfb73ed09d3a57aba8b60736c34867897d668575250221ebe88ac180c3dd20122b02887a18d4d46053e1fa277207ee35ace9a5795e4a105a4eae1 SHA512 5dc2e8c407735c02f5644a6126764e67d923ecd066fb0e95c4cc53832f6f40588e89d39b1e64ad1d028f432547de4bab795c7edc46c7e5bcc26eb6594578b119
-DIST sslyze-2.0.3.tar.gz 9768486 BLAKE2B 03ed579301cef3b26753d0480a676b64eaf2651a31e20522bb85c7d9799a832cf803324c5c29287510569051edbc83a4e994bb74d07c0cd94829caa989de5c60 SHA512 a2adf3059c00ac1d499953d2e692a222be4f47e00677e9cf7abe1f020e686b43c9385a9f8fbc306ecb26b5f372858a134b166f21ad939a38f3fcce299767e106
 DIST sslyze-2.0.6.tar.gz 10797060 BLAKE2B 967f18bd8645053bd9798badcbe4a1d427b1c9c591cf5c2930960db28327a2c438a7a35e72a710043bc7731a44b6c9b4dfbef0029725a2da1c17d58fcf190b32 SHA512 fd483580a7daed2b6035546b56f4339536319a96626ca7db36f35abb64a4226e44f8c3e3a4cea8ffc2ed10d3831e3ee72ee695c6d26a0148b146682afab5eea6
+DIST sslyze-2.1.1.tar.gz 10541806 BLAKE2B 4775d22e4b5c0bf928a1c4456ea0c5bed9b7ec6aabc74414c906f686a0ec6d9b7c7253e343402aac4867e3d92eda27cd2a83e9671839f6ef49fbd64140fa8d08 SHA512 7a66fd51a95c56f543eb5c228429392758797de398546fca3aa11a1a8d156dd3029cdb63b486d5b800e7db7b05e727df14f3dca6bf7fdd6ee3df8745ad0c901e

net-analyzer/sslyze/sslyze-2.0.3.ebuild

@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Fast and full-featured SSL scanner"
-HOMEPAGE="https://github.com/nabla-c0d3/sslyze"
-SRC_URI="https://github.com/nabla-c0d3/sslyze/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="=dev-python/nassl-2.1*[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	>=dev-python/tls_parser-1.2.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]"
-
-src_prepare(){
-	rm -r tests
-	sed -i "s|cryptography==2.3|cryptography>=2.3|g" setup.py
-	eapply_user
-}

net-analyzer/sslyze/sslyze-2.1.1.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Fast and full-featured SSL scanner"
@@ -16,14 +16,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="=dev-python/nassl-2.1*[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+RDEPEND="=dev-python/nassl-2.2*[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
 	>=dev-python/tls_parser-1.2.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6)
 	virtual/python-typing[${PYTHON_USEDEP}]"
 
 src_prepare(){
 	rm -r tests
-	sed -i "s|cryptography==2.3|cryptography>=2.3|g" setup.py
+	sed -i "s|cryptography==2.5|cryptography>=2.5|g" setup.py
 	eapply_user
 }

profiles/pentoo/base/package.accept_keywords/dev-python

@@ -77,9 +77,8 @@ dev-python/simplesoapy
 =dev-python/ntlm-auth-1*
 
 #sslyze
-=dev-python/nassl-2.1*
+=dev-python/nassl-2.2*
 =dev-python/tls_parser-1.2*
-=dev-python/cryptography-2.4*
 #nassl
 =dev-python/invoke-1.1*
 
@@ -387,3 +386,6 @@ dev-python/django-extensions
 
 #nessus api
 dev-python/nessrest
+
+#sslyze
+dev-python/dataclasses

profiles/pentoo/base/package.accept_keywords/net-analyzer

@@ -96,7 +96,7 @@ net-analyzer/nmap
 net-analyzer/snort
 ~net-analyzer/sslsniff-0.8
 ~net-analyzer/sslstrip-0.9
-=net-analyzer/sslyze-2.0*
+=net-analyzer/sslyze-2.1*
 =net-analyzer/sslscan-1.11*
 ~net-analyzer/subdomainer-1.3
 ~net-analyzer/tcpdump-4.3.0