From owner-svn-ports-head@freebsd.org Thu Dec 6 10:50:43 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 02BD013273E4; Thu, 6 Dec 2018 10:50:43 +0000 (UTC) (envelope-from skozlov@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 9CFD08B56E; Thu, 6 Dec 2018 10:50:42 +0000 (UTC) (envelope-from skozlov@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 7D89E226E8; Thu, 6 Dec 2018 10:50:42 +0000 (UTC) (envelope-from skozlov@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB6Aog7h040644; Thu, 6 Dec 2018 10:50:42 GMT (envelope-from skozlov@FreeBSD.org) Received: (from skozlov@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB6Aogl2040642; Thu, 6 Dec 2018 10:50:42 GMT (envelope-from skozlov@FreeBSD.org) Message-Id: <201812061050.wB6Aogl2040642@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: skozlov set sender to skozlov@FreeBSD.org using -f From: "Serhii (Sergey) Kozlov" Date: Thu, 6 Dec 2018 10:50:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486750 - in head/devel/staf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: skozlov X-SVN-Commit-Paths: in head/devel/staf: . files X-SVN-Commit-Revision: 486750 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9CFD08B56E X-Spamd-Result: default: False [-1.00 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.42)[-0.423,0]; NEURAL_HAM_SHORT(-0.53)[-0.527,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-0.05)[-0.054,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Thu, 06 Dec 2018 10:50:43 -0000 Author: skozlov Date: Thu Dec 6 10:50:41 2018 New Revision: 486750 URL: https://svnweb.freebsd.org/changeset/ports/486750 Log: devel/staf: Unbreak for openssl111 Summary: - Unbreak for openssl111 using patch https://sourceforge.net/p/staf/bugs/1593/#f4aa - Pet stage-qa by making symlinks relational Approved By: sbruno (mentor) Differential Revision: https://reviews.freebsd.org/D18440 Added: head/devel/staf/files/patch-stafproc_STAFFSService.cpp (contents, props changed) Modified: head/devel/staf/Makefile Modified: head/devel/staf/Makefile ============================================================================== --- head/devel/staf/Makefile Thu Dec 6 10:48:46 2018 (r486749) +++ head/devel/staf/Makefile Thu Dec 6 10:50:41 2018 (r486750) @@ -3,6 +3,7 @@ PORTNAME= staf PORTVERSION= 3.4.26 +PORTREVISION= 1 CATEGORIES= devel net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/V${PORTVERSION} DISTNAME= STAF${PORTVERSION:S/.//g}-src @@ -13,9 +14,6 @@ COMMENT= Software Testing Automation Framework LICENSE= EPL LICENSE_FILE= ${WRKSRC}/LICENSE.htm -BROKEN_SSL= openssl111 -BROKEN_SSL_REASON_openssl111= variable has incomplete type 'EVP_MD_CTX' (aka 'evp_md_ctx_st') - WRKSRC= ${WRKDIR}/src WRKSRC_SUBDIR= ${PORTNAME} INSTALL_WRKSRC= ${WRKDIR}/rel/freebsd/staf/${STAF_BUILD_TYPE} @@ -151,8 +149,8 @@ do-install: .for bin in ${STAF_BIN_FILES} ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/${bin} ${STAGEDIR}${PREFIX}/bin/ .endfor - ${LN} -s ${PREFIX}/bin/STAF ${STAGEDIR}${PREFIX}/bin/staf - ${LN} -s ${PREFIX}/bin/FmtLog ${STAGEDIR}${PREFIX}/bin/fmtlog + ${LN} -s STAF ${STAGEDIR}${PREFIX}/bin/staf + ${LN} -s FmtLog ${STAGEDIR}${PREFIX}/bin/fmtlog .for lib in ${STAF_LIB_FILES} ${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/${lib} ${STAGEDIR}${PREFIX}/lib/ .endfor Added: head/devel/staf/files/patch-stafproc_STAFFSService.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/staf/files/patch-stafproc_STAFFSService.cpp Thu Dec 6 10:50:41 2018 (r486750) @@ -0,0 +1,39 @@ +--- stafproc/STAFFSService.cpp.orig 2016-12-31 04:11:18 UTC ++++ stafproc/STAFFSService.cpp +@@ -4451,12 +4451,11 @@ STAFServiceResult STAFFSService::handleG + + unsigned int fileLength = lowerSize; + +- EVP_MD_CTX mdctx; ++ EVP_MD_CTX* mdctx = EVP_MD_CTX_create(); + unsigned char md_value[EVP_MAX_MD_SIZE]; + unsigned int md_len; + +- EVP_MD_CTX_init(&mdctx); +- EVP_DigestInit_ex(&mdctx, md, NULL); ++ EVP_DigestInit_ex(mdctx, md, NULL); + + // Read the entire file using a buffer size of 4096 bytes and + // update the digest with the buffer +@@ -4475,7 +4474,7 @@ STAFServiceResult STAFFSService::handleG + + if (rc != kSTAFOk) break; + +- EVP_DigestUpdate(&mdctx, fileBuffer, writeLength); ++ EVP_DigestUpdate(mdctx, fileBuffer, writeLength); + fileLength -= writeLength; + bytesCopied += writeLength; + } +@@ -4485,10 +4484,10 @@ STAFServiceResult STAFFSService::handleG + if (rc == kSTAFOk) + { + // Get the checksum value +- EVP_DigestFinal_ex(&mdctx, md_value, &md_len); ++ EVP_DigestFinal_ex(mdctx, md_value, &md_len); + } + +- EVP_MD_CTX_cleanup(&mdctx); ++ EVP_MD_CTX_destroy(mdctx); + + if (rc == kSTAFOk) + {