gentoo resync : 28.04.2021

5 files changed, 46 insertions, 12 deletions

diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 538f6814cd77..9027d733f488 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,10 +1,12 @@
+DIST sslscan-2.0.10.tar.gz 110417 BLAKE2B 88c095096dd615b13e3c68e6ece7eff8588e7debe65c5c6b228392d78c806029a2bc18a6c42bee480e2bb669b39753b39de160917eafbb654f5d8b64ba50d309 SHA512 d6adc76579dd99648359e9694b615bf1d9be90d71736e49305fefa0c0e1e386af2457c534136d8da2219c080b1119873f54a4cdf1b82675f0ce24f4e6ae068ee
 DIST sslscan-2.0.6.tar.gz 109597 BLAKE2B 30c0dc329d252fbb91800e470cad84214fbe30694c33fa388040838da24ca73b0857f19603ca7e71dc84fe4ca10977b2d4c0145a752718225f5225540184dee5 SHA512 2f7236f101e1ab75a6fb2efc8fed2949a410b4c67156e88865724e0f399a6e749218253d49c122f1e046022634ef62dcc2b4f97833fd33f90a3ba5a2b7e06c6c
 DIST sslscan-2.0.8.tar.gz 109713 BLAKE2B 3c28eda337145556a968be66bb7924f95cd7ad8eb9bab04531cad7d3a274f5e337804d3223903369df63c97884b6373f0b207e3691857a6b65591e7d067f51dc SHA512 5260e8da881b7757d69b1f8a9640a9c1593c6537a9f66e9250c9183697e7768488d24bab1eef713a1907a773689587bd1b2856caebe6d8df3cf509273a2cf7fd
 DIST sslscan-2.0.9.tar.gz 109501 BLAKE2B a979d6da6fee9e206ce2676aeceaa224affd26b216a67caabe8ba5ec3959b0aa27e005ad79f067bee5c4801d292a35ce4fc061a94f58125437e64bbe8ef2c2d8 SHA512 968b55ec34320784983cfddc796fb798871534c5561661b1691dc3516537763fdb0541c2f89fae1ef1dd586b213d743f01e1b040907434191713af981a2fc495
 DIST sslscan-OpenSSL_1_1_1h.tar.gz 9985614 BLAKE2B 78f8bcf04a5a03636efe4ea2f82cfbbf6528ed1b02f64b7b7cf773809f5bed11974fd6d2f9f9bddb7fc31e986997f0987a0a773da2bd10b842f3ace977c5c56a SHA512 619dc7b28151571e4410844263a6727c9883701c11a064a2df55368659a63d548179165c9b96910b0e739cec1142f109eae9503b688cbade7abd6b4f3a7563aa
 DIST sslscan-OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e
 DIST sslscan-OpenSSL_1_1_1k.tar.gz 9996510 BLAKE2B 755bbdfa5738e2f2d0a72b0e01861acb2df33f499e140b46a40562b0d6035992f5aae084c480d9fe4e82e4a4f74929e686c31b04f126859375357a0f9c207b5b SHA512 b963e24f598d4c95455733a1b06f73b802ccf18c3a4aa8e1436ef597aba3daa6020d032051439b35f72bd566e9e62d24aaacce770567e2b9e5c82958698d3d97
-EBUILD sslscan-2.0.6.ebuild 1016 BLAKE2B 55289328d999c1af28b5cb9ed42ce6f6e2ff672cb6b974623b5f02c81227ab3de39cb8730d7a1568de970170e15eb5ec0c16a757f45585c41f1c8d76332c47e2 SHA512 b55cb759acf7f8aa0d5a78c54620d3375d4b89bdd6c1c23d162d5dfb68a879dc60f2237d16c1cbcdcd248f63a3f2edd27e93e7db9dde9982152aaa19650d5a6c
-EBUILD sslscan-2.0.8.ebuild 1018 BLAKE2B 78ef0d602717064b9405bf69b73e42dea04fe5015525a8d772af14ebc9e715137f5b43335381eb6f5be27f401530160996f7f31ef79e5afc8235a0193e42792b SHA512 fb0024161aa41a3a0c70499037d18a90e294f0154b2f093b462cfd8932b09fa40a37ef6bcb60c1d7e176c3b4c8622af05daae9885c65c8115c15650a349de0dc
-EBUILD sslscan-2.0.9.ebuild 1018 BLAKE2B 949bbd7e711675f7549654865fc338db1b6c7ae3c9ddb4fcad98e1c40229476a914902ba97d2cb895b7e98ba85f3227223e84356808b26ae902ca4968a404909 SHA512 8939c02b7db8decc14c503e4ce3928f3c90caf2ecc32abd8f82ec8f37a8a3c9b8b51d4c164bc1e535eebe4458c367ffea60b38b04e5146e58f2d980e05448fb1
+EBUILD sslscan-2.0.10.ebuild 985 BLAKE2B 03b334c4b0dff0ec57f2d37f5c659ed190b9dc8da0d171e6d83ba3700e1bb1e960a6d2178d4b5cbd4fcd382dd61dc4889c7b5d5b823c88b998027cd34aeba774 SHA512 0e0a7a9de0bb42598130ead2ec982c331d08daa4cfec1142c9158c9928fcf33e6c367b89e888df103c0acc66faf837f0bb7769c9f948b029d534e1654e494659
+EBUILD sslscan-2.0.6.ebuild 983 BLAKE2B e77a70c644b03756523a436f7db37b79c486bfb23bbacd8392e59706f8fa351e8142c30f5136338112ea0aa52292c8289f0cb9bb4c8b6449a084429ee9934a3b SHA512 7371a4939df9f33352baf7c8916b76fd57749c6b6f928aab74e098a6ae4f827e279f759c398f3296983c5cf701a6a6499d9a1f85a6349cb47066508d3d2ef7f2
+EBUILD sslscan-2.0.8.ebuild 985 BLAKE2B 9149d38f1bfe75175a85e5ec04a1f3e64f2d111784b91e4fd04076b7ea6a6ba9ff062582c14301aadfa567c0b65901ce222108e72732d18d9ff27d1abd1a4d40 SHA512 45e47a2dc0d68bcc7ec26242c8250957c40da6845af8ec984ede6cb5689122a2e315c71f2bf3afe4520ed31791dba7bdafdcf0e39ac67b7a67c466393eddc8a1
+EBUILD sslscan-2.0.9.ebuild 985 BLAKE2B 03b334c4b0dff0ec57f2d37f5c659ed190b9dc8da0d171e6d83ba3700e1bb1e960a6d2178d4b5cbd4fcd382dd61dc4889c7b5d5b823c88b998027cd34aeba774 SHA512 0e0a7a9de0bb42598130ead2ec982c331d08daa4cfec1142c9158c9928fcf33e6c367b89e888df103c0acc66faf837f0bb7769c9f948b029d534e1654e494659
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-2.0.10.ebuild b/net-analyzer/sslscan/sslscan-2.0.10.ebuild
new file mode 100644
index 000000000000..01672701213e
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# sslscan builds against a static openssl library to allow weak ciphers
+# to be enabled so that they can be tested.
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1k"
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Requires a docker environment
+RESTRICT="test"
+
+# S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
+	touch .openssl_is_fresh || die
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	default
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-analyzer/sslscan/sslscan-2.0.6.ebuild b/net-analyzer/sslscan/sslscan-2.0.6.ebuild
index 92a3a89625bf..0cade5bca7fd 100644
--- a/net-analyzer/sslscan/sslscan-2.0.6.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.6.ebuild
@@ -7,8 +7,6 @@ EAPI=7
 # to be enabled so that they can be tested.
 OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h"
 
-inherit toolchain-funcs
-
 DESCRIPTION="Fast SSL configuration scanner"
 HOMEPAGE="https://github.com/rbsec/sslscan"
 SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
@@ -17,7 +15,6 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 # Requires a docker environment
 RESTRICT="test"
diff --git a/net-analyzer/sslscan/sslscan-2.0.8.ebuild b/net-analyzer/sslscan/sslscan-2.0.8.ebuild
index 5093e3ee48ab..d7a03ebe0b4d 100644
--- a/net-analyzer/sslscan/sslscan-2.0.8.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.8.ebuild
@@ -7,8 +7,6 @@ EAPI=7
 # to be enabled so that they can be tested.
 OPENSSL_RELEASE_TAG="OpenSSL_1_1_1j"
 
-inherit toolchain-funcs
-
 DESCRIPTION="Fast SSL configuration scanner"
 HOMEPAGE="https://github.com/rbsec/sslscan"
 SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
@@ -17,7 +15,6 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # Requires a docker environment
 RESTRICT="test"
diff --git a/net-analyzer/sslscan/sslscan-2.0.9.ebuild b/net-analyzer/sslscan/sslscan-2.0.9.ebuild
index 5e25d50fb227..01672701213e 100644
--- a/net-analyzer/sslscan/sslscan-2.0.9.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.9.ebuild
@@ -7,8 +7,6 @@ EAPI=7
 # to be enabled so that they can be tested.
 OPENSSL_RELEASE_TAG="OpenSSL_1_1_1k"
 
-inherit toolchain-funcs
-
 DESCRIPTION="Fast SSL configuration scanner"
 HOMEPAGE="https://github.com/rbsec/sslscan"
 SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
@@ -17,7 +15,6 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # Requires a docker environment
 RESTRICT="test"