From owner-svn-ports-head@freebsd.org Sun Mar 18 09:02:42 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A90A7F670EE; Sun, 18 Mar 2018 09:02:42 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 54E2586B7A; Sun, 18 Mar 2018 09:02:42 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4FB461E8AC; Sun, 18 Mar 2018 09:02:42 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2I92gOF035282; Sun, 18 Mar 2018 09:02:42 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2I92gSZ035280; Sun, 18 Mar 2018 09:02:42 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201803180902.w2I92gSZ035280@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 18 Mar 2018 09:02:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464885 - in head/security/testssl.sh: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/security/testssl.sh: . files X-SVN-Commit-Revision: 464885 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Mar 2018 09:02:42 -0000 Author: tobik Date: Sun Mar 18 09:02:41 2018 New Revision: 464885 URL: https://svnweb.freebsd.org/changeset/ports/464885 Log: security/testssl.sh: Fix certificate expiration check Upstream commit af6ca18933ffc5bb02d2ced46342b8d7a6275acd dropped the TZ offset from the certificate enddate but the FreeBSD date format was not updated accordingly. Remove the unnecessary %z from the format string. - While here add NO_ARCH PR: 226676 Submitted by: Piotr Kubaj Modified: head/security/testssl.sh/Makefile head/security/testssl.sh/files/patch-testssl.sh Modified: head/security/testssl.sh/Makefile ============================================================================== --- head/security/testssl.sh/Makefile Sun Mar 18 08:33:22 2018 (r464884) +++ head/security/testssl.sh/Makefile Sun Mar 18 09:02:41 2018 (r464885) @@ -3,6 +3,7 @@ PORTNAME= testssl.sh DISTVERSIONPREFIX= v DISTVERSION= 2.9.5-2 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org @@ -18,6 +19,7 @@ USES= shebangfix USE_GITHUB= yes GH_ACCOUNT= drwetter +NO_ARCH= yes NO_BUILD= yes SHEBANG_FILES= testssl.sh utils/* Modified: head/security/testssl.sh/files/patch-testssl.sh ============================================================================== --- head/security/testssl.sh/files/patch-testssl.sh Sun Mar 18 08:33:22 2018 (r464884) +++ head/security/testssl.sh/files/patch-testssl.sh Sun Mar 18 09:02:41 2018 (r464885) @@ -1,6 +1,6 @@ ---- testssl.sh.orig 2017-11-05 21:50:58 UTC +--- testssl.sh.orig 2018-03-17 15:02:25 UTC +++ testssl.sh -@@ -164,6 +164,9 @@ TERM_CURRPOS=0 +@@ -175,6 +175,9 @@ TERM_CURRPOS=0 ## CONFIGURATION PART ## # following variables make use of $ENV, e.g. OPENSSL= ./testssl.sh # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help @@ -10,3 +10,12 @@ declare -x OPENSSL OPENSSL_TIMEOUT FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all +@@ -6221,7 +6224,7 @@ certificate_info() { + # best we are able to do under OpenBSD + days2expire="" + else +- days2expire=$(( $(parse_date "$enddate" "+%s" "%F %H:%M %z") - $(LC_ALL=C date "+%s") )) # in seconds ++ days2expire=$(( $(parse_date "$enddate" "+%s" "%F %H:%M") - $(LC_ALL=C date "+%s") )) # in seconds + days2expire=$((days2expire / 3600 / 24 )) + + if grep -q "^Let's Encrypt Authority" <<< "$issuer_CN"; then # we take the half of the thresholds for LE certificates