From nobody Fri Jul 12 14:33:02 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 4WLDbL2Vj7z5QWCZ; Fri, 12 Jul 2024 14:33:02 +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 4WLDbL1z0lz4GpZ; Fri, 12 Jul 2024 14:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720794782; 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=0nfjcgRO9q1jQ0S4UXGL8Y0mVVnxq+x90j/EggDZOI4=; b=Y0oOkqmYNxTaYqOXjWGzy06BtYIxLB9BsuPPFFH/ux8SIgOMMHASXxfXbFZvxfVT27DlPm K5vS+ZwyyQ3pUZe5FNhQvZnvjRxkc5Rnjkx9BiLJnDkFZkR4Xcex1wSIC9fS1PhJmFmobr E0/9mD0NLHNqzIii7j5oOQpzoBkexMo1233UBdd6zt0AyaVBnMQq9hnHK386JdDofVXhsG isqgO8lnDT9zxco2x4rCMAKiWg0XbiXTiMju2J2ppKJebC9SpU7endure0jYMHFTitQt64 1gx4k3eZN3nCKgrobrGL0xVLfGW4TlkFp/FoS5FaJN4s87jzQmG9PykUAsSkyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720794782; a=rsa-sha256; cv=none; b=KHQdmjBbNvwpfWphcHgSGo18TBH0d8MuIzFHPIzrOfnF1StSj2Tg+dy++OPfCgPLOX5nIR x1BUUpMOrZtV+MSq+SW06jvjk7+r1YaX6qHr7fnIwCp6iLw8UekblwnU/iUu2kosY430S+ zc6xL8c099xBZP8Bgv8WSoJn/jkRf98K1X/FJ82pfdHl7TYcvsTYsveQLUkml8V58x5eSC oX5Z2Wg16SV8eDK2UvHBGxulr7qE6QjruwHmj2/SyPiuOKxaRkqcOsKy/0RWI9aGxZzWVT UrPTdz0JC8ixxPsEa1iWshk3Xq3ax4H/DePiTVO5x93sNkFRAACJFZW/gHLTWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720794782; 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=0nfjcgRO9q1jQ0S4UXGL8Y0mVVnxq+x90j/EggDZOI4=; b=jXJVHKKtP/W4MQglmKOLn1vdEiXkcyG+3q/rLm3IkMhVwIwUDfX2PRJzX8TOuGWGeqLZbR JTnBEeCkNZqI/pxm2E84AJabGU22btaO9fIzSYP+tCy3lLgAW9O2kwo6TZPFSuntzcBalh UmCjv9gmbfzu1WkKz4UpRe4ArLj41OYBVKL5PRoEamQLS47Bzz7ycSo9JsbXSWBk4VBgq5 9c1yqdxIwYQrp5wPfHavaG3Y65eeFI2aO3sor3ggDPJlOfMcxEHNqB0NO3wY1Ea2ONjR7j jB7czikHgMimySVJCYSBUPL0Td6uHARjEjPNuk7GsnzktS//47HdyqIA96TgMA== 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 4WLDbL1ZP3znHL; Fri, 12 Jul 2024 14:33:02 +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 46CEX2pq016297; Fri, 12 Jul 2024 14:33:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46CEX2k3016294; Fri, 12 Jul 2024 14:33:02 GMT (envelope-from git) Date: Fri, 12 Jul 2024 14:33:02 GMT Message-Id: <202407121433.46CEX2k3016294@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: e15d19c28d11 - main - sysutils/iocage: Fixes for python 3.11 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: e15d19c28d11eb9da6ad543b4e3f0ff61783ced5 Auto-Submitted: auto-generated The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=e15d19c28d11eb9da6ad543b4e3f0ff61783ced5 commit e15d19c28d11eb9da6ad543b4e3f0ff61783ced5 Author: Michael Gmelin AuthorDate: 2024-07-12 14:30:27 +0000 Commit: Michael Gmelin CommitDate: 2024-07-12 14:30:27 +0000 sysutils/iocage: Fixes for python 3.11 PR: 280219 Reported by: asomers Tested by: asomers --- sysutils/iocage/Makefile | 2 +- sysutils/iocage/files/patch-iocage__lib_ioc__common.py | 11 +++++++++++ sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index c3c32a102859..c7215b853300 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -1,6 +1,6 @@ PORTNAME= iocage PORTVERSION= 1.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__common.py b/sysutils/iocage/files/patch-iocage__lib_ioc__common.py new file mode 100644 index 000000000000..1216797ef225 --- /dev/null +++ b/sysutils/iocage/files/patch-iocage__lib_ioc__common.py @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..1588ef95399f --- /dev/null +++ b/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py @@ -0,0 +1,11 @@ +--- 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] +