rm testssl patch, update category

This commit is contained in:
Florian Tham
2016-12-23 16:54:53 +01:00
parent 6a7eb2f259
commit 56ba2c264b
3 changed files with 0 additions and 28 deletions

View File

@@ -1,22 +0,0 @@
diff --git a/testssl.sh b/testssl.sh
index 04b2cf4..02d246b 100755
--- a/testssl.sh
+++ b/testssl.sh
@@ -90,7 +90,7 @@
SWURL="https://testssl.sh/ "
readonly PROG_NAME=$(basename "$0")
-readonly RUN_DIR=$(dirname "$0")
+readonly RUN_DIR=$(dirname "$(readlink -e $0)")
TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}" # if you run testssl.sh from a different path you can set either TESTSSL_INSTALL_DIR
CA_BUNDLES_PATH="${CA_BUNDLES_PATH:-""}" # or CA_BUNDLES_PATH to find the CA BUNDLES. TESTSSL_INSTALL_DIR helps you to find the RFC mapping also
CIPHERS_BY_STRENGTH_FILE=""
@@ -9442,7 +9442,7 @@
# TESTSSL_INSTALL_DIR can be supplied via environment so that the cipher mapping and CA bundles can be found
# www.carbonwind.net/TLS_Cipher_Suites_Project/tls_ssl_cipher_suites_simple_table_all.htm
get_install_dir() {
- [[ -z "$TESTSSL_INSTALL_DIR" ]] && TESTSSL_INSTALL_DIR="$(dirname ${BASH_SOURCE[0]})"
+ [[ -z "$TESTSSL_INSTALL_DIR" ]] && TESTSSL_INSTALL_DIR="$(dirname "$(readlink -e ${BASH_SOURCE[0]})")"
[[ -r "$RUN_DIR/etc/cipher-mapping.txt" ]] && CIPHERS_BY_STRENGTH_FILE="$RUN_DIR/etc/cipher-mapping.txt"
[[ -r "$TESTSSL_INSTALL_DIR/etc/cipher-mapping.txt" ]] && CIPHERS_BY_STRENGTH_FILE="$TESTSSL_INSTALL_DIR/etc/cipher-mapping.txt"

View File

@@ -26,12 +26,6 @@ PATCHES=(
"${FILESDIR}/follow_symlinks.patch"
)
src_prepare() {
for patch in "${PATCHES[@]}"; do
epatch "$patch"
done
}
src_install() {
dodir "${INSTALLDIR}"
dodir "${INSTALLDIR}/bin"