From nobody Thu Feb 23 10:13:38 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 4PMpl72DfBz3tHrR; Thu, 23 Feb 2023 10:13:39 +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 4PMpl71fWlz3vvb; Thu, 23 Feb 2023 10:13:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677147219; 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=Vc2P34Lv+9HK94f5pzDbJL1s0rqILS9G/peY0XdvVhs=; b=OyyhNLFBHItGQMpgIU7CIWJp2GikMEfBOLvrJiqKp76GGWMgKbTYJnXGa2yeUw8713JTOl lCGFzZ1HC++AaJHdkbt6dmqRnNEoTrIimSpz35EQUGMP2cX78HjtCPVRtwnWjELhkMXEgF hSVVyiLmeTiT3rKjcTwh09zqL0YYK9vkJ0asIIpPL/vf+r7+FP1+wlJoy1CxiSNE2m2aYq 3fS33i0W8bdelDaVUJ2HJAaRCSS/vfy0ROf1dVvYogblrZ6g7jqPog3/I9SrTEtVwwblu1 vidS+1uq5AcNPqFMu1B5QnsWpK4DbTjysQ3cDtxGApYsPCLm3aQDF/8ggXB/QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677147219; 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=Vc2P34Lv+9HK94f5pzDbJL1s0rqILS9G/peY0XdvVhs=; b=dWg3karvmQXUjiQNv1MdWU7eiVYvNQta0X8xWH9vablwqc3CIgyWJ4ilf/s9uqmHpbkx6c 1nOX3KFqfaZuPxxiPPBTKmCeFxLI2tWMHKoz5TNDOW3q6vpqRgx0MUZbp6AVNZj9o9e9Cg Ogl4b/ZwaAkCjVBXCeSOQc2GvF+9uCfHX1paSM6XEuSA9Vv0MLE80a8dKWTBMqG8kEbFHe ML/oD74J00N4bgG7z36qrID5Ks088vh0jMqIrxMtph9trBNGZhiEGSyqHFYdtiunfuNxNi zS7E09RfJUuPBZ1Wa2GrbIqD7pLG/bBzO2YbBsDTUKIbO+ltj5XU54JCsrVt8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677147219; a=rsa-sha256; cv=none; b=AZPuy9ZOwr2YEp6psNXfXEYuuSfKU4p8v5yCTj4GaQImnZUnWDhAfCez4tg0QBydvu89Wh ddXz9sR+9hilw5h/YpTHUochqQb08vO5W0C5f84z0WfX4v3Oiw30XvRznQfxlxBC5EXVDy /iYNSDlIUPsVllB8OXopSby90Ft0cixRymCxyxb8Yr9KdJcRVZ15lV1TzZCQoSj28luumN bFR3KToMZtkUsFrkYufUs7Rifvs4ibBTiYc6i70PFNU7dj0UlvIwn2BHmNww5aRrDqafsm ZM1PoDFjvLTuFDwfGExqXNWgm1sPbF2L8XZhN4Xz25LA4zfEMHzwEQzSEgDYWQ== 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 4PMpl70ctpzdqV; Thu, 23 Feb 2023 10:13:39 +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 31NADcO1017212; Thu, 23 Feb 2023 10:13:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31NADcgS017211; Thu, 23 Feb 2023 10:13:38 GMT (envelope-from git) Date: Thu, 23 Feb 2023 10:13:38 GMT Message-Id: <202302231013.31NADcgS017211@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 6074b736dee1 - main - security/pks: unbreak the build against modern OpenSSL 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6074b736dee149ea37d58e48968901118981b9fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=6074b736dee149ea37d58e48968901118981b9fc commit 6074b736dee149ea37d58e48968901118981b9fc Author: Alexey Dokuchaev AuthorDate: 2023-02-23 10:06:50 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-02-23 10:06:50 +0000 security/pks: unbreak the build against modern OpenSSL Garbage-collect nowadays useless USE_GCC=yes while here. --- security/pks/Makefile | 12 ------------ security/pks/files/patch-pgputil.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/security/pks/Makefile b/security/pks/Makefile index 614e53f98f89..90a249c889e2 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -12,13 +12,7 @@ WWW= http://www.mit.edu/people/marc/pks/ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_SSL= openssl -BROKEN_SSL_REASON_openssl= member access into incomplete type 'EVP_PKEY' (aka 'evp_pkey_st') -DEPRECATED= Broken with recent ssl -EXPIRATION_DATE= 2023-03-20 - USES= bdb ssl -USE_GCC= yes USE_RC_SUBR= pksd WRKSRC= ${WRKDIR}/${PORTNAME} @@ -53,10 +47,4 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ -.include - -.if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} == base -BROKEN= Does not build with OpenSSL 1.1 -.endif - .include diff --git a/security/pks/files/patch-pgputil.c b/security/pks/files/patch-pgputil.c new file mode 100644 index 000000000000..624635bcb56f --- /dev/null +++ b/security/pks/files/patch-pgputil.c @@ -0,0 +1,20 @@ +--- pgputil.c.orig 2003-04-30 04:13:38 UTC ++++ pgputil.c +@@ -221,14 +221,14 @@ decode_x509 (ddesc * data, long len, ddesc * keyid) + { + return (0); + } +- switch (pkey->type) ++ switch (EVP_PKEY_type(EVP_PKEY_id(pkey))) + { + case EVP_PKEY_RSA: + /* pkey->pkey.rsa->n is the modulus */ +- b = BN_dup (pkey->pkey.rsa->n); ++ b = BN_dup (RSA_get0_n(EVP_PKEY_get0_RSA(pkey))); + break; + case EVP_PKEY_DSA: +- b = BN_dup (pkey->pkey.dsa->p); ++ b = BN_dup (RSA_get0_p(EVP_PKEY_get0_DSA(pkey))); + break; + } + EVP_PKEY_free (pkey);