From nobody Tue Jun 06 18:41:24 2023 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 4QbK7T1mxSz4Zsf7; Tue, 6 Jun 2023 18:41: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 4QbK7T0Lyyz4LJR; Tue, 6 Jun 2023 18:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686076885; 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=ZXuYjBzEDvIaU5SMA/CkDHKtofRO4KOullXYNZKqVr0=; b=Z4ku2FBWN2Al6l+FSptSBWhAyvPgkfgRg11AIodXvCwwV65dNxc2YqsNiuIplOnawsYMgr 8MvbyetC6Gm295Kyi7tup2uUEu7tyy/TVBENhhkorpmAFPPjulwbt5m7Gwjqf6PsqqsYi+ xG2iziv3i/pXHVTT7gwwcd71fgTB0Rr+WxI2rmKYh78DMaJKVcaDmo4XmjHh39QnnulL4D 6dKGFoCPtC7KmBleCN6fSaEepG9KN6zQKYcLQMeVPyGQIl5Az9vvXblYvzMZ5/2eoMMfSV fNBeEOwooL0RfXb8SQ0Bq+frZFq6OqGBdfZxViVV7rM0WIKQobSIGX7TlfFFng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686076885; 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=ZXuYjBzEDvIaU5SMA/CkDHKtofRO4KOullXYNZKqVr0=; b=Il4bhy4TKlDskOXNYcbvscZ3XfNDKHH9bXwf+RMqLyAm6otFCtzWwiTret5Pz63X7flVWh kDJ2E/uxkZiWBNsgPwP1IYiswaf6CA226sVSGd8gXcs2X3boJKuuyQTv6A5oxSd1nt84uT Xh/nBpN0KfHpI6EJ39znD55XuuzoutKScDCI++GAvobsEDRAfzfZipKB+Y36GCS8iidPOu mR91SRhCoEkRZYRM3t4keQwUwtEW9O4PJ8+4tk/lUPfKgNs3dnrnZnGBUy/dTtgk/SGWKQ 3+nFTD4TyV5S6diDk4kWCYrzOr0ulWq5F3p8MKc6vd6aLfol+7mm/0mGc4zmJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686076885; a=rsa-sha256; cv=none; b=GqbSD/6MkGMXxn/HpGkg32p9ZQB8c3b5hSug9qcBX2xugvUk/UM2tyqD0RmJakG3q5BMGY rWcTDmaYV4uyt20wK9KlRuiY0MBmlCTs4GUlqRA5JzmgeTPxpqPoQ8quvbMz72mHgMGjvu MH5Iryv6ctcesn6ml7+wW98aDajozri+jqYW2Jk8eje4twlilldzTxcFVJo/R9m1I4pAaW aU6rZMQQNM0ErERHd/NJtD0lipY7qdeLY8UuUmtXzd/0Z84kyTQurNrVTXXV6vExjYMReb JC3gXuThCix59a+jbO2qjOCHxwv/7Y25xllZa7Vd1YdjjpsKvpgKTAMgTBJS0g== 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 4QbK7S6P0Jzgdv; Tue, 6 Jun 2023 18:41:24 +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 356IfOK8026266; Tue, 6 Jun 2023 18:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 356IfOeQ026265; Tue, 6 Jun 2023 18:41:24 GMT (envelope-from git) Date: Tue, 6 Jun 2023 18:41:24 GMT Message-Id: <202306061841.356IfOeQ026265@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: c9f69ef9aa8a - main - security/krb5-*: Adjust conflicts 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9f69ef9aa8ad9abf21ad50ad1ff54925421c395 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c9f69ef9aa8ad9abf21ad50ad1ff54925421c395 commit c9f69ef9aa8ad9abf21ad50ad1ff54925421c395 Author: Cy Schubert AuthorDate: 2023-06-06 18:13:33 +0000 Commit: Cy Schubert CommitDate: 2023-06-06 18:35:41 +0000 security/krb5-*: Adjust conflicts With the import of security/krb5-121, adjust conflicts of all krb5 ports. --- security/krb5-118/Makefile | 2 +- security/krb5-119/Makefile | 2 +- security/krb5-120/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/security/krb5-118/Makefile b/security/krb5-118/Makefile index cb984b96eed3..65dc2faa8e18 100644 --- a/security/krb5-118/Makefile +++ b/security/krb5-118/Makefile @@ -19,7 +19,7 @@ WWW= https://web.mit.edu/kerberos/ LICENSE= MIT -CONFLICTS= heimdal krb5 krb5-119 krb5-120 +CONFLICTS= heimdal krb5 krb5-119 krb5-12* CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile index 9e708d614760..c4e24fcc4f6b 100644 --- a/security/krb5-119/Makefile +++ b/security/krb5-119/Makefile @@ -18,7 +18,7 @@ WWW= https://web.mit.edu/kerberos/ LICENSE= MIT -CONFLICTS= heimdal krb5 krb5-118 krb5-120 +CONFLICTS= heimdal krb5 krb5-118 krb5-12* CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-120/Makefile b/security/krb5-120/Makefile index 11cc5da213d2..bd5065ea0a5b 100644 --- a/security/krb5-120/Makefile +++ b/security/krb5-120/Makefile @@ -15,7 +15,7 @@ WWW= https://web.mit.edu/kerberos/ LICENSE= MIT -CONFLICTS= heimdal krb5 krb5-11* +CONFLICTS= heimdal krb5 krb5-11* krb5-121 CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/