Attachment #253681 for bug #269298




From 534c700175de86f3b6591abb5f156f2bbf79d581 Mon Sep 17 00:00:00 2001
From: Geoffroy Desvernay <dgeo@centrale-marseille.fr>
Date: Wed, 29 May 2024 15:00:35 +0200
Subject: [PATCH] iocage project migrated to freebsd's GH org

Version updated to 1.7
 - fix empty HTTP_PROXY
 - linsysfs support
 - allow_nfsd new param
 - fix `iocage list -h` output
 - add devel/py-six dependency
 - New home and new release (since 2019!)
   Many bugfixes (including port's patches) included.

https://github.com/freebsd/iocage
---
 sysutils/iocage/Makefile                      | 34 ++++++-------------
 sysutils/iocage/distinfo                      | 16 ++-------
 .../files/patch-iocage__lib_ioc__common.py    | 11 ------
 .../patch-iocage__lib_ioc__exceptions.py      | 11 ------
 .../files/patch-iocage__lib_ioc__json.py      | 11 ------
 sysutils/iocage/files/patch-setup.py          | 11 ------
 6 files changed, 13 insertions(+), 81 deletions(-)
 delete mode 100644 sysutils/iocage/files/patch-iocage__lib_ioc__common.py
 delete mode 100644 sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py
 delete mode 100644 sysutils/iocage/files/patch-iocage__lib_ioc__json.py
 delete mode 100644 sysutils/iocage/files/patch-setup.py

diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile
index c7215b853300..696d28a3f1b5 100644
--- a/sysutils/iocage/Makefile
+++ b/sysutils/iocage/Makefile
@@ -1,46 +1,29 @@
 PORTNAME=	iocage
-PORTVERSION=	1.2
-PORTREVISION=	13
+PORTVERSION=	1.7
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-# Patches in order of appearance
-# - Do not fetch/install lib32 for i386
-# - Change devfs ruleset handling so...
-# - Only update release property on update of jails
-# - Use streaming reads to avoid blowing memory
-# - Prevent slashes in jail names when checking existence
-PATCH_SITES=	https://github.com/iocage/iocage/commit/
-PATCHFILES=	2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch:-p1 \
-		753b2f35731423597d7f51f33427b6d619fcd0b5.patch:-p1 \
-		b47dc2c47ff125d644720b03f598a9caf4e08192.patch:-p1 \
-		2a1685bcaba96917c79a7e4a909dac5c6926826a.patch:-p1 \
-		c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch:-p1
-
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	FreeBSD jail manager written in Python3
-WWW=		https://github.com/iocage/iocage
+WWW=		https://github.com/freebsd/iocage
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest4-cov>0:devel/py-pytest4-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-pep8>0:devel/py-pytest-pep8@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py-tqdm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \
-		ca_root_nss>0:security/ca_root_nss \
 		${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py-texttable@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
-		merge:devel/rcs57
+		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
@@ -49,12 +32,15 @@ USE_PYTHON=	autoplist distutils
 CONFLICTS=	py*-iocage py*-iocage-devel
 NO_ARCH=	yes
 
+GH_ACCOUNT=	freebsd
+
 PLIST_FILES=	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \
 		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/SOURCES.txt \
 		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/dependency_links.txt \
 		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/entry_points.txt \
 		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/requires.txt \
-		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/top_level.txt
+		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/top_level.txt \
+		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib/plugin_manifest.json
 
 OPTIONS_DEFAULT=	GIT
 OPTIONS_RADIO=	GIT_PACKAGE
diff --git a/sysutils/iocage/distinfo b/sysutils/iocage/distinfo
index 846587999e9d..20ec74243f3c 100644
--- a/sysutils/iocage/distinfo
+++ b/sysutils/iocage/distinfo
@@ -1,13 +1,3 @@
-TIMESTAMP = 1709055537
-SHA256 (iocage-iocage-1.2_GH0.tar.gz) = 7ff73f4d33090e829e1dd23fa723b7f969b29249e382fc39b7564826de119819
-SIZE (iocage-iocage-1.2_GH0.tar.gz) = 722499
-SHA256 (2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch) = 7e5ddb65b09131984da1ef6b85f3a18e02e9a558c82bdf7af2f72b20bbaaba79
-SIZE (2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch) = 1201
-SHA256 (753b2f35731423597d7f51f33427b6d619fcd0b5.patch) = 3471a05e35e5c452e738bc9dc244b58b27bf5657024e926e59c4ec60c1b95869
-SIZE (753b2f35731423597d7f51f33427b6d619fcd0b5.patch) = 12673
-SHA256 (b47dc2c47ff125d644720b03f598a9caf4e08192.patch) = 69ffb84b0fee9e5735747ce450c002c4dff53380c06c34eee59da26e5b2e4c33
-SIZE (b47dc2c47ff125d644720b03f598a9caf4e08192.patch) = 2091
-SHA256 (2a1685bcaba96917c79a7e4a909dac5c6926826a.patch) = c15fc8eb261ae740b4214e4181e2b9ef2f6580b5449486f927e44b629af7b4bc
-SIZE (2a1685bcaba96917c79a7e4a909dac5c6926826a.patch) = 1295
-SHA256 (c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch) = 7f18e4c97af1d761c7df2bc1f968753a5d440454637a639fb3d5593c7f5661bc
-SIZE (c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch) = 1266
+TIMESTAMP = 1718716961
+SHA256 (freebsd-iocage-1.7_GH0.tar.gz) = 4a23fc73f590dbe86f4de1575fb2370918cc919dd9efade8401f2292b2878c47
+SIZE (freebsd-iocage-1.7_GH0.tar.gz) = 758251
diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__common.py b/sysutils/iocage/files/patch-iocage__lib_ioc__common.py
deleted file mode 100644
index 1216797ef225..000000000000
--- a/sysutils/iocage/files/patch-iocage__lib_ioc__common.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- iocage_lib/ioc_common.py.orig	2024-07-10 17:23:47 UTC
-+++ iocage_lib/ioc_common.py
-@@ -77,7 +77,7 @@ def callback(_log, callback_exception):
-         else:
-             if not isinstance(message, str) and isinstance(
-                 message,
--                collections.Iterable
-+                collections.abc.Iterable
-             ):
-                 message = '\n'.join(message)
- 
diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py b/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py
deleted file mode 100644
index 1588ef95399f..000000000000
--- a/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- iocage_lib/ioc_exceptions.py.orig	2024-07-10 17:22:46 UTC
-+++ iocage_lib/ioc_exceptions.py
-@@ -31,7 +31,7 @@ class ExceptionWithMsg(Exception):
-     def __init__(self, message):
-         if not isinstance(message, str) and not isinstance(
-             message,
--            collections.Iterable
-+            collections.abc.Iterable
-         ):
-             message = [message]
- 
diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__json.py b/sysutils/iocage/files/patch-iocage__lib_ioc__json.py
deleted file mode 100644
index 864cc6cf7c49..000000000000
--- a/sysutils/iocage/files/patch-iocage__lib_ioc__json.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- iocage_lib/ioc_json.py.orig	2022-05-09 15:10:29 UTC
-+++ iocage_lib/ioc_json.py
-@@ -543,7 +543,7 @@ class IOCZFS(object):
-                 'zfs',
-                 'get',
-                 '-pHo',
--                'property, value',
-+                'property,value',
-                 'all',
-                 identifier
-             ], stdout=su.PIPE, stderr=su.PIPE
diff --git a/sysutils/iocage/files/patch-setup.py b/sysutils/iocage/files/patch-setup.py
deleted file mode 100644
index 050d3da7ee13..000000000000
--- a/sysutils/iocage/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2019-09-26 07:23:24 UTC
-+++ setup.py
-@@ -58,7 +58,7 @@ setup(
-         'dnspython>=1.15.0',
-         'libzfs'
-     ],
--    setup_requires=['pytest-runner'],
-+#    setup_requires=['pytest-runner'],
-     entry_points={'console_scripts': ['iocage = iocage_lib:cli']},
-     data_files=_data,
-     tests_require=['pytest', 'pytest-cov', 'pytest-pep8']
-- 
2.45.2





PORTNAME=	iocage
PORTVERSION=	1.8
PORTREVISION=	13
CATEGORIES=	sysutils python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

# Patches in order of appearance
# - Do not fetch/install lib32 for i386
# - Change devfs ruleset handling so...
# - Only update release property on update of jails
# - Use streaming reads to avoid blowing memory
# - Prevent slashes in jail names when checking existence
PATCH_SITES=	https://github.com/iocage/iocage/commit/
PATCHFILES=	2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch:-p1 \
		753b2f35731423597d7f51f33427b6d619fcd0b5.patch:-p1 \
		b47dc2c47ff125d644720b03f598a9caf4e08192.patch:-p1 \
		2a1685bcaba96917c79a7e4a909dac5c6926826a.patch:-p1 \
		c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch:-p1

MAINTAINER=	grembo@FreeBSD.org
COMMENT=	FreeBSD jail manager written in Python3
WWW=		https://github.com/freebsd/iocage

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest4-cov>0:devel/py-pytest4-cov@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest-pep8>0:devel/py-pytest-pep8@${PY_FLAVOR}
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \
		ca_root_nss>0:security/ca_root_nss \
		${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py-texttable@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}
		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
		merge:devel/rcs57

USES=		python
USE_GITHUB=	yes

CONFLICTS=	py*-iocage py*-iocage-devel
NO_ARCH=	yes

GH_ACCOUNT=	freebsd

PLIST_FILES=	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \
		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/SOURCES.txt \
		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/dependency_links.txt \
		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/entry_points.txt \
		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/requires.txt \
		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/top_level.txt \
		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib/plugin_manifest.json

OPTIONS_DEFAULT=	GIT
OPTIONS_RADIO=	GIT_PACKAGE




TIMESTAMP = 1726817130
SHA256 (freebsd-iocage-1.8_GH0.tar.gz) = 5fa7259ba1f48693d5ce5e3ce6f3bf2c06a4872e1a83497dff62949133353934
SIZE (freebsd-iocage-1.8_GH0.tar.gz) = 758358
SHA256 (2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch) = 7e5ddb65b09131984da1ef6b85f3a18e02e9a558c82bdf7af2f72b20bbaaba79
SIZE (2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch) = 1201
SHA256 (753b2f35731423597d7f51f33427b6d619fcd0b5.patch) = 3471a05e35e5c452e738bc9dc244b58b27bf5657024e926e59c4ec60c1b95869
SIZE (753b2f35731423597d7f51f33427b6d619fcd0b5.patch) = 12673
SHA256 (b47dc2c47ff125d644720b03f598a9caf4e08192.patch) = 69ffb84b0fee9e5735747ce450c002c4dff53380c06c34eee59da26e5b2e4c33
SIZE (b47dc2c47ff125d644720b03f598a9caf4e08192.patch) = 2091
SHA256 (2a1685bcaba96917c79a7e4a909dac5c6926826a.patch) = c15fc8eb261ae740b4214e4181e2b9ef2f6580b5449486f927e44b629af7b4bc
SIZE (2a1685bcaba96917c79a7e4a909dac5c6926826a.patch) = 1295
SHA256 (c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch) = 7f18e4c97af1d761c7df2bc1f968753a5d440454637a639fb3d5593c7f5661bc
SIZE (c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch) = 1266

Removed Link Here

(-)a/sysutils/iocage/files/patch-iocage__lib_ioc__common.py (-11 lines)
1	--- iocage_lib/ioc_common.py.orig 2024-07-10 17:23:47 UTC
2	+++ iocage_lib/ioc_common.py
3	@@ -77,7 +77,7 @@ def callback(_log, callback_exception):
4	else:
5	if not isinstance(message, str) and isinstance(
6	message,
7	- collections.Iterable
8	+ collections.abc.Iterable
9	):
10	message = '\n'.join(message)
11

Removed Link Here

(-)a/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py (-11 lines)
1	--- iocage_lib/ioc_exceptions.py.orig 2024-07-10 17:22:46 UTC
2	+++ iocage_lib/ioc_exceptions.py
3	@@ -31,7 +31,7 @@ class ExceptionWithMsg(Exception):
4	def __init__(self, message):
5	if not isinstance(message, str) and not isinstance(
6	message,
7	- collections.Iterable
8	+ collections.abc.Iterable
9	):
10	message = [message]
11

Removed Link Here

(-)a/sysutils/iocage/files/patch-iocage__lib_ioc__json.py (-11 lines)
1	--- iocage_lib/ioc_json.py.orig 2022-05-09 15:10:29 UTC
2	+++ iocage_lib/ioc_json.py
3	@@ -543,7 +543,7 @@ class IOCZFS(object):
4	'zfs',
5	'get',
6	'-pHo',
7	- 'property, value',
8	+ 'property,value',
9	'all',
10	identifier
11	], stdout=su.PIPE, stderr=su.PIPE




--- setup.py.orig	2019-09-26 07:23:24 UTC
+++ setup.py
@@ -58,7 +58,7 @@ setup(
         'dnspython>=1.15.0',
         'libzfs'
     ],
-    setup_requires=['pytest-runner'],
+#    setup_requires=['pytest-runner'],
     entry_points={'console_scripts': ['iocage = iocage_lib:cli']},
     data_files=_data,
     tests_require=['pytest', 'pytest-cov', 'pytest-pep8']
- 

Return to bug 269298

Added Link Here

(-)b/sysutils/iocage/0001-iocage-project-migrated-to-freebsd-s-GH-org.patch (+194 lines)
1	From 534c700175de86f3b6591abb5f156f2bbf79d581 Mon Sep 17 00:00:00 2001
2	From: Geoffroy Desvernay <dgeo@centrale-marseille.fr>
3	Date: Wed, 29 May 2024 15:00:35 +0200
4	Subject: [PATCH] iocage project migrated to freebsd's GH org
5
6	Version updated to 1.7
7	- fix empty HTTP_PROXY
8	- linsysfs support
9	- allow_nfsd new param
10	- fix `iocage list -h` output
11	- add devel/py-six dependency
12	- New home and new release (since 2019!)
13	Many bugfixes (including port's patches) included.
14
15	https://github.com/freebsd/iocage
16	---
17	sysutils/iocage/Makefile \| 34 ++++++-------------
18	sysutils/iocage/distinfo \| 16 ++-------
19	.../files/patch-iocage__lib_ioc__common.py \| 11 ------
20	.../patch-iocage__lib_ioc__exceptions.py \| 11 ------
21	.../files/patch-iocage__lib_ioc__json.py \| 11 ------
22	sysutils/iocage/files/patch-setup.py \| 11 ------
23	6 files changed, 13 insertions(+), 81 deletions(-)
24	delete mode 100644 sysutils/iocage/files/patch-iocage__lib_ioc__common.py
25	delete mode 100644 sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py
26	delete mode 100644 sysutils/iocage/files/patch-iocage__lib_ioc__json.py
27	delete mode 100644 sysutils/iocage/files/patch-setup.py
28
29	diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile
30	index c7215b853300..696d28a3f1b5 100644
31	--- a/sysutils/iocage/Makefile
32	+++ b/sysutils/iocage/Makefile
33	@@ -1,46 +1,29 @@
34	PORTNAME= iocage
35	-PORTVERSION= 1.2
36	-PORTREVISION= 13
37	+PORTVERSION= 1.7
38	CATEGORIES= sysutils python
39	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
40
41	-# Patches in order of appearance
42	-# - Do not fetch/install lib32 for i386
43	-# - Change devfs ruleset handling so...
44	-# - Only update release property on update of jails
45	-# - Use streaming reads to avoid blowing memory
46	-# - Prevent slashes in jail names when checking existence
47	-PATCH_SITES= https://github.com/iocage/iocage/commit/
48	-PATCHFILES= 2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch:-p1 \
49	- 753b2f35731423597d7f51f33427b6d619fcd0b5.patch:-p1 \
50	- b47dc2c47ff125d644720b03f598a9caf4e08192.patch:-p1 \
51	- 2a1685bcaba96917c79a7e4a909dac5c6926826a.patch:-p1 \
52	- c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch:-p1
53	-
54	MAINTAINER= grembo@FreeBSD.org
55	COMMENT= FreeBSD jail manager written in Python3
56	-WWW= https://github.com/iocage/iocage
57	+WWW= https://github.com/freebsd/iocage
58
59	LICENSE= BSD2CLAUSE
60	LICENSE_FILE= ${WRKSRC}/LICENSE
61
62	-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
63	+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
64	+ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
65	${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \
66	${PYTHON_PKGNAMEPREFIX}pytest4-cov>0:devel/py-pytest4-cov@${PY_FLAVOR} \
67	${PYTHON_PKGNAMEPREFIX}pytest-pep8>0:devel/py-pytest-pep8@${PY_FLAVOR}
68	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
69	${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
70	- ${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py-tqdm@${PY_FLAVOR} \
71	+ ${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR} \
72	${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \
73	- ca_root_nss>0:security/ca_root_nss \
74	${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py-texttable@${PY_FLAVOR} \
75	${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \
76	- ${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
77	${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
78	${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \
79	- ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
80	- ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
81	- merge:devel/rcs57
82	+ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}
83
84	USES= python
85	USE_GITHUB= yes
86	@@ -49,12 +32,15 @@ USE_PYTHON= autoplist distutils
87	CONFLICTS= py-iocage py-iocage-devel
88	NO_ARCH= yes
89
90	+GH_ACCOUNT= freebsd
91	+
92	PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \
93	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/SOURCES.txt \
94	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/dependency_links.txt \
95	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/entry_points.txt \
96	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/requires.txt \
97	- ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/top_level.txt
98	+ ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/top_level.txt \
99	+ ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib/plugin_manifest.json
100
101	OPTIONS_DEFAULT= GIT
102	OPTIONS_RADIO= GIT_PACKAGE
103	diff --git a/sysutils/iocage/distinfo b/sysutils/iocage/distinfo
104	index 846587999e9d..20ec74243f3c 100644
105	--- a/sysutils/iocage/distinfo
106	+++ b/sysutils/iocage/distinfo
107	@@ -1,13 +1,3 @@
108	-TIMESTAMP = 1709055537
109	-SHA256 (iocage-iocage-1.2_GH0.tar.gz) = 7ff73f4d33090e829e1dd23fa723b7f969b29249e382fc39b7564826de119819
110	-SIZE (iocage-iocage-1.2_GH0.tar.gz) = 722499
111	-SHA256 (2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch) = 7e5ddb65b09131984da1ef6b85f3a18e02e9a558c82bdf7af2f72b20bbaaba79
112	-SIZE (2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch) = 1201
113	-SHA256 (753b2f35731423597d7f51f33427b6d619fcd0b5.patch) = 3471a05e35e5c452e738bc9dc244b58b27bf5657024e926e59c4ec60c1b95869
114	-SIZE (753b2f35731423597d7f51f33427b6d619fcd0b5.patch) = 12673
115	-SHA256 (b47dc2c47ff125d644720b03f598a9caf4e08192.patch) = 69ffb84b0fee9e5735747ce450c002c4dff53380c06c34eee59da26e5b2e4c33
116	-SIZE (b47dc2c47ff125d644720b03f598a9caf4e08192.patch) = 2091
117	-SHA256 (2a1685bcaba96917c79a7e4a909dac5c6926826a.patch) = c15fc8eb261ae740b4214e4181e2b9ef2f6580b5449486f927e44b629af7b4bc
118	-SIZE (2a1685bcaba96917c79a7e4a909dac5c6926826a.patch) = 1295
119	-SHA256 (c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch) = 7f18e4c97af1d761c7df2bc1f968753a5d440454637a639fb3d5593c7f5661bc
120	-SIZE (c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch) = 1266
121	+TIMESTAMP = 1718716961
122	+SHA256 (freebsd-iocage-1.7_GH0.tar.gz) = 4a23fc73f590dbe86f4de1575fb2370918cc919dd9efade8401f2292b2878c47
123	+SIZE (freebsd-iocage-1.7_GH0.tar.gz) = 758251
124	diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__common.py b/sysutils/iocage/files/patch-iocage__lib_ioc__common.py
125	deleted file mode 100644
126	index 1216797ef225..000000000000
127	--- a/sysutils/iocage/files/patch-iocage__lib_ioc__common.py
128	+++ /dev/null
129	@@ -1,11 +0,0 @@
130	---- iocage_lib/ioc_common.py.orig 2024-07-10 17:23:47 UTC
131	-+++ iocage_lib/ioc_common.py
132	-@@ -77,7 +77,7 @@ def callback(_log, callback_exception):
133	- else:
134	- if not isinstance(message, str) and isinstance(
135	- message,
136	-- collections.Iterable
137	-+ collections.abc.Iterable
138	- ):
139	- message = '\n'.join(message)
140	-
141	diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py b/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py
142	deleted file mode 100644
143	index 1588ef95399f..000000000000
144	--- a/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py
145	+++ /dev/null
146	@@ -1,11 +0,0 @@
147	---- iocage_lib/ioc_exceptions.py.orig 2024-07-10 17:22:46 UTC
148	-+++ iocage_lib/ioc_exceptions.py
149	-@@ -31,7 +31,7 @@ class ExceptionWithMsg(Exception):
150	- def __init__(self, message):
151	- if not isinstance(message, str) and not isinstance(
152	- message,
153	-- collections.Iterable
154	-+ collections.abc.Iterable
155	- ):
156	- message = [message]
157	-
158	diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__json.py b/sysutils/iocage/files/patch-iocage__lib_ioc__json.py
159	deleted file mode 100644
160	index 864cc6cf7c49..000000000000
161	--- a/sysutils/iocage/files/patch-iocage__lib_ioc__json.py
162	+++ /dev/null
163	@@ -1,11 +0,0 @@
164	---- iocage_lib/ioc_json.py.orig 2022-05-09 15:10:29 UTC
165	-+++ iocage_lib/ioc_json.py
166	-@@ -543,7 +543,7 @@ class IOCZFS(object):
167	- 'zfs',
168	- 'get',
169	- '-pHo',
170	-- 'property, value',
171	-+ 'property,value',
172	- 'all',
173	- identifier
174	- ], stdout=su.PIPE, stderr=su.PIPE
175	diff --git a/sysutils/iocage/files/patch-setup.py b/sysutils/iocage/files/patch-setup.py
176	deleted file mode 100644
177	index 050d3da7ee13..000000000000
178	--- a/sysutils/iocage/files/patch-setup.py
179	+++ /dev/null
180	@@ -1,11 +0,0 @@
181	---- setup.py.orig 2019-09-26 07:23:24 UTC
182	-+++ setup.py
183	-@@ -58,7 +58,7 @@ setup(
184	- 'dnspython>=1.15.0',
185	- 'libzfs'
186	- ],
187	-- setup_requires=['pytest-runner'],
188	-+# setup_requires=['pytest-runner'],
189	- entry_points={'console_scripts': ['iocage = iocage_lib:cli']},
190	- data_files=_data,
191	- tests_require=['pytest', 'pytest-cov', 'pytest-pep8']
192	--
193	2.45.2
194

Lines 1-46 Link Here

(-)b/sysutils/iocage/Makefile (-24 / +10 lines)
1	PORTNAME= iocage	1	PORTNAME= iocage
2	PORTVERSION= 1.2	2	PORTVERSION= 1.8
3	PORTREVISION= 13
4	CATEGORIES= sysutils python	3	CATEGORIES= sysutils python
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	4	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6		5
7	# Patches in order of appearance
8	# - Do not fetch/install lib32 for i386
9	# - Change devfs ruleset handling so...
10	# - Only update release property on update of jails
11	# - Use streaming reads to avoid blowing memory
12	# - Prevent slashes in jail names when checking existence
13	PATCH_SITES= https://github.com/iocage/iocage/commit/
14	PATCHFILES= 2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch:-p1 \
15	753b2f35731423597d7f51f33427b6d619fcd0b5.patch:-p1 \
16	b47dc2c47ff125d644720b03f598a9caf4e08192.patch:-p1 \
17	2a1685bcaba96917c79a7e4a909dac5c6926826a.patch:-p1 \
18	c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch:-p1
19
20	MAINTAINER= grembo@FreeBSD.org	6	MAINTAINER= grembo@FreeBSD.org
21	COMMENT= FreeBSD jail manager written in Python3	7	COMMENT= FreeBSD jail manager written in Python3
22	WWW= https://github.com/iocage/iocage	8	WWW= https://github.com/freebsd/iocage
23		9
24	LICENSE= BSD2CLAUSE	10	LICENSE= BSD2CLAUSE
25	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
26		12
27	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \	13	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
		14	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \	15	${PYTHON_PKGNAMEPREFIX}pytest4>0:devel/py-pytest4@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}pytest4-cov>0:devel/py-pytest4-cov@${PY_FLAVOR} \	16	${PYTHON_PKGNAMEPREFIX}pytest4-cov>0:devel/py-pytest4-cov@${PY_FLAVOR} \
30	${PYTHON_PKGNAMEPREFIX}pytest-pep8>0:devel/py-pytest-pep8@${PY_FLAVOR}	17	${PYTHON_PKGNAMEPREFIX}pytest-pep8>0:devel/py-pytest-pep8@${PY_FLAVOR}
31	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \	18	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
32	${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \	19	${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
33	${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py-tqdm@${PY_FLAVOR} \	20	${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR} \
34	${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \	21	${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \
35	ca_root_nss>0:security/ca_root_nss \
36	${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py-texttable@${PY_FLAVOR} \	22	${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py-texttable@${PY_FLAVOR} \
37	${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \
38	${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \
39	${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
40	${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \	25	${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \
41	${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \	26	${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}
42	${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
43	merge:devel/rcs57
44		27
45	USES= python	28	USES= python
46	USE_GITHUB= yes	29	USE_GITHUB= yes
Lines 49-60 USE_PYTHON= autoplist distutils Link Here
49	CONFLICTS= py-iocage py-iocage-devel	32	CONFLICTS= py-iocage py-iocage-devel
50	NO_ARCH= yes	33	NO_ARCH= yes
51		34
		35	GH_ACCOUNT= freebsd
		36
52	PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \	37	PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \
53	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/SOURCES.txt \	38	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/SOURCES.txt \
54	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/dependency_links.txt \	39	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/dependency_links.txt \
55	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/entry_points.txt \	40	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/entry_points.txt \
56	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/requires.txt \	41	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/requires.txt \
57	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/top_level.txt	42	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/top_level.txt \
		43	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib/plugin_manifest.json
58		44
59	OPTIONS_DEFAULT= GIT	45	OPTIONS_DEFAULT= GIT
60	OPTIONS_RADIO= GIT_PACKAGE	46	OPTIONS_RADIO= GIT_PACKAGE

Lines 1-13 Link Here

(-)b/sysutils/iocage/distinfo (-13 / +3 lines)
1	TIMESTAMP = 1709055537	1	TIMESTAMP = 1726817130
2	SHA256 (iocage-iocage-1.2_GH0.tar.gz) = 7ff73f4d33090e829e1dd23fa723b7f969b29249e382fc39b7564826de119819	2	SHA256 (freebsd-iocage-1.8_GH0.tar.gz) = 5fa7259ba1f48693d5ce5e3ce6f3bf2c06a4872e1a83497dff62949133353934
3	SIZE (iocage-iocage-1.2_GH0.tar.gz) = 722499	3	SIZE (freebsd-iocage-1.8_GH0.tar.gz) = 758358
4	SHA256 (2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch) = 7e5ddb65b09131984da1ef6b85f3a18e02e9a558c82bdf7af2f72b20bbaaba79
5	SIZE (2883770ae46731a2a94cd41e6d01d32cec6f1f21.patch) = 1201
6	SHA256 (753b2f35731423597d7f51f33427b6d619fcd0b5.patch) = 3471a05e35e5c452e738bc9dc244b58b27bf5657024e926e59c4ec60c1b95869
7	SIZE (753b2f35731423597d7f51f33427b6d619fcd0b5.patch) = 12673
8	SHA256 (b47dc2c47ff125d644720b03f598a9caf4e08192.patch) = 69ffb84b0fee9e5735747ce450c002c4dff53380c06c34eee59da26e5b2e4c33
9	SIZE (b47dc2c47ff125d644720b03f598a9caf4e08192.patch) = 2091
10	SHA256 (2a1685bcaba96917c79a7e4a909dac5c6926826a.patch) = c15fc8eb261ae740b4214e4181e2b9ef2f6580b5449486f927e44b629af7b4bc
11	SIZE (2a1685bcaba96917c79a7e4a909dac5c6926826a.patch) = 1295
12	SHA256 (c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch) = 7f18e4c97af1d761c7df2bc1f968753a5d440454637a639fb3d5593c7f5661bc
13	SIZE (c06d0695487dda62c2b81aeb6be5fe91a70d8c83.patch) = 1266

Removed Link Here

(-)a/sysutils/iocage/files/patch-setup.py (-12 lines)
1	--- setup.py.orig 2019-09-26 07:23:24 UTC
2	+++ setup.py
3	@@ -58,7 +58,7 @@ setup(
4	'dnspython>=1.15.0',
5	'libzfs'
6	],
7	- setup_requires=['pytest-runner'],
8	+# setup_requires=['pytest-runner'],
9	entry_points={'console_scripts': ['iocage = iocage_lib:cli']},
10	data_files=_data,
11	tests_require=['pytest', 'pytest-cov', 'pytest-pep8']
12	-