Attachment #253682 for bug #269298




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

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	-