gentoo resync : 27.03.2021

3 files changed, 4 insertions, 52 deletions

diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 99536355fb81..538f6814cd77 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,13 +1,10 @@
-DIST sslscan-1.11.13-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
-DIST sslscan-1.11.13-rbsec.tar.gz 57006 BLAKE2B ea5e2754f5a8218ee1f3aba26e7efe2394fa87b79137955705edc4600d67139f2641ac7b4e7a92f7273878f5b150e3e1b159114c833dc180049688563cf5095b SHA512 51477e5b29a2fc87e2d6c8d76430eeb2a6feb388d47392938b9e2c572acc5926534a19dc249080a066256a1a6cbfe08b162e9f3839386c86116352e5eb57c544
 DIST sslscan-2.0.6.tar.gz 109597 BLAKE2B 30c0dc329d252fbb91800e470cad84214fbe30694c33fa388040838da24ca73b0857f19603ca7e71dc84fe4ca10977b2d4c0145a752718225f5225540184dee5 SHA512 2f7236f101e1ab75a6fb2efc8fed2949a410b4c67156e88865724e0f399a6e749218253d49c122f1e046022634ef62dcc2b4f97833fd33f90a3ba5a2b7e06c6c
-DIST sslscan-2.0.7.tar.gz 109639 BLAKE2B d4a8257943f0c07dfc4f59e3b71091466dfd9d0cea71dfd44f17487fd0254e0f6113acbd1ddf30659cebb60bca7609070ed5733af737dce11c7cd762d3dbdd30 SHA512 de5e27e75f9af4dadc6ae10388602f64a56a457fcd737b37a1a9da1f433969d19004c994b8f04c569aa40b8ade6176fa2752fbc0b52046174791cad119e07bd0
 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_1i.tar.gz 9989266 BLAKE2B c0d48845457ba89a9ed4a6f4425a8556cc9c623bba5ecaa07911d19285ca32124c09294862c874afa61aadebb33f290028b14134d51f1823d1bbb63854d7c179 SHA512 7e2ae6f1ce75d39f330d79abc1d2c67418fa8609580a7550f39104e18e9278e859ec788f993186808d45363c43b3e731c3ec5d874d072f2c3e33adb0701db70a
 DIST sslscan-OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e
-EBUILD sslscan-1.11.13-r1.ebuild 1029 BLAKE2B 3e0c3fa00d0a29907180b2307efe0e628305951d614613dead3fe4580d000f13151bbfa88070240048e5e2cb02e0699355312cca6947d19c1fcba3c0b3178ff7 SHA512 92032809178fcd9bbf769059afd3f31fbda24f9b8e6ace40acbca7c09a7de314ac94408ad2b8c00daf181fa89ddf376cc00ab7bf3662c38dae68d1a88a4fc63c
+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.7.ebuild 1018 BLAKE2B 0e98d5d7daba239c28dd922f24c954c5727387d5007ff38dafc6913facbe33cf3bdcffc10ef516e2cd02c8ac85447b62eb06150eaabdd9b59f8320640b9e2310 SHA512 040c88add3f54cd57919eb1d58cf3ecda35c6e64e16bfdc8a2f73eafdf55735b844001ab7f64bddbf11cd692814ed10892fe5740da0f11afa450e45c21a7fe6d
 EBUILD sslscan-2.0.8.ebuild 1018 BLAKE2B 78ef0d602717064b9405bf69b73e42dea04fe5015525a8d772af14ebc9e715137f5b43335381eb6f5be27f401530160996f7f31ef79e5afc8235a0193e42792b SHA512 fb0024161aa41a3a0c70499037d18a90e294f0154b2f093b462cfd8932b09fa40a37ef6bcb60c1d7e176c3b4c8622af05daae9885c65c8115c15650a349de0dc
+EBUILD sslscan-2.0.9.ebuild 1018 BLAKE2B 949bbd7e711675f7549654865fc338db1b6c7ae3c9ddb4fcad98e1c40229476a914902ba97d2cb895b7e98ba85f3227223e84356808b26ae902ca4968a404909 SHA512 8939c02b7db8decc14c503e4ce3928f3c90caf2ecc32abd8f82ec8f37a8a3c9b8b51d4c164bc1e535eebe4458c367ffea60b38b04e5146e58f2d980e05448fb1
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild b/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild
deleted file mode 100644
index 1cf3cf65c006..000000000000
--- a/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Upstream now builds against the openssl 1.0.x fork by PeterMosmans
-MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-MY_FORK="rbsec"
-SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
-	https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} 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.7.ebuild b/net-analyzer/sslscan/sslscan-2.0.9.ebuild
index 7ad98a9056c2..5e25d50fb227 100644
--- a/net-analyzer/sslscan/sslscan-2.0.7.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.9.ebuild
@@ -5,7 +5,7 @@ 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_1i"
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1k"
 
 inherit toolchain-funcs