From f882cbbe10cb6f776b503641c4fa122db2fa2bed Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Wed, 3 Aug 2016 06:40:31 +0700 Subject: network/ssllabs-scan: Remove Hardcoded path to GOROOT. Signed-off-by: Willy Sudiarto Raharjo --- network/ssllabs-scan/README | 3 +++ network/ssllabs-scan/ssllabs-scan.SlackBuild | 11 +++++------ 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'network/ssllabs-scan') diff --git a/network/ssllabs-scan/README b/network/ssllabs-scan/README index f39340d55c..8436100a09 100644 --- a/network/ssllabs-scan/README +++ b/network/ssllabs-scan/README @@ -1,2 +1,5 @@ A command-line reference-implementation client for SSL Labs APIs, designed for automated and/or bulk testing. + +NOTE: Please make sure GOROOT variable point to the correct google's go +implementation rather than gcc's go before building. diff --git a/network/ssllabs-scan/ssllabs-scan.SlackBuild b/network/ssllabs-scan/ssllabs-scan.SlackBuild index 8c3c086417..ce4ef7419d 100644 --- a/network/ssllabs-scan/ssllabs-scan.SlackBuild +++ b/network/ssllabs-scan/ssllabs-scan.SlackBuild @@ -24,13 +24,12 @@ PRGNAM=ssllabs-scan VERSION=${VERSION:-1.3.0} -GOVER=1.6.2 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -70,7 +69,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -GOROOT=/usr/lib${LIBDIRSUFFIX}/go${GOVER}/go make +make mkdir -p $PKG/usr/bin cp ssllabs-scan $PKG/usr/bin -- cgit v1.2.3