diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index 99d1b5d5d9c0..d1c2eaf43b35 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -1,65 +1,61 @@ PORTNAME= iocage -PORTVERSION= 1.10 -PORTREVISION= 3 +PORTVERSION= 1.11 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} # Pull in PR #61 to unbreak default route detection on CURRENT -# Pull in PR #58 to fix stopping jails that contain -# dots in their hostuuid PATCH_SITES= https://github.com/freebsd/iocage/commit/ -PATCHFILES= 2120a86d1d4fd3d383a3f0bddfc1e92eb5a7d2e7.patch:-p1 \ - c55e05aebb305b4013554ec80298113c50d1c74c.patch:-p1 +PATCHFILES= 2120a86d1d4fd3d383a3f0bddfc1e92eb5a7d2e7.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 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} \ ${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py-texttable@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${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} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:filesystems/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} USES= python USE_GITHUB= yes GH_ACCOUNT= freebsd USE_PYTHON= autoplist distutils CONFLICTS= py*-iocage py*-iocage-devel NO_ARCH= yes 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 OPTIONS_RADIO_GIT_PACKAGE= GIT GIT_LITE GIT_DESC= depend on devel/git GIT_LITE_DESC= depend on lite flavor of devel/git (bare minimum git experience) GIT_RUN_DEPENDS=git:devel/git GIT_LITE_RUN_DEPENDS=git:devel/git@lite do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest .include diff --git a/sysutils/iocage/distinfo b/sysutils/iocage/distinfo index 441499e75579..bdc9a0b24743 100644 --- a/sysutils/iocage/distinfo +++ b/sysutils/iocage/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1738009282 -SHA256 (freebsd-iocage-1.10_GH0.tar.gz) = 4e53137b1c91d964a560c38945acfb4a59e2c57162ebc9302b8b90639a1a71b5 -SIZE (freebsd-iocage-1.10_GH0.tar.gz) = 815548 +TIMESTAMP = 1749992584 +SHA256 (freebsd-iocage-1.11_GH0.tar.gz) = 7f8eea47a71389eca9e147a7ec94ae7ecc260e6b17422837ac33492403af9028 +SIZE (freebsd-iocage-1.11_GH0.tar.gz) = 816215 SHA256 (2120a86d1d4fd3d383a3f0bddfc1e92eb5a7d2e7.patch) = 212d63a093d9831c29398e18e567ea63050b116f737be82f2fe2384c670b5981 SIZE (2120a86d1d4fd3d383a3f0bddfc1e92eb5a7d2e7.patch) = 891 SHA256 (c55e05aebb305b4013554ec80298113c50d1c74c.patch) = 90e723fb459513e82a617b5d57fa5b9cde881fd94e7f4158b4082ddd7dcd274c SIZE (c55e05aebb305b4013554ec80298113c50d1c74c.patch) = 956 diff --git a/sysutils/iocage/files/patch-setup.py b/sysutils/iocage/files/patch-setup.py deleted file mode 100644 index cad071146d2d..000000000000 --- a/sysutils/iocage/files/patch-setup.py +++ /dev/null @@ -1,15 +0,0 @@ ---- setup.py.orig 2024-09-20 06:45:27 UTC -+++ setup.py -@@ -30,10 +30,10 @@ from setuptools import find_packages, setup - - if os.path.isdir("/".join([sys.prefix, "etc/init.d"])): - _data = [('etc/init.d', ['rc.d/iocage']), -- ('man/man8', ['iocage.8.gz'])] -+ ('share/man/man8', ['iocage.8.gz'])] - else: - _data = [('etc/rc.d', ['rc.d/iocage']), -- ('man/man8', ['iocage.8.gz'])] -+ ('share/man/man8', ['iocage.8.gz'])] - - if os.path.isdir("/".join([sys.prefix, "share/zsh/site-functions/"])): - _data.append(('share/zsh/site-functions', ['zsh-completion/_iocage']))