From owner-svn-ports-all@freebsd.org Thu Aug 2 05:33:17 2018 Return-Path: Delivered-To: svn-ports-all@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 D1A611058AB6; Thu, 2 Aug 2018 05:33:17 +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 7626D74315; Thu, 2 Aug 2018 05:33:17 +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 51A715715; Thu, 2 Aug 2018 05:33:17 +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 w725XH0c056777; Thu, 2 Aug 2018 05:33:17 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w725XHGg056776; Thu, 2 Aug 2018 05:33:17 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201808020533.w725XHGg056776@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Thu, 2 Aug 2018 05:33:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476218 - in head/security/acme-client: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/security/acme-client: . files X-SVN-Commit-Revision: 476218 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Aug 2018 05:33:18 -0000 Author: tobik Date: Thu Aug 2 05:33:16 2018 New Revision: 476218 URL: https://svnweb.freebsd.org/changeset/ports/476218 Log: security/acme-client: Fix runtime when SSL_DEFAULT != libressl - Make sure we link with libthr as well to prevent runtime errors like "tls_init: No error: 0" [1]. - Adopt the nicer approach for linking with libtls taken by net/openntpd; it doesn't require patching of build files [2]. - Remove unused patch PR: 228438 Submitted by: madpilot, tobik [1], leres [2] Reported by: dch Approved by: brnrd (maintainer timeout, 2 weeks) Deleted: head/security/acme-client/files/extra-patch-GNUmakefile Modified: head/security/acme-client/Makefile Modified: head/security/acme-client/Makefile ============================================================================== --- head/security/acme-client/Makefile Thu Aug 2 05:30:17 2018 (r476217) +++ head/security/acme-client/Makefile Thu Aug 2 05:33:16 2018 (r476218) @@ -3,7 +3,7 @@ PORTNAME= acme-client PORTVERSION= 0.1.16 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= portable- CATEGORIES= security MASTER_SITES= https://kristaps.bsd.lv/${PORTNAME}/snapshots/ \ @@ -56,17 +56,20 @@ post-install: .include -.if ! ${SSL_DEFAULT:Mlibressl*} -. ifnmake describe -STAGEDIR_libressl!= ${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl -. endif -BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage -CPPFLAGS+= -I${STAGEDIR_libressl}${LOCALBASE}/include -LDFLAGS+= ${STAGEDIR_libressl}${LOCALBASE}/lib/libtls.a \ - ${STAGEDIR_libressl}${LOCALBASE}/lib/libssl.a \ - ${STAGEDIR_libressl}${LOCALBASE}/lib/libcrypto.a -post-configure: - ${REINPLACE_CMD} 's/-l[a-z]*//g' ${WRKSRC}/GNUmakefile +# Requires libtls from LibreSSL +.if ${SSL_DEFAULT:Mlibressl*} +CPPFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} +.else # SSL_DEFAULT +BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage +CPPFLAGS+= -I${WRKDIR}/libressl/include +LDFLAGS+= -lpthread -L${WRKDIR}/libressl/lib + +# Don't use COPYTREE_SHARE here as it hard links files, and the original files +# are owned by root, which creates problems of its own. +pre-configure: + @cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX} \ + && ${FIND} -E . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1 .endif # SSL_DEFAULT .include