From nobody Fri Mar 28 15:36:32 2025 X-Original-To: dev-commits-ports-main@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 4ZPPl46cyRz5s1s7; Fri, 28 Mar 2025 15:36:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZPPl44rJjz4QQw; Fri, 28 Mar 2025 15:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743176192; 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=DKTHMs0J1IfK4a45gN2z7G8KHaFyLmtEZwHFrljMPT4=; b=fSRdmQwYXczMJsNRdD83d2q0MvMtAeErd3GwvNnjT/3XAg3K/xhCyMiOKdJWkqcWQ7Aw5/ LuikDUjw2oYUee9f3qbMW+Pmf3EAHm4DixfyydPvw+ELNqUU8dxbYCfs/oP8uUSLILcIYu pw3rYDFuIcVO4pRo1Yivsq7zxNshsUZ/RE7fKnz0hRKwiGVfYtteHxh4C5xu+X2X1LOzxN WRtMAQoAdgXmcqr6Uv6PNSh880Zc3mJK7qhUG4IoJMjfue8nqLUd619Zw8ZASvV4kt4G8C xkbQ8yOU0mJtzNtQPweZxQ8f5B6LmFc0iH26hixiu7KKHTvKIvgh6zKWspnBYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743176192; a=rsa-sha256; cv=none; b=YMW+qPs3H+NtYYkXhnVhEy9tmHraEfMItretK7EofPezcJflBcSj9TTh4v79oULuP0Kc+O vfY69VcXT6fPveiYlahU6ceZgL+mbxNnH8dtXxPOVWmlydlODnEyvEUal5VjtbcxrjaD1q 37up66VP02pNofuN9/OnNRrTZ1l/Pj2fbo0Y1sVNW4oS2BgMuR4HS7WrubFHQY6h/lPR7n FQR6THc/hrvTmhDR5Ke8P9R0PAt5z3OaeYb+Y2I7NIEJtQxd2M4zQEDhuzmUKHaBxrcjCC 9iuelIGZOokrxoedly4GCfPpXTQlDsaayE+pSwZsd/XVa213fueCXDFCt6BJSA== 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=1743176192; 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=DKTHMs0J1IfK4a45gN2z7G8KHaFyLmtEZwHFrljMPT4=; b=T9Ti0wwg3Ft6GgGgfIdKCxcdcQYYmxWj2dsxlYcQfZ+yO6wJRG7MskfxgSNbrdbbhxbgb5 yMzoJpPTUD/GnDFPUROJ6hRLGq9bxI0yVQu2mYBUKzjCWivZg7MRsOYsNoW+FxKoiz2vmL klG1/8zurp/mrGA9j2WRhJMJ4B+HYKDGKCrE+wIWsnGe7bNPjp2Lm5DXyy6mX5ajwVpuw4 gN+opG7zvcVzkf/5ZeKs60iuGm0dVBtDxPIELSzbcxE0yIpZtJ/SsMDvWol12l6WocjFKd IqNSvoG8/Z1Da6AcKamGA8Z3SvIpaAqec8pTf/ErZZ4Wklx2RXlr+rT1PpXSqQ== 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 4ZPPl44NZHzpSw; Fri, 28 Mar 2025 15:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52SFaWEw029669; Fri, 28 Mar 2025 15:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52SFaWKL029666; Fri, 28 Mar 2025 15:36:32 GMT (envelope-from git) Date: Fri, 28 Mar 2025 15:36:32 GMT Message-Id: <202503281536.52SFaWKL029666@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: 3f605c51f9b4 - main - security/openssl: Mark CONFLICT with new OpenSSL 3.5 port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 3f605c51f9b4e7df3f695036ad67d5d4b3a4e2d9 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f605c51f9b4e7df3f695036ad67d5d4b3a4e2d9 commit 3f605c51f9b4e7df3f695036ad67d5d4b3a4e2d9 Author: Bernard Spil AuthorDate: 2025-03-28 15:35:46 +0000 Commit: Bernard Spil CommitDate: 2025-03-28 15:35:46 +0000 security/openssl: Mark CONFLICT with new OpenSSL 3.5 port --- security/openssl111/Makefile | 2 +- security/openssl31/Makefile | 2 +- security/openssl32/Makefile | 2 +- security/openssl33/Makefile | 2 +- security/openssl34/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/security/openssl111/Makefile b/security/openssl111/Makefile index b88948d4dcc3..3621a9c8a7de 100644 --- a/security/openssl111/Makefile +++ b/security/openssl111/Makefile @@ -17,7 +17,7 @@ DEPRECATED= End-of-life since 2023-09-11, see https://www.openssl.org/blog/blog/ port will be removed when FreeBSD 13 is EoL EXPIRATION_DATE= 2026-04-30 -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3[12] openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3* openssl*-quictls USES= cpe perl5 USE_PERL5= build diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile index 9656df916d8b..3f98568e46a7 100644 --- a/security/openssl31/Makefile +++ b/security/openssl31/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt #EXPIRATION_DATE= 2025-03-14 -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[234] openssl*-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[2345] openssl*-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile index 97fab235b7e2..ae59b26936e6 100644 --- a/security/openssl32/Makefile +++ b/security/openssl32/Makefile @@ -11,7 +11,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[134] openssl*-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[1345] openssl*-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl33/Makefile b/security/openssl33/Makefile index 02db454d9cdc..92b2a3b70d07 100644 --- a/security/openssl33/Makefile +++ b/security/openssl33/Makefile @@ -11,7 +11,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[124] openssl*-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[1245] openssl*-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl34/Makefile b/security/openssl34/Makefile index e9bfd2977a94..b1ab27b4efc0 100644 --- a/security/openssl34/Makefile +++ b/security/openssl34/Makefile @@ -11,7 +11,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[123] openssl*-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[1235] openssl*-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config