From nobody Mon Feb 28 23:41:01 2022 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 1A92619ED5DE; Mon, 28 Feb 2022 23:41:03 +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 4K6xht2L1Yz3j1f; Mon, 28 Feb 2022 23:41:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646091662; 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=pzNGv7ZRV1vI50SUY9g4H2E6VrFf6e4GcicWER5mFKg=; b=I5UgbXFirKIZJuMDi5kMno/4utKAVh/DBI+Ka4Z+WNJ0b9eLIfDoa/BCumLUk/OdNtjG5z 1SpjS+Au6UJ854Iu80RIKvsjLn3AJiDXI0dx3VF20D/HNw7MDI3CItlD/2eqmfSC23Xzgx ZnG3ymUII1z729xGX3EESzer8QkRiHQIdH1fWJLmWU9C5G0+5lrfCB1EWYUSK2hqHwuc+d yWzmBarrX8vT/+U5Qh1mwjuokjfWfAPPuybulnXoG0oOWd5mvhuaHcT8FJK3PV1+kQSatE ao+Wxp5VXzY0u2cSYEAXmled53DRQRjHhLfl+ByX2EHOSIlMH46/NfIPGuzKRg== 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 0500E247F8; Mon, 28 Feb 2022 23:41:02 +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 21SNf1MS039509; Mon, 28 Feb 2022 23:41:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SNf1fw039508; Mon, 28 Feb 2022 23:41:01 GMT (envelope-from git) Date: Mon, 28 Feb 2022 23:41:01 GMT Message-Id: <202202282341.21SNf1fw039508@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 08b5ebce79c5 - main - dns/py-dnspython: Revert 7fc16da 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08b5ebce79c5923c31b249d37df69b99ddcb843e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646091662; 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=pzNGv7ZRV1vI50SUY9g4H2E6VrFf6e4GcicWER5mFKg=; b=HijQosxMGDUSy2poYIkac4Mfx/SrCaznp1Kk9G0vwmZCme5Ux/tvDpDv1DAqWjDMrm3+8v omvgq5tSfSqEFeCXWMWFZi9EA+X7Zw3CqiAkqtrnybTzMQ3oHCI9jPEg+BfMPdct2mcXC+ rh2a7MZk35u89B6L1LIVjCSkgzAiNd5DdNQphbFg/mKgq2f100UKlIapXE7vZOorBmnSoY kcRmJMGWSPmDkJJU1iQ4lflTo/LbVtWAlvYnsXd0/opDpSm02H8zAwORFfXM30Z/yqxImK qDQHXQkTj/ss33uHV/uXSPvO+1KgzWfyJdSpRAUW8IEND1MGjb2NC8cUOSzQXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646091662; a=rsa-sha256; cv=none; b=ljUCc4J2FLHayjzQ4wzqBdlKbDb7Np/32Kt0kS7b3zeybQG1veeqOahirP3eX230MuLOt7 nDIAkQQSndLeqtok+SZ/03+JiTQWZEVPhHm4YytZlF5vdTvbCY0d124weNYC6Jka+c9CCW fEckRSq9S5JeAnyGZArAYJRzYUDZ538RSlhN2WuLgWAUPvwvdhjlbrdnp/XHWeHMaiKhR4 VMej17GVnVBQ4ZUdmiBM7g6+QbbKPgc701lYVAfcu8ozaivlEWWgNhe7jKveOuIEMP6wyF 6h/n3GTiYqiV4f3F+tzdms5Ud9yhMbhLTT432k++M5UWwApjY1GCRHzqaLzSzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=08b5ebce79c5923c31b249d37df69b99ddcb843e commit 08b5ebce79c5923c31b249d37df69b99ddcb843e Author: Muhammad Moinur Rahman AuthorDate: 2022-02-28 23:31:02 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-02-28 23:40:41 +0000 dns/py-dnspython: Revert 7fc16da - Remove duplicate PORTVERSION based on PYTHON_MAJOR_VER - Add PORTEPOCH as version number going backwards 2.1.0=>1.16.0 - Restrict python upto 3.7 - Fix finance/electrum which was changed based on this. - Fix dns/py-dns-lexicon which was changed based on this. PR: 261325 Approved by: portmgr Fixes: 7fc16da dns/py-dnspython: Update to 2.1.0 for Python 3 --- dns/py-dns-lexicon/Makefile | 4 ++-- dns/py-dnspython/Makefile | 22 ++++++++-------------- dns/py-dnspython/distinfo | 4 +--- finance/electrum/Makefile | 4 ++-- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dns/py-dns-lexicon/Makefile b/dns/py-dns-lexicon/Makefile index f5b1b39ca35d..12f4451fbb78 100644 --- a/dns/py-dns-lexicon/Makefile +++ b/dns/py-dns-lexicon/Makefile @@ -2,7 +2,7 @@ PORTNAME= dns-lexicon PORTVERSION= 3.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -32,7 +32,7 @@ OCI_DESC= Oracle Cloud Infrastructure (OCI) support ROUTE53_DESC= Route 53 support SOFTLAYER_DESC= SoftLayer (IBM Cloud) support -DDNS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=2:dns/py-dnspython@${PY_FLAVOR} +DDNS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython2>=2:dns/py-dnspython2@${PY_FLAVOR} GRANSY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zeep>=3:net/py-zeep@${PY_FLAVOR} LOCALZONE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}localzone>=0.9.8:dns/py-localzone@${PY_FLAVOR} OCI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oci>=2:devel/py-oci@${PY_FLAVOR} diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile index ba52900816d1..083f98e153a6 100644 --- a/dns/py-dnspython/Makefile +++ b/dns/py-dnspython/Makefile @@ -2,6 +2,7 @@ PORTNAME= dnspython PORTVERSION= 1.16.0 +PORTEPOCH= 1 CATEGORIES= dns python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,27 +13,20 @@ COMMENT= DNS toolkit for Python LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python:2.7+ zip +USES= python:2.7-3.7 zip USE_PYTHON= autoplist concurrent cython distutils NO_ARCH= yes -OPTIONS_DEFINE= EXAMPLES PYCRYPTODOME -PYCRYPTODOME_DESC= Enable pycryptodome (part of dnssec needs it) -PYCRYPTODOME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR} - -PORTEXAMPLES= ddns.py e164.py mx.py name.py reverse.py reverse_name.py \ - xfr.py zonediff.py +PORTEXAMPLES= ddns.py e164.py mx.py name.py reverse.py reverse_name.py xfr.py \ + zonediff.py -.include - -.if ${PYTHON_MAJOR_VER} == 3 -PORTVERSION= 2.1.0 -.endif +OPTIONS_DEFINE= EXAMPLES PYCRYPTODOME +PYCRYPTODOME_DESC= Enable pycryptodome (part of dnssec needs it) +PYCRYPTODOME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR} post-install-EXAMPLES-on: -# examples @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} ${STAGEDIR}${EXAMPLESDIR} -.include +.include diff --git a/dns/py-dnspython/distinfo b/dns/py-dnspython/distinfo index a4ae58940da3..88b7df39d17d 100644 --- a/dns/py-dnspython/distinfo +++ b/dns/py-dnspython/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1613064959 +TIMESTAMP = 1646069762 SHA256 (dnspython-1.16.0.zip) = 36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01 SIZE (dnspython-1.16.0.zip) = 266364 -SHA256 (dnspython-2.1.0.zip) = e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4 -SIZE (dnspython-2.1.0.zip) = 389021 diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile index 93d821c7bc2e..901c2d8e96b9 100644 --- a/finance/electrum/Makefile +++ b/finance/electrum/Makefile @@ -2,7 +2,7 @@ PORTNAME= electrum PORTVERSION= 4.1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance python MASTER_SITES= https://download.electrum.org/${PORTVERSION}/ \ http://download.electrum.org/${PORTVERSION}/ @@ -23,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp-socks>=0.3:net/py-aiohttp-socks@${PY ${PYTHON_PKGNAMEPREFIX}bitstring>0:devel/py-bitstring@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cryptography>=2.6:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dnspython>=2.0:dns/py-dnspython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dnspython2>=2.0:dns/py-dnspython2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${PY_FLAVOR} \