From 2c27e7e02eee4fd292b94f75dec2c5a8fac6da1d Mon Sep 17 00:00:00 2001 From: blshkv Date: Mon, 3 Dec 2018 10:16:35 +0800 Subject: [PATCH] sslyze: 2.0.2 bump, cleanup --- dev-python/nassl/Manifest | 7 +-- dev-python/nassl/nassl-0.17.0.ebuild | 27 ---------- dev-python/nassl/nassl-1.0.3.ebuild | 29 ----------- dev-python/nassl/nassl-1.1.0.ebuild | 29 ----------- dev-python/nassl/nassl-1.1.3-r2.ebuild | 47 ------------------ dev-python/nassl/nassl-2.1.2.ebuild | 49 +++++++++++++++++++ net-analyzer/sslyze/Manifest | 3 +- net-analyzer/sslyze/sslyze-1.4.3.ebuild | 23 --------- ...slyze-2.0.0.ebuild => sslyze-2.0.2.ebuild} | 1 + 9 files changed, 52 insertions(+), 163 deletions(-) delete mode 100644 dev-python/nassl/nassl-0.17.0.ebuild delete mode 100644 dev-python/nassl/nassl-1.0.3.ebuild delete mode 100644 dev-python/nassl/nassl-1.1.0.ebuild delete mode 100644 dev-python/nassl/nassl-1.1.3-r2.ebuild create mode 100644 dev-python/nassl/nassl-2.1.2.ebuild delete mode 100644 net-analyzer/sslyze/sslyze-1.4.3.ebuild rename net-analyzer/sslyze/{sslyze-2.0.0.ebuild => sslyze-2.0.2.ebuild} (92%) diff --git a/dev-python/nassl/Manifest b/dev-python/nassl/Manifest index 743ca337f..7f9963c91 100644 --- a/dev-python/nassl/Manifest +++ b/dev-python/nassl/Manifest @@ -1,11 +1,6 @@ -DIST nassl-0.17.0.tar.gz 3665705 BLAKE2B e1b2813117e341381fb30f4ada802ddeb3a6546efc3d47000af61b2641abab62164c6847efa92f25c9c35fa7d9d38f8a981fff118c686e809eff50cec479829b SHA512 bbcaacf9bbb1c7e6a4e41339736c510dd7f025771bf2024a593a0277e191f3b8b4092d8033ecb40de81296e49e5c51cefe4c845ed5cdbf416bfcaffe6b13e42d -DIST nassl-1.0.3.tar.gz 7295365 BLAKE2B f176b554563ab4aacc3c1c6c9b4e55951aa6bb19086c7802871b396b3ff3aa6f5bec48fbde201334725021cead2f7d72a17ad543c8ad3023bd49ae4e9a9ff548 SHA512 b144c4badf9b7efc98c20f84a2cd20d5e11943a6fe81640af69a1daf2959a4542e107b852f3af015ad67f49ad8a7122f70ce7dad4778eac4a563517c9e6c2880 -DIST nassl-1.1.0.tar.gz 8742631 BLAKE2B 773bcbee7464d9cda4cbcd228ab747fd3c460180e8a3b243313faf8ff2941e082e2590abe8a97eade08c92abfe12895dc9b2d0de04c067c92341776be7e78ed1 SHA512 cf2a9a6dc34e3b2a2b8b268e54bf902a454328f873e064d4a6c783c7e3e93e3083b5e15eb1819a50d591003b8dc0c9698d197b49790bb3e407f18eb6863a9ac2 -DIST nassl-1.1.3.tar.gz 1995462 BLAKE2B 706969ba9ef9e171c42d35e1a6fb81b4b0114763cd95aabc8f941758314d4233fa272fd3facf43a2604e82489be01d9bbfd4a1d76e7437fd9bec68bb8c8512e8 SHA512 4c31c2c626f7aa36b9e39a9b1772f94addf818b4d63aaa5fa7f4d3188fa72af7beec653ea3628c1ce42d062c09b67fe90ad2667bb08468cb4b1e4b2c85929f5c 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 openssl-1.0.2e.tar.gz 5256555 BLAKE2B ef501f5e86857b1bb0ff0a28468bdff07010bc76801d15851adf7ca28e174d552f580b04a02d068a9e4f0d3da51abdf8ddeb9f37dd31e1445720bb9ed73c6bc1 SHA512 b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f -DIST openssl-1f5878b8e25a785dde330bf485e6ed5a6ae09a1a.zip 18391488 BLAKE2B 999c74b137207b6a5c2696625c0c20477cf875a0ab4f840f47fb024846afd911dd7d2ff0601235b330ea3708218e4e787af91b6b7c9ac74f5c0bb58c61e655c3 SHA512 1fb593167358b0eaddf09d82f4ba6e1e0836813d13296b41b47d7f7fe71a7fe8326639ac91050cba69c77b6f268b83a98beea272ff2da0aaf0d092a8539f2978 +DIST nassl-2.1.2.tar.gz 207747 BLAKE2B 66d4c684249d2387100256a8f95cb199b40ed5085115f1db392a60caae96dd3e184868e34d94aac6011d60bac1353d0f92c5b567203e8a054a57c1ae1b8ed817 SHA512 6afef2eb670d25dae81d66fa9e78f3e702e61beda98cd26256ebf385ee44cd6e1822cdeee525473441b4fbf1e0fe0c6511cadf5174e3a0a143f98de52a8f6344 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 diff --git a/dev-python/nassl/nassl-0.17.0.ebuild b/dev-python/nassl/nassl-0.17.0.ebuild deleted file mode 100644 index 9b6d45e48..000000000 --- a/dev-python/nassl/nassl-0.17.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 flag-o-matic - -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" -SRC_URI="http://dev.pentoo.ch/~blshkv/distfiles/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -src_compile() { - append-cflags -fno-strict-aliasing - append-ldflags -Wl,-z,noexecstack - python2.7 setup.py build -} diff --git a/dev-python/nassl/nassl-1.0.3.ebuild b/dev-python/nassl/nassl-1.0.3.ebuild deleted file mode 100644 index 37cf24bb5..000000000 --- a/dev-python/nassl/nassl-1.0.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -inherit distutils-r1 flag-o-matic - -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" -SRC_URI="http://dev.pentoo.ch/~blshkv/distfiles/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -#typing; python_version < '3.5' -#enum34; python_version < '3.4' -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -distutils-r1_python_compile() { - append-cflags -fno-strict-aliasing - append-ldflags -Wl,-z,noexecstack - esetup.py build -} diff --git a/dev-python/nassl/nassl-1.1.0.ebuild b/dev-python/nassl/nassl-1.1.0.ebuild deleted file mode 100644 index 37cf24bb5..000000000 --- a/dev-python/nassl/nassl-1.1.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -inherit distutils-r1 flag-o-matic - -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" -SRC_URI="http://dev.pentoo.ch/~blshkv/distfiles/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -#typing; python_version < '3.5' -#enum34; python_version < '3.4' -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -distutils-r1_python_compile() { - append-cflags -fno-strict-aliasing - append-ldflags -Wl,-z,noexecstack - esetup.py build -} diff --git a/dev-python/nassl/nassl-1.1.3-r2.ebuild b/dev-python/nassl/nassl-1.1.3-r2.ebuild deleted file mode 100644 index 810c463f2..000000000 --- a/dev-python/nassl/nassl-1.1.3-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6} ) -inherit distutils-r1 flag-o-matic - -#something to investigate in https://github.com/nabla-c0d3/sslyze/issues/101 -#can system packages be used? -MY_COMMIT="1f5878b8e25a785dde330bf485e6ed5a6ae09a1a" -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_COMMIT}.zip -> openssl-${MY_COMMIT}.zip - https://ftp.openssl.org/source/old/1.0.2/${MY_OPENSSL_LEGACY}.tar.gz - 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}]" - -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -src_prepare(){ - ln -s "${WORKDIR}/${MY_OPENSSL_LEGACY}" "${S}"/ - ln -s "${WORKDIR}/${MY_ZLIB}" "${S}/" - ln -s "${WORKDIR}/openssl-${MY_COMMIT}" "${S}"/openssl-master - ./build_from_scratch.py - eapply_user -} - -python_compile() { - if [[ ${EPYTHON} == python2* ]]; then - append-cflags -fno-strict-aliasing -# append-ldflags -Wl,-z,noexecstack - fi - distutils-r1_python_compile -} diff --git a/dev-python/nassl/nassl-2.1.2.ebuild b/dev-python/nassl/nassl-2.1.2.ebuild new file mode 100644 index 000000000..f06123dbf --- /dev/null +++ b/dev-python/nassl/nassl-2.1.2.ebuild @@ -0,0 +1,49 @@ +# 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" +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(){ + 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" + + #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 + + eapply_user +} diff --git a/net-analyzer/sslyze/Manifest b/net-analyzer/sslyze/Manifest index d4ae542c7..96cbc1289 100644 --- a/net-analyzer/sslyze/Manifest +++ b/net-analyzer/sslyze/Manifest @@ -1,3 +1,2 @@ -DIST sslyze-1.4.3.tar.gz 2609633 BLAKE2B 25519f5aa2a64d8ff2bee967255b639a1ca40651c9b70bf561a334a832c3274448b225bd03346ed7446827f39f6a7cde671e6cf5cec02d3095eb6edbb3fde317 SHA512 e57cbfbf15d7d4138e29ef0c33c04bf034853bbe80c5bf34ebe1631deb22b29b4ce593f6f1ab73a5a154feb87b4c566f35e66de79a3cf03e44721aaf728fa519 -DIST sslyze-2.0.0.tar.gz 9664964 BLAKE2B 2e6e938abc8936d4d189544fca8306383538741dc56ad2c887fa1bd1607831b0c8c9bc2b6fd812cf6e3ee3cbdf053863e507df0a3d0479320356e544990d7b2d SHA512 faa7903e5886e8d262147861917283af36a5932963f1a214cb161fee7178bf03f07785e587ac9011b556f1138a46f75bc5658be6b0ce3b35e0d455af94213eb6 DIST sslyze-2.0.1.tar.gz 9669587 BLAKE2B 821a2883259dfb73ed09d3a57aba8b60736c34867897d668575250221ebe88ac180c3dd20122b02887a18d4d46053e1fa277207ee35ace9a5795e4a105a4eae1 SHA512 5dc2e8c407735c02f5644a6126764e67d923ecd066fb0e95c4cc53832f6f40588e89d39b1e64ad1d028f432547de4bab795c7edc46c7e5bcc26eb6594578b119 +DIST sslyze-2.0.2.tar.gz 9768759 BLAKE2B 3a7a0b219a0dccadb2609659a77f8aa0582a0a5a50b824b2d3db6f1b5ae94b84f5b278cd038ecbf5fb89e8e7cab6e87ca6df7b40f5c42004eeca8d88e96504b2 SHA512 14c9b3a5fbf38f44ed7fbe9c33d72d60a7f77c8ae1c3c0ad5abf11a51a95b71ec81709eec01a8da9e4db382c7a419842328a6139f64733cfc2d35c83eebada24 diff --git a/net-analyzer/sslyze/sslyze-1.4.3.ebuild b/net-analyzer/sslyze/sslyze-1.4.3.ebuild deleted file mode 100644 index d978c9726..000000000 --- a/net-analyzer/sslyze/sslyze-1.4.3.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{4,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-1.1*[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.2.2[${PYTHON_USEDEP}] - >=dev-python/tls_parser-1.2.0[${PYTHON_USEDEP}] - virtual/python-enum34[${PYTHON_USEDEP}] - virtual/python-typing[${PYTHON_USEDEP}]" diff --git a/net-analyzer/sslyze/sslyze-2.0.0.ebuild b/net-analyzer/sslyze/sslyze-2.0.2.ebuild similarity index 92% rename from net-analyzer/sslyze/sslyze-2.0.0.ebuild rename to net-analyzer/sslyze/sslyze-2.0.2.ebuild index 195d013c7..b530410a7 100644 --- a/net-analyzer/sslyze/sslyze-2.0.0.ebuild +++ b/net-analyzer/sslyze/sslyze-2.0.2.ebuild @@ -24,5 +24,6 @@ RDEPEND="=dev-python/nassl-2.1*[${PYTHON_USEDEP}] src_prepare(){ rm -r tests + sed -i "s|cryptography==2.3|cryptography>=2.3|g" setup.py eapply_user }