From 2c394267ce977047283fec39fcbc39e536474edb Mon Sep 17 00:00:00 2001 From: Florian Tham Date: Fri, 21 Oct 2016 16:54:32 +0200 Subject: [PATCH] update symlink patch --- app-admin/testssl/Manifest | 2 +- app-admin/testssl/files/follow_symlinks.patch | 24 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app-admin/testssl/Manifest b/app-admin/testssl/Manifest index b0e9370..90fc94f 100644 --- a/app-admin/testssl/Manifest +++ b/app-admin/testssl/Manifest @@ -1,2 +1,2 @@ -AUX follow_symlinks.patch 964 SHA256 ef8409eb65bd6ff16acad2029240d029c404ebad91b346d418f6683d86adf0b8 SHA512 17919469fa477512118720f179bed91b008735c61677d672d0231aeae31ec8bf55ca671139c467f0aec21c0bf5c1f80ab607aea6afed1c9a0a64b6d0c68876e3 WHIRLPOOL 26d1501316bb86f9a5a49ccb1407898c504944834711b8c8f59abd085ef9939ba98d409ed6e7001f5b2745f876f71dae8008f7411c3fffb676c81262220f90af +AUX follow_symlinks.patch 1229 SHA256 4823976d7135fb52e2af802a8f60cc6449e3d106eb20f18c7aaf2bf62db5398b SHA512 745ffc5a5cce374074650a8a01c67fa30cd617b2c38841e61bf30cfaa85878047898cdfd98331d730d9ecaf3084ca614374310c891c21fd0e09e949b4f8aa931 WHIRLPOOL 007c6d870454adfdda0c8f8aa2e88064e440559f3001a4473b344084b81ca4ab222647bc6afa593c51332651b187c6b709a42e6cf1177427df7487afd4e19cd2 EBUILD testssl-9999.ebuild 873 SHA256 b450eb3faf053a407e77e46129c836757ebe85784baedbdcc2226eb9adf8e2d1 SHA512 9d5e9ae5c0a6b42a7d3d2701f4a4a7fa37366eeb634aac4d953f1ba6982fae9e3d805bf0bd1cb284e2f5e3f979dd6d0bcf7547d0433efcc0bb71baefd86d3e8d WHIRLPOOL 39799ab075020640903290348f9323909a31fe40758f1eb7db49f40d751d7e5f12fe502709a2a3c9ea7c2400cbef3929b5d20ddcb0cf3e8b78bc4361396b94fe diff --git a/app-admin/testssl/files/follow_symlinks.patch b/app-admin/testssl/files/follow_symlinks.patch index d28576a..cc7ef5c 100644 --- a/app-admin/testssl/files/follow_symlinks.patch +++ b/app-admin/testssl/files/follow_symlinks.patch @@ -1,22 +1,20 @@ -diff --git a/testssl.sh b/testssl.sh -index 04b2cf4..02d246b 100755 ---- a/testssl.sh -+++ b/testssl.sh -@@ -90,7 +90,7 @@ egrep -q "dev|rc" <<< "$VERSION" && \ +--- testssl.sh 2016-10-21 16:46:56.391902484 +0200 ++++ testssl.sh-new 2016-10-21 16:52:14.785261019 +0200 +@@ -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)") - INSTALL_DIR="" + 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 MAPPING_FILE_RFC="" - OPENSSL_LOCATION="" -@@ -5391,7 +5391,7 @@ old_fart() { - # it provides "keycode/ RFC style name", see RFCs, cipher(1), www.carbonwind.net/TLS_Cipher_Suites_Project/tls_ssl_cipher_suites_simple_table_all.htm +@@ -7191,7 +7191,7 @@ + # (mapping file provides "keycode/ RFC style name", see RFCs, cipher(1), + # www.carbonwind.net/TLS_Cipher_Suites_Project/tls_ssl_cipher_suites_simple_table_all.htm get_install_dir() { - #INSTALL_DIR=$(cd "$(dirname "$0")" && pwd)/$(basename "$0") -- INSTALL_DIR=$(dirname ${BASH_SOURCE[0]}) -+ INSTALL_DIR=$(dirname "$(readlink -e ${BASH_SOURCE[0]})") +- [[ -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/mapping-rfc.txt" ]] && MAPPING_FILE_RFC="$RUN_DIR/etc/mapping-rfc.txt" - [[ -r "$INSTALL_DIR/etc/mapping-rfc.txt" ]] && MAPPING_FILE_RFC="$INSTALL_DIR/etc/mapping-rfc.txt" + [[ -r "$TESTSSL_INSTALL_DIR/etc/mapping-rfc.txt" ]] && MAPPING_FILE_RFC="$TESTSSL_INSTALL_DIR/etc/mapping-rfc.txt"