From 58d1340d0b671dbba7d76fbf36bb34e12c77c371 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Fri, 20 Nov 2020 07:56:38 +0800
Subject: [PATCH] testssl-3.0.3.ebuild

---
 net-analyzer/testssl/Manifest                 |  3 +-
 net-analyzer/testssl/testssl-3.0.2.ebuild     | 74 -------------------
 ...tssl-3.0.1.ebuild => testssl-3.0.3.ebuild} |  9 ++-
 .../base/package.accept_keywords/net-analyzer |  1 -
 4 files changed, 6 insertions(+), 81 deletions(-)
 delete mode 100644 net-analyzer/testssl/testssl-3.0.2.ebuild
 rename net-analyzer/testssl/{testssl-3.0.1.ebuild => testssl-3.0.3.ebuild} (90%)

diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 2638ae663..8b2467e34 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,2 +1 @@
-DIST testssl-3.0.1.tar.gz 9207908 BLAKE2B 0c7c43b306866fa79718027ce9db3a894a4344f714a4318578f4d9dc79b09e1beba1f69f7f25e75ece6811e1394479a29e021697c30f160a0d9f3f291d4792c5 SHA512 e081c6bb24c45cb197b57403cfd4f384459ce2c0d0f0ccd2fa0f68d61429ba9bf4a351efd2b0febbadaca7b1f5825c338d8b03f59ea4cbe8467358ee92cdc715
-DIST testssl-3.0.2.tar.gz 9208016 BLAKE2B cacb21f34d769f3e255d1db01bf197c0dcb0dc619c09d8153b65ef1ce5daaddb0b43ba698c765de1993023992a101ca6a5cde66da098e3eba3e81df81b3cc824 SHA512 ad886d556d6682bc99d45a9719abf6ee00f4e0f763795a79e46e0495bc355ede56204b6f1fb0db19311e42913990b57016fb6a4adb7414bb7283d847c19e9fb2
+DIST testssl-3.0.3.tar.gz 9223568 BLAKE2B 90bc90d0647f389ba668f3d9e999758097370b9788f83b9bff6a9e9b35f2b83d8233c2cad9792dbdf03cafc1ed52a2f47dea89a2ca2d7cb292e59b6382d291b3 SHA512 02cea9157d64ea9b60ded3b99c4d5628c7219edcc8b34799df24742feb85eb649ef96b5766d88b59523136f3be3d23d21bf8ff6a5c4d3fac006d6e350aa2664f
diff --git a/net-analyzer/testssl/testssl-3.0.2.ebuild b/net-analyzer/testssl/testssl-3.0.2.ebuild
deleted file mode 100644
index 358e43454..000000000
--- a/net-analyzer/testssl/testssl-3.0.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/testssl.sh/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bundled-openssl kerberos"
-
-RDEPEND="
-	app-shells/bash[net]
-	net-dns/bind-tools
-	sys-apps/util-linux
-	sys-libs/ncurses:0
-	sys-process/procps
-	bundled-openssl? (
-		kerberos? (
-			sys-libs/zlib
-			virtual/krb5
-		)
-	)
-	!bundled-openssl? ( dev-libs/openssl-bad )"
-
-S="${WORKDIR}/testssl.sh-${PV}"
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
-	if use amd64; then
-		if use kerberos; then
-			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
-		else
-			BUNDLED_OPENSSL="openssl.Linux.x86_64"
-		fi
-	elif use x86; then
-		BUNDLED_OPENSSL="openssl.Linux.i686"
-	fi
-}
-
-src_prepare() {
-	sed -i ${PN}.sh \
-		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
-		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
-
-	if use bundled-openssl; then
-		sed -i ${PN}.sh \
-			-e "s|OPENSSL=\"\$1/openssl\"|OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"|" || die
-	else
-		sed -i ${PN}.sh \
-			-e 's|OPENSSL="$1/openssl"|OPENSSL="$1/openssl-bad"|' || die
-	fi
-
-	default
-}
-
-src_install() {
-	dodoc CHANGELOG.md CREDITS.md Readme.md
-	dodoc openssl-iana.mapping.html
-
-	dobin ${PN}.sh
-
-	insinto /etc/${PN}
-	doins etc/*
-
-	if use bundled-openssl; then
-		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
-	fi
-}
diff --git a/net-analyzer/testssl/testssl-3.0.1.ebuild b/net-analyzer/testssl/testssl-3.0.3.ebuild
similarity index 90%
rename from net-analyzer/testssl/testssl-3.0.1.ebuild
rename to net-analyzer/testssl/testssl-3.0.3.ebuild
index 358e43454..afc1cbb1c 100644
--- a/net-analyzer/testssl/testssl-3.0.1.ebuild
+++ b/net-analyzer/testssl/testssl-3.0.3.ebuild
@@ -9,8 +9,9 @@ SRC_URI="https://github.com/drwetter/testssl.sh/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="bundled-openssl kerberos"
+REQUIRED_USE="bundled-openssl? ( || ( amd64 x86 ) )"
 
 RDEPEND="
 	app-shells/bash[net]
@@ -43,10 +44,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
 	sed -i ${PN}.sh \
 		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
 		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
 
+	#Gentoo hack find_openssl_binary(), we do it better
 	if use bundled-openssl; then
 		sed -i ${PN}.sh \
 			-e "s|OPENSSL=\"\$1/openssl\"|OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"|" || die
@@ -54,8 +57,6 @@ src_prepare() {
 		sed -i ${PN}.sh \
 			-e 's|OPENSSL="$1/openssl"|OPENSSL="$1/openssl-bad"|' || die
 	fi
-
-	default
 }
 
 src_install() {
@@ -69,6 +70,6 @@ src_install() {
 
 	if use bundled-openssl; then
 		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+		doexe bin/${BUNDLED_OPENSSL}
 	fi
 }
diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer
index c9f160b6b..21aff8fc8 100644
--- a/profiles/pentoo/base/package.accept_keywords/net-analyzer
+++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer
@@ -35,7 +35,6 @@ net-analyzer/sqlninja
 net-analyzer/subfinder
 net-analyzer/sublist3r
 net-analyzer/termshark
-net-analyzer/testssl
 net-analyzer/theHarvester
 net-analyzer/wafw00f
 net-analyzer/wfuzz