From nobody Thu Jun 9 11:05:23 2022 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 4E5C2836CCC; Thu, 9 Jun 2022 11:05:26 +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 4LJh8N0xFmz4yVK; Thu, 9 Jun 2022 11:05:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654772724; 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=qM80saylw1dhKaZEzbomWgPZleIfvah8HExTUh7sqr0=; b=Yo83nxRwC6F/S8DB1XkYCgXJINGRVzbztbUh9nouDkqBda3dUY5WSazfVHAS1+KJF6YE7f LRKusacVALuoQJhNB+LVEMSTtrHagqIR6SarvjnTKzS8XVlHqXCM/i4o9Oh6541eIVB2CL FdV3tOXHg1126czDNcXgdUoUR3YJGhmSr0tJC7RSCeX+Z61coQXOFvcLKL+Jas8nXo628u c5Oo/IOBc1JvvGn6FsULU0TKb7MiE9aneuvVsjUIiAJCfHisUXN0+q+7V+vD5+HbqHUSFL LU3TG2vR4JPu4U2ABtJuGIuh5Yij820a16D2huOL+7g49Vk/GZFspmXHhdoqPA== 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 D088222DB9; Thu, 9 Jun 2022 11:05:23 +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 259B5NBx052582; Thu, 9 Jun 2022 11:05:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 259B5NLA052581; Thu, 9 Jun 2022 11:05:23 GMT (envelope-from git) Date: Thu, 9 Jun 2022 11:05:23 GMT Message-Id: <202206091105.259B5NLA052581@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 73d0476c9083 - main - www/py-pyjwt*: Mark CONFLICTS_INSTALL 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73d0476c9083b82d8400c22f34c3e4c62347ba30 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654772724; 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=qM80saylw1dhKaZEzbomWgPZleIfvah8HExTUh7sqr0=; b=As1WTJOurBv07OndzpUlCQ4gJmnYvrO2RpERiT/35qWvnV399NF8Uq/B3ebDQ4We4bTLT/ 9mMi8TrsdOSO2uV/S5KCH/1c5lRmG45rCfb3AzOLqeLm/pbEN6oLBmOLPca630gs+CdUdL U64S3jh995Ar0fqZAT3wcbwpSjkGzpwNrJ2qOzUSXiUxlcC8B9suPqoB5YlHR1qQa8oT8f IrQuiGfmrGjpCeYvLN3euvqhBKbauAct7oJEI1dyd84dHthq2ZA8rgqkjlh8RX0W+wexpX CknJnLVzv4SIhwubXm7BFFGKez99IdKlc85a+00w+N1TsPEuYMauAD97JnVTHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654772724; a=rsa-sha256; cv=none; b=ZiXNm3nOXd7WWKrDgbDu2HgMrFj+QWxCZkygDvSUtMkV6iKr5Ctwd+MSaxOYTeWP/1wf6r CbfTPmIDkpY69prdjg2dL9bPv2X/rOr7dm4P8A4quKqr2gmiP6Fy6/oq6vDAHz2GvTAPVP a3KLXgBXWbBvDjPyKXhCGisYKQSwCXiYRcMPnw35stVd3m093Cm+EQivdpGv1vKEd6vN0s Vb8wMScWkLk3HumsasYmc8U66LHDbjLxXIwHzTdQdagzNasNqdn88nVuIjMSq7OHIguLmf v7Oz4uEgWSQ2XTIdxWqfFZQLJDJmIyjf2kEI6Czk/bn/3WXgIke6sJSmEuJfjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=73d0476c9083b82d8400c22f34c3e4c62347ba30 commit 73d0476c9083b82d8400c22f34c3e4c62347ba30 Author: Po-Chuan Hsieh AuthorDate: 2022-06-09 11:00:41 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-06-09 11:00:41 +0000 www/py-pyjwt*: Mark CONFLICTS_INSTALL PR: 264146 Reported by: Goran Mekic --- www/py-pyjwt/Makefile | 2 ++ www/py-pyjwt1/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/www/py-pyjwt/Makefile b/www/py-pyjwt/Makefile index 842a090e46c0..a829758e37ae 100644 --- a/www/py-pyjwt/Makefile +++ b/www/py-pyjwt/Makefile @@ -18,6 +18,8 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}-pyjwt1 + CPE_VENDOR= pyjwt_project OPTIONS_DEFINE= CRYPTO diff --git a/www/py-pyjwt1/Makefile b/www/py-pyjwt1/Makefile index 756aa5a53245..61b79e3e4973 100644 --- a/www/py-pyjwt1/Makefile +++ b/www/py-pyjwt1/Makefile @@ -20,6 +20,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}-pyjwt + OPTIONS_DEFINE= RSASSA RSASSA_DESC= RSASSA-PKCS1 v1.5 signature support