From nobody Sun Sep 03 12:10:00 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 4RdrDn0R8bz4s3LB; Sun, 3 Sep 2023 12:10:01 +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 4RdrDn01shz3LqW; Sun, 3 Sep 2023 12:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693743001; 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=ywJQVtFbzd4J1pYpDVuCRpQ86vsfV8k5OYGwmvT2lPU=; b=LtpOa2Rl110ZVKgk5/GbLi5n71i7pWxxDUcPWxJzZWrM6q4Jq+zHG98v+t5emxRiVT4dm5 X4HiY1LdJjNFksnBUC9ghrksYuzeOHdtn6Fx76RiTljMg+emh0G8IqhniD1Tm1Hr6QdUTJ UeljUJzuhx1Ff7ZXTgqJ/enpC0ThpTkhJCSEP883omCLhUVARP64L1WHPm+OiYZfK42tBf nluyl9s4iBaQhbVE8ZYsNP0OUTqJCl/lFLiuMV2jNhs4UZpySCIawknpMhKG/Rl2mg83ub SAf9ppKVOaRPauEK5uMvmiBq+ExhLsbon+ZAcWO5boBdcpMC1K3d28PNN/CouQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693743001; a=rsa-sha256; cv=none; b=xOA4u+QwX1maUZ6x4w7xK7/hkkzj0hiFv5aHXPPJZ4h5Shdt4USaIIR3v/LzIZ1aL19QN4 zXBX8lZxYbHsRhx6lxmHLVoB5ctQWgJP/RrbTWBaQZHudP+Vh5FgC3/ueY3aFuphCXLRR3 Ow7CQN5gnzEgw/jx1Vfkwpr2cc2Pnu/P/7bSvO/HNF+aOw4RX3Y2+udhtZnoQv8AkfPVE1 SswXte2OVVoFCQe8qwcQzWNttjJzgGCtgHpHaL2I5iz8pegVPMbJEm56Nl/39doIJpmuyq SSn5LTuBRT9YCQcxTPOMakqDrPk5B9HQENwvsyYzpwHDGuOnQkDdd4buiqlRZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693743001; 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=ywJQVtFbzd4J1pYpDVuCRpQ86vsfV8k5OYGwmvT2lPU=; b=PIvz9jbI3EgsBGIiEq7BBnWMOmOBaqmIoEkxIuYO4sdZQFZSYTUjmsM24QiWLBKD/QpcJ6 DdnFfAvBsZ5OnCeXqcuof8rZh+JRUFblM7vc9O0t4qPZzVnZhiZUpxiUGoclCZ2nfIMM35 TitOpBcjn1deHnlUK+fDsD8Co4G3hQ8hWQ0cyax0cgTG8HLw3MmaTecMshMpGErThGo3h/ iFdl5HVpY0TjL61afuWILCHHMp++1UaCSiGRBTVT6YXTOrBCa9Xri+K7LyoIPOJxnf72K9 /43TfT3Tdx4AvapU6F8nxvCJ9LPuMhw/CVqZt9RXqpummGjICoXTP6EQpk13Cg== 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 4RdrDm5l0tz8Bm; Sun, 3 Sep 2023 12:10:00 +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 383CA00m065116; Sun, 3 Sep 2023 12:10:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 383CA0RO065088; Sun, 3 Sep 2023 12:10:00 GMT (envelope-from git) Date: Sun, 3 Sep 2023 12:10:00 GMT Message-Id: <202309031210.383CA0RO065088@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: 1653e4258711 - main - net/jose: unbreak with openssl3 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: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1653e4258711bd9b9c7b4a1ff17f16ba8cdf711e Auto-Submitted: auto-generated The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=1653e4258711bd9b9c7b4a1ff17f16ba8cdf711e commit 1653e4258711bd9b9c7b4a1ff17f16ba8cdf711e Author: Howard Holm AuthorDate: 2023-09-03 12:07:22 +0000 Commit: Matthew Seaman CommitDate: 2023-09-03 12:07:22 +0000 net/jose: unbreak with openssl3 PR: 271192 Reported by: ngie Author: Howard Holm (maintainer) --- net/jose/Makefile | 5 ++--- net/jose/files/patch-meson.build | 14 +++----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/net/jose/Makefile b/net/jose/Makefile index 0bc90d72a860..93c577d842af 100644 --- a/net/jose/Makefile +++ b/net/jose/Makefile @@ -9,12 +9,11 @@ WWW= https://github.com/latchset/jose LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= a2x:textproc/asciidoc +BUILD_DEPENDS= a2x:textproc/asciidoc \ + jq:textproc/jq LIB_DEPENDS= libjansson.so:devel/jansson USES= compiler:c11 meson ninja pkgconfig ssl -BROKEN_SSL= openssl30 openssl31 -BROKEN_SSL_REASON= Fails to build with lots of ld: error: undefined symbol: EVP_CIPHER_* USE_GITHUB= yes GH_ACCOUNT= latchset GH_TAGNAME= v11 diff --git a/net/jose/files/patch-meson.build b/net/jose/files/patch-meson.build index 43486875c3a0..052b892890a9 100644 --- a/net/jose/files/patch-meson.build +++ b/net/jose/files/patch-meson.build @@ -1,20 +1,12 @@ --- meson.build.orig 2021-05-07 13:04:06 UTC +++ meson.build -@@ -38,7 +38,7 @@ add_project_arguments( - zlib = dependency('zlib') - threads = dependency('threads') - jansson = dependency('jansson', version: '>=2.10') --libcrypto = dependency('libcrypto', version: '>=1.0.2') -+libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/lib/' ]) - a2x = find_program('a2x', required: false) - - mans = [] @@ -60,7 +60,7 @@ pkg.generate( filebase: meson.project_name(), name: 'José Library', - requires_private: [ 'zlib', 'libcrypto' ], -+ requires_private: [ 'zlib' ], ++ libraries_private: [ zlib, libcrypto ], libraries: libjose, - requires: 'jansson', +- requires: 'jansson', ++ requires: jansson, )