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

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 <bofh@FreeBSD.org>
 
 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"