From nobody Sun Dec 08 17:26:37 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 4Y5sNs6X5jz5gvd2; Sun, 08 Dec 2024 17:26:37 +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 4Y5sNs61BRz3ydy; Sun, 8 Dec 2024 17:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733678797; 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=nM0v4r24s1tbtLL6XvqSmJuXW7kjW7U/eR6FZzDr6zI=; b=RyOkU5qNE9p7FfhWeN6SBaqr5V2BlV/EX2DnTDrJhgOQCmN/KOUKW6RC4heLGFUp/iBazP I21jlxNrqrOEFqez3j5sZFQi1I4uDz8j0a5769FiSY9sGZCzxnSNNwjDl4QOWufi12/jVE CZ73UcXnwITBH5lV6wb2KwEwwS/GXGJ+HcmUNfC6xO9TY9OuHbMj7R+lSPzMcs/HRBlM4/ I4jG7pWQtRnTUdaaqL/Cz3pK84h46Vwe02WSLPy1IHrjVbYJrVezdstByY1edyHuCHsn6k rJPDHt4fKxRvxLtGjxgqgCnewIO1D/OVIzSoLu+6JMUo6J1iPivmeyezIMEh7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733678797; 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=nM0v4r24s1tbtLL6XvqSmJuXW7kjW7U/eR6FZzDr6zI=; b=lB3qHJA17vaxejXC8fzr+wCgfJ7DLv8xZztIDjZVNfkTWgU+06G1no+PBY3dJa/FnpMOS1 YDzkkdKZ8Zn6Bsb1Hi2hktwiJ2xdSXg4EayAiyabHteL6xNoMj7qPP8IjYm6gdCxaBVAxE ItipJ55Hgj/yWNzap6K1EzH/H5Bl9cl1nOd27BCRaFDgVGvvOrzzJSguUaEFiTlFOmpCGp HJ4d7gq8wnBL4w1/KsQIDWfMPCuWIyQpcR+CrP6EDQVFEDheaBi0AJLEfCYCnazjtqsBmg p39c04ILlVSHbMbc9k4R9t0Uuf2L+gTf+BUlLhV68/y7J6GEIBIQQk++oppjoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733678797; a=rsa-sha256; cv=none; b=RElakuTbWopFcGgfHtaO60XbXCypyOICHc+OiHlJnVuX8qsktteOSjXzaQuS/Qgn8c8Tep 1kQw9ywLYfZFDwPEkgKnbe2dvwbb9ljhJkd8cd+JA0o5kXiGzzosiMWMSX0vArX8aQ6vNw +igs8k5HFZb39JgP0C9ZKXYXBDu2yRLu9UG+b+NekYaX0tPoqvAPCvvk4u6LujlpEnjCrP cKgmyqgF8Sxd+PgBiZ/GlkXj2teYCxdMpOgn4tW4jw8KU1XRoWPN09MpJxdo7BnxBcv5BD MLHmYFIFEmBo2RFmofH1NhWzL+9ORHw/zF3Tda8jr7eRNjrMHgNvSbeczbo8TQ== 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 4Y5sNs5cYrz12Mk; Sun, 8 Dec 2024 17:26:37 +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 4B8HQbfd067648; Sun, 8 Dec 2024 17:26:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8HQbYp067645; Sun, 8 Dec 2024 17:26:37 GMT (envelope-from git) Date: Sun, 8 Dec 2024 17:26:37 GMT Message-Id: <202412081726.4B8HQbYp067645@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: 66fa9f7ee8b0 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 66fa9f7ee8b077a0db5ab1c632e6e332d01f64f8 Auto-Submitted: auto-generated The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=66fa9f7ee8b077a0db5ab1c632e6e332d01f64f8 commit 66fa9f7ee8b077a0db5ab1c632e6e332d01f64f8 Author: Michael Gmelin AuthorDate: 2024-12-08 17:18:49 +0000 Commit: Michael Gmelin CommitDate: 2024-12-08 17:18:49 +0000 sysutils/iocage: Fix fetch release command See also: https://github.com/freebsd/iocage/pull/55 --- 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 a6d03c6a02cb..a851cb6c04e8 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."""