git: 59e0e9351cbd - main - sysutils/iocage-devel: Update to 1.10.20250103
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 18 Feb 2025 04:07:24 UTC
The branch main has been updated by nc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=59e0e9351cbd9b89185996d9d7fe8fcfd639bc43
commit 59e0e9351cbd9b89185996d9d7fe8fcfd639bc43
Author: Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2025-02-18 04:07:20 +0000
Commit: Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2025-02-18 04:07:20 +0000
sysutils/iocage-devel: Update to 1.10.20250103
---
sysutils/iocage-devel/Makefile | 11 ++----
sysutils/iocage-devel/distinfo | 6 ++--
.../files/patch-iocage__lib_ioc__fetch.py | 41 ----------------------
.../files/patch-iocage__lib_ioc__plugin.py | 22 ------------
sysutils/iocage-devel/files/patch-setup.py | 15 --------
5 files changed, 6 insertions(+), 89 deletions(-)
diff --git a/sysutils/iocage-devel/Makefile b/sysutils/iocage-devel/Makefile
index 29079b4aad8f..d6ed95b4c9bd 100644
--- a/sysutils/iocage-devel/Makefile
+++ b/sysutils/iocage-devel/Makefile
@@ -1,6 +1,5 @@
PORTNAME= iocage-devel
-PORTVERSION= 1.8.20241014
-PORTREVISION= 2
+PORTVERSION= 1.10.20250103
PORTEPOCH= 1
CATEGORIES= sysutils python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,10 +11,6 @@ WWW= https://github.com/freebsd/iocage
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-DEPRECATED= Depends on expired devel/py-pytest-runner
-EXPIRATION_DATE=2025-03-31
-
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
@@ -34,14 +29,14 @@ USES= python
USE_GITHUB= yes
GH_ACCOUNT= freebsd
GH_PROJECT= iocage
-GH_TAGNAME= 32de9d515ba54f7635545f20c9f81d7cc0442d66
+GH_TAGNAME= c55e05aebb305b4013554ec80298113c50d1c74c
USE_PYTHON= autoplist distutils
CONFLICTS= py*-iocage py*-iocage-devel
NO_ARCH= yes
-_IOCAGE_LIB_VERSION= 1.7
+_IOCAGE_LIB_VERSION= 1.10
PLIST_FILES= ${PYTHON_SITELIBDIR}/${PORTNAME:S/-devel//g}_lib-${_IOCAGE_LIB_VERSION}-py${PYTHON_VER}.egg-info/dependency_links.txt \
${PYTHON_SITELIBDIR}/${PORTNAME:S/-devel//g}_lib-${_IOCAGE_LIB_VERSION}-py${PYTHON_VER}.egg-info/entry_points.txt \
${PYTHON_SITELIBDIR}/${PORTNAME:S/-devel//g}_lib-${_IOCAGE_LIB_VERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \
diff --git a/sysutils/iocage-devel/distinfo b/sysutils/iocage-devel/distinfo
index 24958f9d7233..f24dd55c8860 100644
--- a/sysutils/iocage-devel/distinfo
+++ b/sysutils/iocage-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731687726
-SHA256 (freebsd-iocage-1.8.20241014-32de9d515ba54f7635545f20c9f81d7cc0442d66_GH0.tar.gz) = 9723e385a8a518feddc87758fa85bf5fcae1a4a7bee3c9562b34b599a37e51e5
-SIZE (freebsd-iocage-1.8.20241014-32de9d515ba54f7635545f20c9f81d7cc0442d66_GH0.tar.gz) = 759966
+TIMESTAMP = 1739851500
+SHA256 (freebsd-iocage-1.10.20250103-c55e05aebb305b4013554ec80298113c50d1c74c_GH0.tar.gz) = f85fe86e2357608dc5b6e0dca16e61a9adaa97fdb7f572d2aaacdb8230a745ec
+SIZE (freebsd-iocage-1.10.20250103-c55e05aebb305b4013554ec80298113c50d1c74c_GH0.tar.gz) = 816205
diff --git a/sysutils/iocage-devel/files/patch-iocage__lib_ioc__fetch.py b/sysutils/iocage-devel/files/patch-iocage__lib_ioc__fetch.py
deleted file mode 100644
index d5697b9205af..000000000000
--- a/sysutils/iocage-devel/files/patch-iocage__lib_ioc__fetch.py
+++ /dev/null
@@ -1,41 +0,0 @@
---- iocage_lib/ioc_fetch.py.orig 2024-09-20 06:45:27 UTC
-+++ iocage_lib/ioc_fetch.py
-@@ -47,6 +47,29 @@ import iocage_lib.ioc_start
- from iocage_lib.pools import Pool
- from iocage_lib.dataset import Dataset
-
-+# taken from tarfile.tar_filter (and _get_filtered_attrs)
-+# basically the same, but **without**:
-+# - Clear high mode bits (setuid, setgid, sticky) and
-+# group/other write bits (S_IWGRP | S_IWOTH).
-+def untar_release_filter(member, dest_path):
-+ new_attrs = {}
-+ name = member.name
-+ dest_path = os.path.realpath(dest_path)
-+ # Strip leading / (tar's directory separator) from filenames.
-+ # Include os.sep (target OS directory separator) as well.
-+ if name.startswith(('/', os.sep)):
-+ name = new_attrs['name'] = member.path.lstrip('/' + os.sep)
-+ if os.path.isabs(name):
-+ # Path is absolute even after stripping.
-+ # For example, 'C:/foo' on Windows.
-+ raise tarfile.AbsolutePathError(member)
-+ # Ensure we stay in the destination
-+ target_path = os.path.realpath(os.path.join(dest_path, name))
-+ if os.path.commonpath([target_path, dest_path]) != dest_path:
-+ raise tarfile.OutsideDestinationError(member, target_path)
-+ if new_attrs:
-+ return member.replace(**new_attrs, deep=False)
-+ return member
-
- class IOCFetch:
-
-@@ -817,7 +840,7 @@ class IOCFetch:
- # removing them first.
- member = self.__fetch_extract_remove__(f)
- member = self.__fetch_check_members__(member)
-- f.extractall(dest, members=member)
-+ f.extractall(dest, members=member, filter=untar_release_filter)
-
- def fetch_update(self, cli=False, uuid=None):
- """This calls 'freebsd-update' to update the fetched RELEASE."""
diff --git a/sysutils/iocage-devel/files/patch-iocage__lib_ioc__plugin.py b/sysutils/iocage-devel/files/patch-iocage__lib_ioc__plugin.py
deleted file mode 100644
index be9ee84d1e3f..000000000000
--- a/sysutils/iocage-devel/files/patch-iocage__lib_ioc__plugin.py
+++ /dev/null
@@ -1,22 +0,0 @@
---- iocage_lib/ioc_plugin.py.orig 2024-09-20 06:45:27 UTC
-+++ iocage_lib/ioc_plugin.py
-@@ -61,7 +61,10 @@ from iocage_lib.dataset import Dataset
- GIT_LOCK = threading.Lock()
- RE_PLUGIN_VERSION = re.compile(r'"path":"([/\.\+,\d\w-]*)\.txz"')
-
-+# deliberately crash if tarfile doesn't have required filter
-+tarfile.tar_filter
-
-+
- class IOCPlugin(object):
-
- """
-@@ -157,7 +160,7 @@ class IOCPlugin(object):
- shutil.copyfileobj(r.raw, f)
-
- with tarfile.open(packagesite_txz_path) as p_file:
-- p_file.extractall(path=tmpdir)
-+ p_file.extractall(path=tmpdir, filter='data')
-
- packagesite_path = os.path.join(tmpdir, 'packagesite.yaml')
- if not os.path.exists(packagesite_path):
diff --git a/sysutils/iocage-devel/files/patch-setup.py b/sysutils/iocage-devel/files/patch-setup.py
deleted file mode 100644
index cad071146d2d..000000000000
--- a/sysutils/iocage-devel/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']))