diff --git a/dev-python/invoke/invoke-1.4.1.ebuild b/dev-python/invoke/invoke-1.4.1.ebuild index a0c17b3fd..8534ed83c 100644 --- a/dev-python/invoke/invoke-1.4.1.ebuild +++ b/dev-python/invoke/invoke-1.4.1.ebuild @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 @@ -11,11 +13,11 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="" -BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="" +DEPEND="${RDEPEND}" # Depends on broken pytest-relaxed plugin RESTRICT="test" diff --git a/dev-python/nassl/Manifest b/dev-python/nassl/Manifest index 297f81bd3..dce1ce1a5 100644 --- a/dev-python/nassl/Manifest +++ b/dev-python/nassl/Manifest @@ -1,4 +1,6 @@ DIST nassl-3.0.0.tar.gz 221298 BLAKE2B 682476eda51adfde9b42a9b6b9e97449e702be9257bc281fb2e60fc091f8aa3a43016128b56538c0adbe84e5d4c80508a3d02281fb8f5750629d7f03b0659f13 SHA512 bbaaee5564931901576f353944a00177bf09bd4d25a8c8bc1d2ea8877922848454987acf93f91ca3018cb5366a5967cb2865995a314f036696c7eeb5a2634bdb +DIST nassl-3.1.0.tar.gz 222912 BLAKE2B c3e9c94f4e76a191889f45dbd29d8f3b08aade3780e21fa5b555d313d229e3f5f840c834ec0dee7b4904f7bb8a6a80ac787eeb11022a3e4d4dbe223469581433 SHA512 ce0ae332e0da46341e320f76cc6bdc582232f4e28d0e6212e6b140d6e8aeab6a4e11e9ef776c01243c903c19899639f35e754ed6418a3dedd22801561107c08f DIST openssl-OpenSSL_1_0_2e.zip 7242974 BLAKE2B c3e2a67d60067416627d0b61e4ee465488f329e1e9730ffe9980cc075caf583021ed3439d4fc1a504e039504f4b828b144a6673155171cb088ccc80fb8b8f222 SHA512 96ec9e8eff65387238ca523b7e5b3d330098a446af86ec1772e24eda99e63ef28364b5fa32e89f4dad2a38f07da9dd2a53f93eacf8040f94e93f03297f4a0508 DIST openssl-OpenSSL_1_1_1.zip 17160238 BLAKE2B 9ff0510c112e9054a683896ec493e5fb76a88d281a28c0ef577ec722f8ba05129e00e62ca82e72d750785c2bd2ebf0365d977b417f6cecf9d3de12e75631f2d6 SHA512 9db4bf391739f4e835bcfda10533d49a7231508faf25d88d880dfadc98ffd3b503d58879368ff17bed33d7775c1f0eb6991aa71d6888f50c5ad65b2d221be18e +DIST openssl-OpenSSL_1_1_1h.zip 11789281 BLAKE2B 365bdb007e65587de2dcf1e7e7fdbf88a9403ea1444bf103e6c2be24b389a86351f3e2042aa7df807594888790f9967c8a1133a0aaebe715d4fb2c5602eeeae6 SHA512 ae7bf96158069eba4c19f67dbaecf3408c99f2cd4f4fe8cacea998149899ab273e31304ef2e404f32ce31b1be795503f65661c9cdd0dc4fec5da5a10f91b7844 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae diff --git a/dev-python/nassl/nassl-3.0.0-r1.ebuild b/dev-python/nassl/nassl-3.0.0.ebuild similarity index 98% rename from dev-python/nassl/nassl-3.0.0-r1.ebuild rename to dev-python/nassl/nassl-3.0.0.ebuild index 4a09138fd..d9cc78cfe 100644 --- a/dev-python/nassl/nassl-3.0.0-r1.ebuild +++ b/dev-python/nassl/nassl-3.0.0.ebuild @@ -50,7 +50,7 @@ src_compile() { compile_python() { ${EPYTHON} setup.py build_ext #https://github.com/nabla-c0d3/nassl/issues/63 -# MAKEOPTS="${MAKEOPTS} -j1" + MAKEOPTS="${MAKEOPTS} -j1" distutils-r1_python_compile } python_foreach_impl compile_python diff --git a/dev-python/nassl/nassl-3.1.0.ebuild b/dev-python/nassl/nassl-3.1.0.ebuild new file mode 100644 index 000000000..307dfc376 --- /dev/null +++ b/dev-python/nassl/nassl-3.1.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit distutils-r1 + +#openssl system can be used optionally +#something to investigate in https://github.com/nabla-c0d3/sslyze/issues/101 +#see tags in "build_tasks.py" file +MY_OPENSSL_MODERN="OpenSSL_1_1_1h" +MY_OPENSSL_LEGACY="OpenSSL_1_0_2e" +MY_ZLIB="zlib-1.2.11" + +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 + https://github.com/openssl/openssl/archive/${MY_OPENSSL_MODERN}.zip -> openssl-${MY_OPENSSL_MODERN}.zip + https://zlib.net/${MY_ZLIB}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="dev-python/invoke[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +src_prepare() { + rm -r tests + + 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" + + eapply_user +} + +src_compile() { + #https://github.com/nabla-c0d3/nassl/issues/42 + python3 /usr/bin/invoke build.zlib --do-not-clean + python3 /usr/bin/invoke build.legacy-openssl --do-not-clean + python3 /usr/bin/invoke build.modern-openssl --do-not-clean + + compile_python() { + ${EPYTHON} setup.py build_ext + #https://github.com/nabla-c0d3/nassl/issues/63 + MAKEOPTS="${MAKEOPTS} -j1" + distutils-r1_python_compile + } + python_foreach_impl compile_python +} diff --git a/dev-python/tls_parser/tls_parser-1.2.2.ebuild b/dev-python/tls_parser/tls_parser-1.2.2.ebuild index 59d89628e..8c56d925a 100644 --- a/dev-python/tls_parser/tls_parser-1.2.2.ebuild +++ b/dev-python/tls_parser/tls_parser-1.2.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/nabla-c0d3/tls_parser/archive/${PV}.tar.gz -> ${P}.t LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="" diff --git a/net-analyzer/sslyze/Manifest b/net-analyzer/sslyze/Manifest index 53590910c..8f3a5d886 100644 --- a/net-analyzer/sslyze/Manifest +++ b/net-analyzer/sslyze/Manifest @@ -1,2 +1,3 @@ DIST sslyze-3.0.5.tar.gz 10688207 BLAKE2B 24a615e6fe5af6bb8bacc963d30ed41a1cde2a3286efb93f85c92ad7e549e1995d27b5e69999fed5c4594ec59164da3ca8c1c7f7b1485e5964d3ef9e48568ded SHA512 fc1b8ff82a60f2a442da0f3f8912b1216c3d0aeee09bdb33f82215fd7f005519e1c4eb2c2dcb740a7236b33cd030a3fee1250c49a693c4e79e15f66bcb8b0603 DIST sslyze-3.0.8.tar.gz 10769832 BLAKE2B c1c032bfb495a0f1873562008cc0440cf043d26a4b737ad09f5ca2e1ab3c75c522c0dcc97fce5df7b8cfe0284518199184c08ae62324758074bd446edac75305 SHA512 8a0c3c1c58f7d9da262feaaf660410790b011fa48d28e2ee0ca3a7d35a39adea6cb401a4a08d52822cb8fde34a219a982547a9e7fd50681889d50d18c9139f8b +DIST sslyze-3.1.0.tar.gz 10774945 BLAKE2B 30371306f7d789cad00dc9419a278ad08979c8762b760df82bfd0ea0cf023971ee5a22ecef8b6880f010e2150ac4a053a6c9d7f29389dd083d6c2b4c0d3a1f0e SHA512 9834460e69e6fa58425cb76fb46cda9f2585b494e63887e4461081c5f36b51dd255bf69b299534b1044e794dce9de58f1a1644bd3f9cbacd26ebbca62e44ee07 diff --git a/net-analyzer/sslyze/sslyze-3.1.0.ebuild b/net-analyzer/sslyze/sslyze-3.1.0.ebuild new file mode 100644 index 000000000..b62dd6921 --- /dev/null +++ b/net-analyzer/sslyze/sslyze-3.1.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{7,8} ) +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="test" + +DEPEND="" +RDEPEND="=dev-python/nassl-3.1*[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.6[${PYTHON_USEDEP}] + >=dev-python/tls_parser-1.2.2[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_7 )" + +src_prepare(){ + rm -r tests + eapply_user +} diff --git a/net-analyzer/wfuzz/wfuzz-2.4.7-r1.ebuild b/net-analyzer/wfuzz/wfuzz-2.4.7-r1.ebuild deleted file mode 100644 index 09e3e3bfe..000000000 --- a/net-analyzer/wfuzz/wfuzz-2.4.7-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit distutils-r1 multilib - -DESCRIPTION="Wfuzz is a tool designed for bruteforcing Web Applications" -HOMEPAGE="http://www.edge-security.com/wfuzz.php https://github.com/xmendez/wfuzz" -SRC_URI="https://github.com/xmendez/wfuzz/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - >=dev-python/pycurl-7.43.0.2[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.3.0[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/shodan[${PYTHON_USEDEP}]" - -python_prepare_all() { - # FIXME: https://github.com/xmendez/wfuzz/issues/135 - sed -e "/data_files/d" -i setup.py || die "sed failed" - # https://github.com/xmendez/wfuzz/pull/214 - sed -e "s|pyparsing>3\*|pyparsing|" -i setup.py || die "sed failed" - distutils-r1_python_prepare_all -} diff --git a/net-analyzer/wfuzz/wfuzz-3.0.1.ebuild b/net-analyzer/wfuzz/wfuzz-3.0.1.ebuild deleted file mode 100644 index cd6d8ceda..000000000 --- a/net-analyzer/wfuzz/wfuzz-3.0.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 multilib - -DESCRIPTION="Wfuzz is a tool designed for bruteforcing Web Applications" -HOMEPAGE="http://www.edge-security.com/wfuzz.php https://github.com/xmendez/wfuzz" -SRC_URI="https://github.com/xmendez/wfuzz/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - >=dev-python/pycurl-7.43.0.2[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.3.0[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/shodan[${PYTHON_USEDEP}]" - -python_prepare_all() { - #https://github.com/xmendez/wfuzz/issues/215 - sed -e "/'pytest',/d" -i setup.py || die "sed failed" - # https://github.com/xmendez/wfuzz/pull/214 - sed -e "s|pyparsing>2.4\*|pyparsing>=2.4\*|" -i setup.py || die "sed failed" - distutils-r1_python_prepare_all -} diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python index 209f1bcc5..c335896eb 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-python +++ b/profiles/pentoo/base/package.accept_keywords/dev-python @@ -79,12 +79,6 @@ dev-python/pywerview =dev-python/requests-ntlm-1.1* =dev-python/ntlm-auth-1* -#sslyze -=dev-python/nassl-3.0* -=dev-python/tls_parser-1.2* -#nassl -dev-python/invoke - #gplaycli =dev-python/ipython-7* ~dev-python/ipyparallel-6.2.3 diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer index 75de8d27b..ad972f292 100644 --- a/profiles/pentoo/base/package.accept_keywords/net-analyzer +++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer @@ -33,7 +33,6 @@ net-analyzer/sitadel net-analyzer/scamper net-analyzer/smbmap net-analyzer/sqlninja -net-analyzer/sslyze net-analyzer/subfinder net-analyzer/sublist3r net-analyzer/termshark