From nobody Sat Apr 23 15:23:46 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 EDDCA198D018; Sat, 23 Apr 2022 15:23:46 +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 4Klw6B3Mk3z3Fml; Sat, 23 Apr 2022 15:23:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650727426; 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=RC64BqEap7M0z98mtWvrJ8pScAaqklLnh9q00AIUHuw=; b=pdwdhPSWEzxZ/zcoPJpnMQOpevq5x/JcdsGkkbor7RUTvd1aQETVLE3iD0QlqoRiu5AUwv J8SlklpexTv7tBcbbE6lyCM0nDQUyamE5y/xQV9V9mqy2h2BSo3lGAhawMOFg6IYSoN3UF p4j7YnAIiwq6lCGHApNxmFcjD8J06HTkbmezBAlP5l+FfAVG3ytT+1wFx1bvj7MM0NQEy7 zhgX01vq5RNpgNBm8Fn79DMqw4IRYcDQfg91fy53mBsshhJcqyrZv+1xk07XWh22U3BmD4 BpymWWyKVFAMktHU72yQbBfSdhbzOSdHhFJzroYkDh0eEiwI/WzvgLX1kPjsSA== 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 2775E14799; Sat, 23 Apr 2022 15:23:46 +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 23NFNkEO028824; Sat, 23 Apr 2022 15:23:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23NFNk4v028823; Sat, 23 Apr 2022 15:23:46 GMT (envelope-from git) Date: Sat, 23 Apr 2022 15:23:46 GMT Message-Id: <202204231523.23NFNk4v028823@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: 6e6312305255 - main - net/irrd: Update version 4.2.2=>4.2.4 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: 6e63123052558ce48c063aa57200ae6e352f0045 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650727426; 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=RC64BqEap7M0z98mtWvrJ8pScAaqklLnh9q00AIUHuw=; b=LWKRHk6o8eEgNVMuEICnACxH0w+O6ysP8AKg/8p9+LGXf6EfGevymmVGaDVMyKnReMNxbG i78/I3R7akPqhp32lcBI4hCV2d0kwmrZJCz//bV5oeAB/c9qhQaNewGrXQhKedP5nyNbvG NTATEnW3fNYuuJup1oT0G72/PRARujKRik0S4hLLY9WPanNz0OO1DZfJE03mSARUlRkk6t DF6KmpOtdkSzekJ1ZZmlOXYNj6L30xR1pQRupVf9R+eoM+iAFtklA/3ODRx7aK/RCFN/KP kt3Yk/I5RioiUWqPLi7eMXY1hf6eEQ3CAXJtdwtKFF3R0IqbP7yzaBpdwIhu3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650727426; a=rsa-sha256; cv=none; b=gBuWlFh2L7rxxkWckSpQ3S2ypJg1xWb8kfp0vuTV1qDRuaidjhF2lPH+HKMovK3B8fTBm8 9qO7vQRz/Xl9mZAy7xzz21Cxl+sVaLYuOgB3tKJXdi4FE2w/PamuxJzokRQ9RsMFZIHsGF cjcWnmYMnluPZb1jzeEjBR1V8IH5vZ+7E3O2mzg4ab67M7Bezn15AMMADcCyxutR5vbDiy itS2IdL5/GDmJtxsRXu9Y6RA+DLcDEUteWYPyBcC3IMGlX+2l6WxYS9b8h9tlxJkTH9Xcc TE4ECUXoLyltm5h0n/xY7zJXeS60cFe5rDkGfI1MSz5GBReZhMAWktNiaLu+4Q== 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=6e63123052558ce48c063aa57200ae6e352f0045 commit 6e63123052558ce48c063aa57200ae6e352f0045 Author: Muhammad Moinur Rahman AuthorDate: 2022-04-23 15:21:40 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-04-23 15:23:30 +0000 net/irrd: Update version 4.2.2=>4.2.4 - Fix rc script to use irrd service rather than twisted Relnotes: https://github.com/irrdnet/irrd/releases/tag/v4.2.4 --- net/irrd/Makefile | 90 +++++++++++++++++++++++++++++++++---------------- net/irrd/distinfo | 6 ++-- net/irrd/files/irrd4.in | 4 +-- 3 files changed, 66 insertions(+), 34 deletions(-) diff --git a/net/irrd/Makefile b/net/irrd/Makefile index c8fbe5bd01bb..547f2e56c29e 100644 --- a/net/irrd/Makefile +++ b/net/irrd/Makefile @@ -1,7 +1,7 @@ # Created by: Muhammad Moinur Rahman PORTNAME= irrd -PORTVERSION= 4.2.2 +PORTVERSION= 4.2.4 DISTVERSIONPREFIX= v CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,48 +13,80 @@ COMMENT= Internet Routing Registry database server v4 LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -#python-gnupg==0.4.4 needs updating -#twisted==19.2.1 needs updating +#ariadne==0.14.1 +#hiredis==2.0.0 +#ordered-set==4.0.2 +#pydantic==1.9.0 +#python-gnupg==0.4.8 +#pytz==2022.1 +#redis==4.2.0 +#PyYAML==6.0 BUILD_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}alembic>=1.0.10:databases/py-alembic@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}beautifultable>=0.7.0:devel/py-beautifultable@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dotted>=0.1.8:devel/py-dotted@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ipy>=1.00:net-mgmt/py-ipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}alembic>=1.7.7:databases/py-alembic@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}asgiref>=3.4.1:www/py-asgiref@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bcrypt>=3.2.0:security/py-bcrypt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifultable>=0.8.0:devel/py-beautifultable@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}daemon>=2.3.0:devel/py-daemon@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}datrie>=0.8.2:devel/py-datrie@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hiredis>=0.2.0:databases/py-hiredis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipy>=1.01:net-mgmt/py-ipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ordered-set>=3.1.1:devel/py-ordered-set@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}passlib>=1.7.1:security/py-passlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.2:databases/py-psycopg2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}python-gnupg>=0.4.3:security/py-python-gnupg@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}twisted>=18.9.0:devel/py-twisted@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ujson>=1.35:devel/py-ujson@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}passlib>=1.7.4:security/py-passlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pid>=3.0.4:devel/py-pid@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=5.9.0:sysutils/py-psutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.3:databases/py-psycopg2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2cffi>=2.9.0:databases/py-psycopg2cffi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pydantic>=1.8.2:devel/py-pydantic@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-gnupg>=0.4.7:security/py-python-gnupg@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2021.3:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}redis>=3.5.3:databases/py-redis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.27.1:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.2.2:devel/py-setproctitle@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.16.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.24:databases/py-sqlalchemy14@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}starlette>=0.17.1:www/py-starlette@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ujson>=4.3.0:devel/py-ujson@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}uvicorn>=0.16.0:www/py-uvicorn@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} +#pytest-cov==3.0.0 +#python-graphql-client==0.4.2 TEST_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}coverage>=4.5.3:devel/py-coverage@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest>=4.4.1:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.6.1:devel/py-pytest-cov@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}coverage>=6.2:devel/py-coverage@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.9.0:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-env>=0.6.2:devel/py-pytest-env@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=7.0.1:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=22.2.0:devel/py-twisted@${PY_FLAVOR} -USES= pgsql python:3.6+ +USES= python:3.6+ USE_GITHUB= yes +GH_ACCOUNT= irrdnet +GH_PROJECT= ${PORTNAME} USE_PYTHON= autoplist concurrent distutils USE_RC_SUBR= irrd4 -GH_ACCOUNT= irrdnet -GH_PROJECT= ${PORTNAME} +NO_ARCH= yes +SUB_FILES= pkg-message +SUB_LIST= GROUPS=${GROUPS} \ + PGSQL_DEFAULT=${PGSQL_DEFAULT} \ + PYTHON_CMD="${PYTHON_CMD}" \ + USERS=${USERS} USERS= ${PORTNAME} GROUPS= ${PORTNAME} -OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=2.0.1,1:textproc/py-sphinx@${PY_FLAVOR} - PLIST_FILES= "@sample etc/${PORTNAME}${PKGNAMESUFFIX}.yaml.sample" -NO_ARCH= yes -SUB_FILES= pkg-message -SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" \ - PGSQL_DEFAULT=${PGSQL_DEFAULT} \ - USERS=${USERS} \ - GROUPS=${GROUPS} +OPTIONS_DEFINE= DOCS +#sphinxcontrib-spelling==7.3.2 +#sphinx-material==0.0.35 +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=4.3.2:textproc/py-sphinx@${PY_FLAVOR} + +post-patch: + @${REINPLACE_CMD} -e 's|/etc/irrd.yaml|${PREFIX}/etc/irrd.yaml|g' \ + ${WRKSRC}/docs/users/mirroring.rst \ + ${WRKSRC}/docs/admins/configuration.rst \ + ${WRKSRC}/docs/admins/deployment.rst \ + ${WRKSRC}/irrd/conf/__init__.py post-install: ${INSTALL_DATA} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/conf/default_config.yaml \ diff --git a/net/irrd/distinfo b/net/irrd/distinfo index 5d491b4d2ccb..4c8866aa7d01 100644 --- a/net/irrd/distinfo +++ b/net/irrd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638746490 -SHA256 (irrdnet-irrd-v4.2.2_GH0.tar.gz) = a2993ba60ca762044dad0763a19097666950070a3c24d4de69ffe1784ad0e19c -SIZE (irrdnet-irrd-v4.2.2_GH0.tar.gz) = 360944 +TIMESTAMP = 1650584148 +SHA256 (irrdnet-irrd-v4.2.4_GH0.tar.gz) = ca6808c9d826c2b71fad7dbe391f04bf04cd2ca8b2dcdf3dfae01ec2bee410a3 +SIZE (irrdnet-irrd-v4.2.4_GH0.tar.gz) = 365214 diff --git a/net/irrd/files/irrd4.in b/net/irrd/files/irrd4.in index 7f26fcb48343..6e0402267397 100644 --- a/net/irrd/files/irrd4.in +++ b/net/irrd/files/irrd4.in @@ -24,7 +24,7 @@ name="irrd4" rcvar=irrd4_enable -command="%%PREFIX%%/bin/twistd" +command="%%PREFIX%%/bin/irrd" load_rc_config $name @@ -39,6 +39,6 @@ required_files="${irrd4_config}" command_interpreter="%%PYTHON_CMD%%" pidfile=${irrd4_pidfile} -command_args="--originalname -u ${irrd4_uid} -g ${irrd4_gid} --pidfile ${pidfile} -l ${irrd4_logfile} irrd -c ${irrd4_config}" +command_args="--config ${irrd4_config}" run_rc_command "$1"