From nobody Fri Dec 20 12:02:21 2024 X-Original-To: dev-commits-ports-all@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 4YF5d91btTz5hrrP; Fri, 20 Dec 2024 12:02:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YF5d919QGz4XxF; Fri, 20 Dec 2024 12:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734696141; 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=jxyfNosR84qLFVqdTf85d60At3YWTsntIrk53TA7xMw=; b=ovkjdtIaB8h1naXdzxmZyCek9L8aXNouBGkvM68HlMaKcV1UjzGkqz8PMfNjXO9Yz+8fNw E9q/Lhn7m6hgoXJaeJ2pLf3CV6iFIXhIMNRYHySDpkg6FR0p+sVAjF14TbO+QvrswLMVJK B3xSD3U89wUcLuW25e/Tbb0dJJOgtO3Ry7aIxR06rulY2vrhqR2IPGYHiDeBcxPE6/db2J zYd4mg46oa7iBYqHHlTvw5/k9gWgD7ynyXCdtI2vK1TPVdoPTFCRpXHsviKGKNJ9/DjZxV CggSTdfFmSHxjYxKeSlQ7dU8bugkE/vJLFmX8JzMf5YK0rV9sK0Ng+mmbtZ9gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734696141; 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=jxyfNosR84qLFVqdTf85d60At3YWTsntIrk53TA7xMw=; b=F9um9Z4Uuhyedh/PRBx/pX5EDXjB99Ck8LnzfkH6MWlATGF3/WVO1x6+Kbtc6KSe8kKw/j +moqVBL6pVOyKSexAl3/i5TRM74GzpAf1z8yob28yeuMi7OiHsGqqCWT7eFnPRyAnD2y4U m4D3+QORrkIf/n+HEpWwanZ8w0kuA/bp+6Akg3hbrJNnfqe3se9SvMZ/LlN+a13jI4smr2 v5K4QJ8Mp3D9+T3x8BkvSOVudKa0Ja37XxyRejguHB7iG18BF9vD9caz72oQYXVdp6CoQG r3Vgk6TR0eXlCwiPfqDP70MLo+w1vLponbiZoJkNVMs299MCUtaxkKvu5jSXqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734696141; a=rsa-sha256; cv=none; b=oD+vkTWVqN8splRntZsDlaqT1+xaWTbJTjw0Y1Wo4hSPLcOqVCkdq+dYZVux/Xdkd5qpvP hKJGd/OfJ211J4/iEdWBQdEZOoHvbhtaXVitn2WN1o4IEwLO1rR4r0Oo4XP/9qXCCKJPBR Q29McF4k0sMZAdvofANmfa4vxnfFXshj1A+ZZix1s5xhrOgKqAB4k1uE5hEqY18T/SAbsg hvJSi5WNW0ndL0qv+aBXilNR7cmQVlMCZW3b4fcg+HV21cEMctjhgGjLvHqoOOa9PwWxNQ GZQnBbAW1QGZSddHGraRpGAi3Y6rCAy1C6kH87oCQ2NSvxm+fE/V0CFeXAFb4g== 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 4YF5d90nGMzdVN; Fri, 20 Dec 2024 12:02:21 +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 4BKC2LUG014071; Fri, 20 Dec 2024 12:02:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BKC2Lf1014068; Fri, 20 Dec 2024 12:02:21 GMT (envelope-from git) Date: Fri, 20 Dec 2024 12:02:21 GMT Message-Id: <202412201202.4BKC2Lf1014068@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: e833dc234584 - main - sysutils/iocage: Update to 1.10 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: e833dc2345845f41503acf6523eeae94ff456e47 Auto-Submitted: auto-generated The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=e833dc2345845f41503acf6523eeae94ff456e47 commit e833dc2345845f41503acf6523eeae94ff456e47 Author: Michael Gmelin AuthorDate: 2024-12-20 11:59:38 +0000 Commit: Michael Gmelin CommitDate: 2024-12-20 11:59:38 +0000 sysutils/iocage: Update to 1.10 --- sysutils/iocage/Makefile | 3 +- sysutils/iocage/distinfo | 6 ++-- .../iocage/files/patch-iocage__lib_ioc__fetch.py | 41 ---------------------- .../iocage/files/patch-iocage__lib_ioc__plugin.py | 22 ------------ 4 files changed, 4 insertions(+), 68 deletions(-) diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index a851cb6c04e8..2adc4505e3c5 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -1,6 +1,5 @@ PORTNAME= iocage -PORTVERSION= 1.8 -PORTREVISION= 2 +PORTVERSION= 1.10 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/iocage/distinfo b/sysutils/iocage/distinfo index 9db12abf93a0..e3c2da99c3c3 100644 --- a/sysutils/iocage/distinfo +++ b/sysutils/iocage/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726817130 -SHA256 (freebsd-iocage-1.8_GH0.tar.gz) = 5fa7259ba1f48693d5ce5e3ce6f3bf2c06a4872e1a83497dff62949133353934 -SIZE (freebsd-iocage-1.8_GH0.tar.gz) = 758358 +TIMESTAMP = 1734695580 +SHA256 (freebsd-iocage-1.10_GH0.tar.gz) = 4e53137b1c91d964a560c38945acfb4a59e2c57162ebc9302b8b90639a1a71b5 +SIZE (freebsd-iocage-1.10_GH0.tar.gz) = 815548 diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py b/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py deleted file mode 100644 index d5697b9205af..000000000000 --- a/sysutils/iocage/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/files/patch-iocage__lib_ioc__plugin.py b/sysutils/iocage/files/patch-iocage__lib_ioc__plugin.py deleted file mode 100644 index be9ee84d1e3f..000000000000 --- a/sysutils/iocage/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):