From nobody Mon Nov 20 04:13:24 2023 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 4SYYys0G03z51rgK; Mon, 20 Nov 2023 04:13:25 +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 4SYYyr6tTWz4WLK; Mon, 20 Nov 2023 04:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700453605; 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=1LMrYxD32Ahj48t/cvuS4aOtZ4Jsk/2XIPcIre8Nmas=; b=DViJuJaDUC9U+MA5fH6yhX8DddLJI6nQfcGx7aBH+J2Tss7Qi1woUpMQx00N+EhTwEcTCs f6JHQ7aCea63xX19OgftA2mVI2rEqrPIR0YdfX0JfeW+0MUk7lyJnpHsO4NaaOGq5qMPS6 /zgx3wqihwkmvrXMDH1th4d6X9LCmZ3qeFDr7L7CRwwwhqt7C09VrZYfDZwUm729Zhm8gQ OTw3SNIM5WifrY0Iad78LNqM3XSkmZbr8L0x59zSqeVLqoBfrq6qKrG3d/sO1WKc6l1XsQ BAm/3BSyAir8inXOKogBJA4xRzTfmkaTKZRD+2XT0X5WtGvSJopaOb9xnLdgqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700453605; 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=1LMrYxD32Ahj48t/cvuS4aOtZ4Jsk/2XIPcIre8Nmas=; b=irufwFxIypwXkWk0o3fUSvCSoOo0XJn+tLAgi17Ol/Kh3oXi/CmkCJWXDQ34Tl637pPC5z gOYHGkIJwTpwDEiQDVO5F+2exnyko2Y3p+8PVeodvgkrl1IsKxVxmsiT9aQsax7bfbCFIp rOS75E/nRkBG92liYcfzBYyhqFj5/sXl/VOg8okGQQ5+GcUQP7be15cApCnCQvhj130XSC RI3KYF0SNwKam0b67sOHlDggTM/gyQlGfKFdjSL7YWKggZS1iRbLdaF/H2k1Mxq2+nulgA xgbLWzH8gLAZg2CgLQLbqdgphD9AKQrRw3ISrFhWIUXz7GgP4HZyphEZ/6PIRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700453605; a=rsa-sha256; cv=none; b=jSgJKWzG1mlwnBMQduWW8A3YRVlKfTwu3fNpfPoNXLZwuo1z7Tg07wkLW15kHtpulD1kBp ItC6MRbiA3Xb/PlA8qYqTawWv2/MOlnTw9Xhtq8zK5C1MDAOsf/WHSWNYHg/NxZ33b1LvF IAX6cpiDk7HSYUR9ZshGk7jlbWXFdpUyPey8KaWEZahd2SCxKeOlJCf/Ei4otirdJTtd2m lK7N/JFg3kEHCjat+Qh/WbyloGwnr0LM5/6uXBcLvAVgOMX6hlyIictnYWyltPk8Yd8s64 EY4ruC1ux8XqJ+kesGKwedFKKqZFjse5yfgSsV08Caf7l4/5fh+wGjzWvdp2rg== 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 4SYYyr5yCnzdDp; Mon, 20 Nov 2023 04:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AK4DOsf005815; Mon, 20 Nov 2023 04:13:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AK4DOQr005812; Mon, 20 Nov 2023 04:13:24 GMT (envelope-from git) Date: Mon, 20 Nov 2023 04:13:24 GMT Message-Id: <202311200413.3AK4DOQr005812@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: d2545249739a - main - devel/tcltls: fixes to the newly-added generation of DH-parameters 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: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2545249739ae3fd9f99f400004058872e0bee94 Auto-Submitted: auto-generated The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2545249739ae3fd9f99f400004058872e0bee94 commit d2545249739ae3fd9f99f400004058872e0bee94 Author: Mikhail Teterin AuthorDate: 2023-11-20 04:10:55 +0000 Commit: Mikhail Teterin CommitDate: 2023-11-20 04:10:55 +0000 devel/tcltls: fixes to the newly-added generation of DH-parameters Specifically: - move the entire code to the post-configure target -- so that our own header will be newer than the Makefile generated by configure. Otherwise the authors' Makefile will (attempt to) regenerate the dh_param.h again. - use openssl's asnparse functionality to more reliably parse the generated prime -- and turn it into C. PR: 275160 --- devel/tcltls/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile index d370430fad53..e2965fb6995f 100644 --- a/devel/tcltls/Makefile +++ b/devel/tcltls/Makefile @@ -38,15 +38,17 @@ CFLAGS+= -Wno-error=int-conversion post-patch: ${MV} ${WRKSRC}/tests/ciphers.test ${WRKSRC}/tests/ciphers.test.broken - ${CP} ${FILESDIR}/dh_params.h ${WRKSRC}/ # Newer openssl-dhparam has no "-C" option, we emulate it here :-/ post-configure: + ${CP} ${FILESDIR}/dh_params.h ${WRKSRC}/ ${OPENSSLBASE}/bin/openssl dhparam -text 2048 | \ - ${SED} -E -e '/^---/,/^---/d' \ - -e '/(DH|prime|generator)/d' \ - -e 's/([0-9a-h]{2})(:|$$)/0x\1, /g' \ - -e w${WRKSRC}/generateddh.txt + ${OPENSSLBASE}/bin/openssl asn1parse | \ + ${SED} -E \ + -e '/^ .*(0|5):d=/d' \ + -e 's/ 4:d=1.*INTEGER *://' \ + -e 's/([0-9A-H]{2})/0x\1, /g' \ + -e 'w${WRKSRC}/generateddh.txt' post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}