From nobody Mon Apr 18 12:34:33 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3B48D11DCDD0; Mon, 18 Apr 2022 12:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KhmbG19tlz3rlT; Mon, 18 Apr 2022 12:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650285274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Y9lvMxL/Pmu9nKLLcLeNFv+NsCIxhp9ppqlusJ9nTw=; b=lzhX0bz40qndNoyLT1GkMdTnb3XASS9TJQfYUrKhJaaseDt51t82WncShOu3eysaZLeH8d JTFRcjeXTkUZpOC3iYiyHkVv3Z7PF76mX3Mu7ufsF35KjWTb5j6FBKQLzYLI6ir0TIy6AK yzcMTuet2Zso7LG9KOzGsxTIKNWCJWPol2LmMOdv7L3tHxnKyXi6GeaGA3PgbxRSfLr2oN Ic6xhZCabhMoM7a1RvSyIEhj9BCo5KiBx/gEnczmx6yb5qkYxX5+OWWs8l72zdPCwzUuAD 3kA+qiB9GnCN0VDbhLlnbalEsUAwBPux1a7U5I6puqXetBx+YHyBdsm65AmAIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F29EC12F06; Mon, 18 Apr 2022 12:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23ICYXtZ061873; Mon, 18 Apr 2022 12:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23ICYXPv061872; Mon, 18 Apr 2022 12:34:33 GMT (envelope-from git) Date: Mon, 18 Apr 2022 12:34:33 GMT Message-Id: <202204181234.23ICYXPv061872@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: e3a741fd8b9e - main - security/openssl-unsafe: Fix build on i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3a741fd8b9ea725013555c5e4f68162c46ee2d2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650285274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Y9lvMxL/Pmu9nKLLcLeNFv+NsCIxhp9ppqlusJ9nTw=; b=OXFW4lOcau7UYU5qM3S+D4cL+QUOygXaHMAcK9rWJ0qROsIxCPC4P+NQRQJ32LtGznPNH5 okpbw9rHiCkZK13XOq+ctAKp99BMhGIUOsGK3FPGI9XA+q4Z+bsBqhzJsALNcNzlflhWQl ZgFwUR4l7eZpLawH29wUGcBDnx3gGm3tMeYKWbGR0u3wK1MKa/Lm5EUYX28LG/ZggybLEG E2R+RvtghADh9fIvEFjFaI1emgHQYUznfFkfsrf+kSNzvdi4Jg4A8dVs3ShUu/Gy8CsqaU ESZbqG9g/IyNHmxFEE11d55w9EulH5WV3Rivcdhge/QAYPUlYXCAOnu0nmI6CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650285274; a=rsa-sha256; cv=none; b=ThvrhPsfr2q30EPMHtzlXQuAjXDwx3cIVuXe9J2VGQrNSWTvGJd1mCGbKexosQuxrvHd8D IvpKK5zcadn33o4ISGf1VazqqdgCOOs+pHAprrsYElx6H0B9zA/TcEyBGhuFsEPkwTZzqw g2UjiROpbHtGT1tAqeLulWEIsdhHdYxtPbnOqs7RpsPRAvXSy34s0zY+wBbRowIALY1hW0 xLcv0PsIC1no8rYH2Jpcnu2g3/Q8xZTlkkLbytd1J8tENkacsBGRYzD9QHxcAlEM/hGiDE 1mXLO7J3+haYsVnSUqZbirCethH+AzvwkJ5oj04QKSw30H495Y0nf2xiNGyDmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3a741fd8b9ea725013555c5e4f68162c46ee2d2 commit e3a741fd8b9ea725013555c5e4f68162c46ee2d2 Author: Bernard Spil AuthorDate: 2022-04-18 12:32:53 +0000 Commit: Bernard Spil CommitDate: 2022-04-18 12:32:53 +0000 security/openssl-unsafe: Fix build on i386 * reuse fix from 231459 PR: 261645 Submitted by: takefu airport fm --- security/openssl-unsafe/Makefile | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/security/openssl-unsafe/Makefile b/security/openssl-unsafe/Makefile index 1d207767510e..7bb4ff27c971 100644 --- a/security/openssl-unsafe/Makefile +++ b/security/openssl-unsafe/Makefile @@ -11,24 +11,17 @@ COMMENT= Unsafe SSL and crypto library LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -CPE_VERSION= 1.0.2k - USES= cpe perl5 -USE_PERL5= build -MAKE_ENV+= LIBRPATH="${PREFIX}/openssl-unsafe/lib" GREP_OPTIONS= SHLIBVER=${OPENSSL_SHLIBVER} -CFLAGS+= -fPIC -DPIC -SUB_FILES= pkg-message -PLIST_SUB+= SHLIBVER=${OPENSSL_SHLIBVER} -USE_LDCONFIG= yes +CPE_VERSION= 1.0.2k +.if ${MACHINE} == "i386" +#USE_GCC= 8+ +.endif USE_GITHUB= yes GH_ACCOUNT= PeterMosmans GH_TAGNAME= c9ba19c - -.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld -BROKEN_i386= ld: error: unknown argument: -Bforcearchive -.endif -MAKE_JOBS_UNSAFE= yes +USE_PERL5= build +USE_LDCONFIG= yes CONFIGURE_ARGS= enable-camellia enable-cms enable-ec enable-ec2m \ enable-ecdh enable-ecdsa enable-gost enable-idea enable-md2 enable-mdc2 \ @@ -36,6 +29,12 @@ CONFIGURE_ARGS= enable-camellia enable-cms enable-ec enable-ec2m \ enable-ssl2 enable-ssl2-methods enable-ssl3 enable-weak-ssl-ciphers \ experimental-jpake experimental-store \ no-gmp sctp shared threads zlib zlib-dynamic +MAKE_ENV+= LIBRPATH="${PREFIX}/openssl-unsafe/lib" GREP_OPTIONS= SHLIBVER=${OPENSSL_SHLIBVER} +MAKE_JOBS_UNSAFE= yes +CFLAGS+= -fPIC -DPIC +SUB_FILES= pkg-message +PLIST_SUB+= SHLIBVER=${OPENSSL_SHLIBVER} + .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "mips64el" CONFIGURE_ARGS+= enable-ec_nistp_64_gcc_128 .endif @@ -49,6 +48,7 @@ post-patch: ${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \ ${WRKSRC}/crypto/des/Makefile ${REINPLACE_CMD} -e 's|all install_docs |all |;s| tools$$||;s| build_tools$$||' ${WRKSRC}/Makefile.org + ${REINPLACE_CMD} -e 's|\^GNU ld|GNU|' ${WRKSRC}/Makefile.shared do-configure: ${REINPLACE_CMD} -e "s|options 386|options|" \ @@ -66,6 +66,14 @@ post-configure: -e 's|LIBVERSION=[^ ]* |LIBVERSION=${OPENSSL_SHLIBVER} |' \ ${WRKSRC}/Makefile +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/openssl-unsafe/bin/openssl + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/openssl-unsafe/lib/libcrypto.so.${OPENSSL_SHLIBVER} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/openssl-unsafe/lib/libssl.so.${OPENSSL_SHLIBVER} +.for i in ubsec gost capi gmp atalla sureware nuron cswift 4758cca padlock aep chil + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/openssl-unsafe/lib/engines/lib${i}.so +.endfor + test: build cd ${WRKSRC} && ${MAKE} test