From nobody Mon Sep 30 20:14:14 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHXN65sQtz5Xc9v; Mon, 30 Sep 2024 20:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHXN65MD3z4Gsk; Mon, 30 Sep 2024 20:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727727254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SFw1EvrqDEXcCrrPiN8n5BDd3JbANAAt8yBVRjgwd54=; b=fRcaITcLisNQo0yMtWy/hb4n6vLwJsFp/X0FQGnCdfeqwHBdztTNGOfeiN2+kzpvuZgXri mEwRck/rZis3/xWAyeWWvaiV27uZyovwRQMZLiftE4+/XIxApD9889ykVSv1tKLT5DWYIC IF5HfEPjaMKIttU1BWUjq0rbYbQ0fzdH0/XA28V4IASw0wo4mN23jCGl5qFxVJlWS9YeeL qSIW0vFAN5Fzsi8Z8GchmKsCsKywrl8GuKDYSJcImH+st+HypX4lySYFDbOVLIUxS5hdi6 7SYGxnklib8HcoV1sYXOfFiuk8sYbaGCf0QlohOPzeZ4ew2CWVoe0MfsLUDqiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727727254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SFw1EvrqDEXcCrrPiN8n5BDd3JbANAAt8yBVRjgwd54=; b=wBEfKtVIsugcdRgxzhQ3+jZgYJnm9ucbITZgL57BR6q0ywdwGv/MJRmlYEnREEGg+I1Zr7 qOEDlRECwLFrZ/+32RUEI9ZxOxywpgjjw+J16r2t69tQzNIqusKJDBl+7leTfDv3qU6A7Y gJRoCIFH7L9VcYAyos8slTTfXILRA2FRo50c8azaMv1E/hYW6iY+shXCKiVR9H6PqsR1j3 HQHwe5vbyjG8J9nWXY3G5UXbQHsY38Nm8ecm+KD0JQYntfRE/+4eYo28u7JPKDTVdXMVyw Yy5fRxsjwjr54aWDPRuWY/Qw8MavwzUUbRTwgFIi5w6pexLnAp+EHw0FzG4kuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727727254; a=rsa-sha256; cv=none; b=Nxh7PfYDJBS/RLbjOuuX43i4Uh7qpFSJlZCfRfXLLev7nQTDl714NuvTFgMIl3rV//c99E hXiZGkVg1KaX0/j7GANjImHwBQhnj9h7jjO34FyR8PEpGU45hZJd7OGnpBkikEY0kNpeUZ rYm9Fzege9JfAz8PPLsmiXVzajJBKTQUOEHFDA0qh+yOLkHLTwjeYHF2zy7tFRExNqy4FN iMwW9j9A1H4k/5QT9s93xOFHRkp4+ZP9FZJLlqEW1814BcBMCe2+OgkWapTn8MhrJjcCGc QL5RIcqbWXDd2gQSKgKLijXiTBNHQuqLwb4GiewfRn8EAHB/R5/XXbwfwkcruQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHXN64cNYz174Q; Mon, 30 Sep 2024 20:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UKEEwd006966; Mon, 30 Sep 2024 20:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UKEETZ006963; Mon, 30 Sep 2024 20:14:14 GMT (envelope-from git) Date: Mon, 30 Sep 2024 20:14:14 GMT Message-Id: <202409302014.48UKEETZ006963@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Gmelin Subject: git: 5787776b7075 - main - sysutils/iocage: Update to 1.8, new upstream List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grembo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5787776b7075cb63a5a49345e2d0a37b31a271b4 Auto-Submitted: auto-generated The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=5787776b7075cb63a5a49345e2d0a37b31a271b4 commit 5787776b7075cb63a5a49345e2d0a37b31a271b4 Author: Michael Gmelin AuthorDate: 2024-09-30 20:07:44 +0000 Commit: Michael Gmelin CommitDate: 2024-09-30 20:13:57 +0000 sysutils/iocage: Update to 1.8, new upstream PR: 269298 Reported by: netchild Co-authored-by: Geoffroy Desvernay --- sysutils/iocage/Makefile | 39 +++++++--------------- sysutils/iocage/distinfo | 16 ++------- .../iocage/files/patch-iocage__lib_ioc__common.py | 11 ------ .../files/patch-iocage__lib_ioc__exceptions.py | 11 ------ .../iocage/files/patch-iocage__lib_ioc__json.py | 11 ------ sysutils/iocage/files/patch-setup.py | 11 ------ 6 files changed, 15 insertions(+), 84 deletions(-) diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index c7215b853300..7382360fb479 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -1,49 +1,33 @@ PORTNAME= iocage -PORTVERSION= 1.2 -PORTREVISION= 13 +PORTVERSION= 1.8 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} \ - ${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} +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} USES= python USE_GITHUB= yes +GH_ACCOUNT= freebsd USE_PYTHON= autoplist distutils CONFLICTS= py*-iocage py*-iocage-devel @@ -54,7 +38,8 @@ PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHO ${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..9db12abf93a0 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 = 1726817130 +SHA256 (freebsd-iocage-1.8_GH0.tar.gz) = 5fa7259ba1f48693d5ce5e3ce6f3bf2c06a4872e1a83497dff62949133353934 +SIZE (freebsd-iocage-1.8_GH0.tar.gz) = 758358 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']