From nobody Sun Dec 08 17:26:46 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 4Y5sP26Vtlz5gvV2; Sun, 08 Dec 2024 17:26:46 +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 4Y5sP241bRz3yv8; Sun, 8 Dec 2024 17:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733678806; 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=p/R+4m+iOAMDZtkDaxijwdEOcPOTSEfTCf9XHyglc+Q=; b=kjuVZNbBV4HY3aQjiTpc1NtDjGXv5zPTuH1s7iWpRix4rSzIowkRt3GsZaTAW9hXYP9ldR pgZEwQMAQZ/qpIRedtLyVOZqS5blC8gckVS9L3Km0UviP1BhKsd9OoEHXjbqlS7Hfin57t Dv22LXtOAk9q+PX1uSGBRZln2BrqBjFcEPmhZhNYCZYZRQoyKxMhEhhQxbHZh7m/SYwpi7 jUBN+gU7p5iQCK3LiWUO5Gcfu8/llGKWe093JlJwInGznoXy3cURH//qXMzNnM9qhHEOQ8 P88hZ+gSR86fhSqgQ4Et3LBU/0c/kwGV2b9IJDOHM6hrZn/Uu/IS5muUscZX/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733678806; 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=p/R+4m+iOAMDZtkDaxijwdEOcPOTSEfTCf9XHyglc+Q=; b=wYgIXOFb2G/1BzNH2Rask3qftTJY+Fzrq1O16x8/df8MmxTnlxLVoACyjiW/sTlB0sI2ec 8bqnw/6SLgBDgxYAoikFqq7khm4T5AzCiN0M3MOYSUIEKysxdazJ1z7dls1ymMPD/q+YHr uUH5WWbu+NOrFiS7FjPT0nhj/igxC1L+sD9gzfa6HHLXjzKR618fN1qa/6lmG1y+qjwx0B ZBzPN0LvRa1MNcnHart7u7WFZdi5KSTq5c5mnPDvKk21naHI1R4dLy16DrixJ9GuVTbFJE 8rp1XkUP3C2Dj7qqzGFKYFvnsZG4qaAchgarZrER7Sbp+dKFJUgzVKQ8nyTbkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733678806; a=rsa-sha256; cv=none; b=khB7U3snNrjxsslFa70HNZg1RLi5o7nj2kBgrwDdce+q6isQzj1XxBJjFZBnG2nl/2nC/l 2YvUwUs/u0dzL3ugQf2sL4vlr5u8eY5NQ+9+0Cf1QG/wAJVr+2lyu1bboJ+mi1Q9BJfxyb WPYmUf4eicC3KK9Lvw76lAIPiz/Z+eqt+qBp7pAPzIdTMi5z1SfvvBKYu5/PH2ALEvi0Fs 3Gtf+p6X0JPmGuaUZTJGQvneMd0bL4DYBTLQi/lagZUj2vbOjStQwXM0T8fHSHYJKTu+fn FnL5/T2NzhWF3iDC0BATWwUVbsARpU17hrA6vqcnx+M8h8wR1ggcSfWLc45K3w== 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 4Y5sP23dFMz11rm; Sun, 8 Dec 2024 17:26:46 +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 4B8HQksw067932; Sun, 8 Dec 2024 17:26:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8HQkDv067929; Sun, 8 Dec 2024 17:26:46 GMT (envelope-from git) Date: Sun, 8 Dec 2024 17:26:46 GMT Message-Id: <202412081726.4B8HQkDv067929@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Michael Gmelin Subject: git: eb8581d80ae5 - 2024Q4 - sysutils/iocage: Fix fetch release command 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/2024Q4 X-Git-Reftype: branch X-Git-Commit: eb8581d80ae503031d7f70a334b850a2829d7b79 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=eb8581d80ae503031d7f70a334b850a2829d7b79 commit eb8581d80ae503031d7f70a334b850a2829d7b79 Author: Michael Gmelin AuthorDate: 2024-12-08 17:18:49 +0000 Commit: Michael Gmelin CommitDate: 2024-12-08 17:25:52 +0000 sysutils/iocage: Fix fetch release command See also: https://github.com/freebsd/iocage/pull/55 (cherry picked from commit 66fa9f7ee8b077a0db5ab1c632e6e332d01f64f8) --- sysutils/iocage/Makefile | 2 +- .../iocage/files/patch-iocage__lib_ioc__fetch.py | 33 +++++++++++++++++----- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index 5b743bb4344a..696bc65ab7a9 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -1,6 +1,6 @@ PORTNAME= iocage PORTVERSION= 1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py b/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py index 73d8b6e58068..d5697b9205af 100644 --- a/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py +++ b/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py @@ -1,22 +1,41 @@ --- iocage_lib/ioc_fetch.py.orig 2024-09-20 06:45:27 UTC +++ iocage_lib/ioc_fetch.py -@@ -47,7 +47,10 @@ import iocage_lib.ioc_start +@@ -47,6 +47,29 @@ import iocage_lib.ioc_start from iocage_lib.pools import Pool from iocage_lib.dataset import Dataset -+# deliberately crash if tarfile doesn't have required filter -+tarfile.tar_filter ++# 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: - """Fetch a RELEASE for use as a jail base.""" -@@ -817,7 +820,7 @@ 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='tar') ++ 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."""