From c4922c89926839e513d77465fdd7c45cc8f6b2a3 Mon Sep 17 00:00:00 2001 From: blshkv Date: Fri, 29 Dec 2017 10:54:43 +0800 Subject: [PATCH] sslyze: 1.3.2 bump --- dev-python/nassl/Manifest | 2 +- ...nassl-0.16.3.ebuild => nassl-1.0.3.ebuild} | 8 +++-- net-analyzer/sslyze/Manifest | 3 +- net-analyzer/sslyze/sslyze-1.1.5.ebuild | 32 ------------------- ...slyze-1.2.0.ebuild => sslyze-1.3.2.ebuild} | 12 +++---- 5 files changed, 13 insertions(+), 44 deletions(-) rename dev-python/nassl/{nassl-0.16.3.ebuild => nassl-1.0.3.ebuild} (79%) delete mode 100644 net-analyzer/sslyze/sslyze-1.1.5.ebuild rename net-analyzer/sslyze/{sslyze-1.2.0.ebuild => sslyze-1.3.2.ebuild} (71%) diff --git a/dev-python/nassl/Manifest b/dev-python/nassl/Manifest index 2ac639eaa..da22251dc 100644 --- a/dev-python/nassl/Manifest +++ b/dev-python/nassl/Manifest @@ -1,3 +1,3 @@ -DIST nassl-0.16.3.tar.gz 3665258 SHA256 d70eca48f9bf1f04515eac1e1e9a2d95404d2676a1c2e2858165685cd93f3850 SHA512 85938edf4e8ecbf7edb0ef5d98cdee8a7f8b9aa465df3c135c33e7f4b2ad840fc922eb2b914ef6e16a6b1cabf741ce9f40b8d2dc7b2aa56776d777721292d4d2 WHIRLPOOL 20e400511af51ae0a60f2fb872b6ecc75074b673f68671a31086af8ca5b93b7ff090fc38b3aa5749d68f7bf8c030bb747f3db5b68c64834c35e6189ad807c4da DIST nassl-0.17.0.tar.gz 3665705 SHA256 a0db0046068239ae39a754d90251074c54a5c0bd4562b1dd798c75196a3ce3cd SHA512 bbcaacf9bbb1c7e6a4e41339736c510dd7f025771bf2024a593a0277e191f3b8b4092d8033ecb40de81296e49e5c51cefe4c845ed5cdbf416bfcaffe6b13e42d WHIRLPOOL 337cb3e1a582c9ab97cfd6120933a81b878cc1b68e84b1d4538da4d8fd102e4136d7545c484cdee5002e65d19f3f5fdf4b55987835c74be949ebd3087c0ea078 DIST nassl-1.0.1.tar.gz 7294067 SHA256 e5e1cd9d0001999cc00797fa6b963aca61bf7d6112ed296e79e487cacbf1abfc SHA512 0fcbbdd2bcc1e370e21bab8cbadc6bb6826148409dd22d309d4d5ee283d0b973bc69cdb4fc5622f95b0fb8bbbc0fe62e08216962af97e36e7228ae9fdd5be6d9 WHIRLPOOL d5b8f4a481ff2f9f7faf6eeccd083e40832b0225df96501925a0299d1daa0e8f0803061847019fd2d78ace77bede77927d68ef913c79f2ef4d4f3a22fdbb0968 +DIST nassl-1.0.3.tar.gz 7295365 SHA256 5ed1baa7f4737052c7277477e8c1a3266fa2ba3ba0988cae030ef19e87ececbf SHA512 b144c4badf9b7efc98c20f84a2cd20d5e11943a6fe81640af69a1daf2959a4542e107b852f3af015ad67f49ad8a7122f70ce7dad4778eac4a563517c9e6c2880 WHIRLPOOL b62821bd78281af561500907661469d34a29642520bda6fc5c509817e26cb5f2a7d750c58e3b863280fe5142f6f9527c17854dddf4d7b39c3d46ed4fc25a94c6 diff --git a/dev-python/nassl/nassl-0.16.3.ebuild b/dev-python/nassl/nassl-1.0.3.ebuild similarity index 79% rename from dev-python/nassl/nassl-0.16.3.ebuild rename to dev-python/nassl/nassl-1.0.3.ebuild index 9b6d45e48..80b478378 100644 --- a/dev-python/nassl/nassl-0.16.3.ebuild +++ b/dev-python/nassl/nassl-1.0.3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) inherit distutils-r1 flag-o-matic DESCRIPTION="Experimental Python wrapper for OpenSSL" @@ -16,12 +16,14 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" +#typing; python_version < '3.5' +#enum34; python_version < '3.4' RDEPEND="" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" -src_compile() { +distutils-r1_python_compile() { append-cflags -fno-strict-aliasing append-ldflags -Wl,-z,noexecstack - python2.7 setup.py build + esetup.py build } diff --git a/net-analyzer/sslyze/Manifest b/net-analyzer/sslyze/Manifest index 38243c1bb..5eb79a1df 100644 --- a/net-analyzer/sslyze/Manifest +++ b/net-analyzer/sslyze/Manifest @@ -1,3 +1,2 @@ -DIST sslyze-1.1.5.tar.gz 2555126 SHA256 c9ad321d3c5170306bf9cbd7c158cc238803768249e1874ca74a787c0041481b SHA512 66c2e8eeeded3e301e86a64bc39489d799722db7f998a231c25bc9653289de1af0332fd5ce48c747976465608daec20d86f07bef43cd069138c7305caeac776a WHIRLPOOL 56558988dcdc5fa123b7e18bb4b16112a62f9deb3e36f6e63a682ab60d213198161fe146cf8fbf8b07c32ea100357d6bf959c122ea7bfe492cfcc026b4214512 -DIST sslyze-1.2.0.tar.gz 2543841 SHA256 8dc5b3fa48e447ac6f878cf1c443ccd472616a6b0054961b390efb5e36614fa4 SHA512 caed8541fc18629f43a823e672bf4c736d1149ff827abeb4b6a8b41966d083a3d9a47e0773bbf1c0d04a30054548f9823558b86364b61eda7eefcbe20d4519bc WHIRLPOOL a5238e23c19f41caf24fa5eb5120b9981176f7279226251346cb6b45fc9410c0353577e6cedfbcfc850374d12793704b472a8928237fbc700ff558a7ebf4267d DIST sslyze-1.3.0.tar.gz 2550770 SHA256 fa78697f706c123ada3afa09c7210af4172fdba39580516390711f3548b9972d SHA512 fa354b3f1641e164d00f8a77042c3a07600c91f06c1acee200c9c3457353a04339e2caf4929e4cc46087fa24e70ad74cb014f733c62af6725c3f9f96900ff3cd WHIRLPOOL 455c29ff064ea3324389f0147fd20a5ec573cb66b62ace156e86ff2877c1e4e8647067c5350034bfa02dddce372d3586d29612521bb56135a5108703b3fd085d +DIST sslyze-1.3.2.tar.gz 2602857 SHA256 b48dbdf0d46b9851cf81e9f3e16f8c2caf35e995012e22678da558fa056c39c8 SHA512 3a267a378a440b7fafafb6c28fa3ebb6bc1bbbc67a8d6a43dffde7b7df18cedb6bd14cd6e8af755f6173d44460c5b2fc83c9ff068c60db25ca4c8df0967eed93 WHIRLPOOL a4e0eecadef29d2d5ce6120e045c3f3afb07fd2bd09187eac6d91e532c6628eba3cdc0f1f67edd8166dace23fb0e475a05895c2ab459d2993fa0c782d72d9a00 diff --git a/net-analyzer/sslyze/sslyze-1.1.5.ebuild b/net-analyzer/sslyze/sslyze-1.1.5.ebuild deleted file mode 100644 index 6c3ee1518..000000000 --- a/net-analyzer/sslyze/sslyze-1.1.5.ebuild +++ /dev/null @@ -1,32 +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 versionator - -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-$(get_version_component_range 1-2)*" -RDEPEND="=dev-python/nassl-0.17* - dev-python/typing - dev-python/enum34 - >=dev-python/cryptography-1.9 <=dev-python/cryptography-2.0.3 - =dev-python/tls_parser-1.1.0 -" -#typing; python_version < '3.5' -#enum34; python_version < '3.4' - -python_prepare_all(){ - sed -e "s|cryptography==1.9|cryptography>=1.9, <=2.0.3|" -i setup.py - distutils-r1_python_prepare_all -} diff --git a/net-analyzer/sslyze/sslyze-1.2.0.ebuild b/net-analyzer/sslyze/sslyze-1.3.2.ebuild similarity index 71% rename from net-analyzer/sslyze/sslyze-1.2.0.ebuild rename to net-analyzer/sslyze/sslyze-1.3.2.ebuild index 4c441d700..b2291910f 100644 --- a/net-analyzer/sslyze/sslyze-1.2.0.ebuild +++ b/net-analyzer/sslyze/sslyze-1.3.2.ebuild @@ -20,13 +20,13 @@ DEPEND="" RDEPEND="=dev-python/nassl-1.0*[${PYTHON_USEDEP}] dev-python/typing[${PYTHON_USEDEP}] dev-python/enum34[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.9[${PYTHON_USEDEP}] <=dev-python/cryptography-2.0.3[${PYTHON_USEDEP}] - =dev-python/tls_parser-1.1.0[${PYTHON_USEDEP}]" + >=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}] + >=dev-python/tls_parser-1.2.0[${PYTHON_USEDEP}]" #typing; python_version < '3.5' #enum34; python_version < '3.4' -python_prepare_all(){ - sed -e "s|cryptography==1.9|cryptography>=1.9, <=2.0.3|" -i setup.py - distutils-r1_python_prepare_all -} +#python_prepare_all(){ +# sed -e "s|cryptography==1.9|cryptography>=1.9, <=2.0.3|" -i setup.py +# distutils-r1_python_prepare_all +#}