From nobody Sat Jan 18 09:34:15 2025 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 4YZryv5Pthz5l6T1; Sat, 18 Jan 2025 09:34:15 +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 4YZryv4jR3z3DcF; Sat, 18 Jan 2025 09:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737192855; 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=Bi0uSKqUivNg9BFm4AqpLesX/Cx/19UlniB5ytq2cSw=; b=G6gdWVehS2CMwbKOf87zn2+LSl3GR5TnYwsc+LDg4pYnh7TfadvcPozQvYmf3lWPedSP/u 5CXmPYSA6NR1VwQVvR0Rssne/jOz1lZcKCK5kWGWZxF2PJBMVtXL4dx/CS5Rb+57FHZvQE tY7vUw+88HYZ+zWILApyTys3JI1fJH/SO9O7TXPqb7Wopkj5fuagy/d1r3mxhWkQIbbY/8 zfMB+OJbF0m6tFLJfbFmD2JXnftDRaFcdBGo2vKRobYYx9ZWzjZ8j6kPz13mSZY75sc4es H6O+pZWdNDpXGX4m9DXaZuWG8cmIu9abuH8ovyRowy4NjnH10iPo+9qJ50XJCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737192855; 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=Bi0uSKqUivNg9BFm4AqpLesX/Cx/19UlniB5ytq2cSw=; b=tBt6pyY45+CCEtrac+n0r16uqx4Iu62hrhS2U6ZAYgu2CPkMu/zrPKqoSPIFU30kbbd5yi ZJZlLWxMpZPwxSbtgcWc59S/1Tit5BPUI+OlPwMqvD4O3Tmc5qYNGipIabI2jsOqFRtIIo 0lQSsla3U3PZJDCG2EuzeKwcgDVLM6yRwHkvwGA/gqv/sg7nWPWF7O0MzyakqTyDKhBuP+ Wv1H5zOVLnsffFH9/ipUI7p9y6VAM9GfRxxE+h5xrjX4LYyeCiEMEG50Rk8Bt7vST7fsca q0hVFLkeTTDJ5hQKqS5UBmri1WIQdkTUnusfFrLPrhFFhvIqsfKGytF/ghvQPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737192855; a=rsa-sha256; cv=none; b=CG9J8J2V8oBrJ7d2qu6PYuvgeywInmVQwjLg1QdZZ0Hn51jt6BGFEdL9Y4UBggbXdRJEkM MAoy80fCUKtJKmpWmrUcHoz3OajZdxJlFZ6sJ1DTbXTjAlY7OB46Am/7QY+Jgm/rC5rAY8 k8S7nCa/9WVLE7OFibEIFlZE09L8cZezgmnwJuj9d7ibnL3EDpYtr0TmKViU/3Y7HroR0T bFVSdlt6IPmgAz8nXW5V4BzAtyGRbgWlLt89ZTahTXrWVpuD7hwZoCeKnkrqQQR4EhEsM8 EEDOEWLlEtQu3XkDv6J0/yBGeGDsDnGjdgHG8DCFONYrt6YSnIthoyOGkplc3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YZryv40frzyLy; Sat, 18 Jan 2025 09:34:15 +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 50I9YFZH061790; Sat, 18 Jan 2025 09:34:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50I9YF9n061787; Sat, 18 Jan 2025 09:34:15 GMT (envelope-from git) Date: Sat, 18 Jan 2025 09:34:15 GMT Message-Id: <202501180934.50I9YF9n061787@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kirill Ponomarev Subject: git: 338a47632e41 - main - sysutils/py-salt: Fix modules config 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: krion X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 338a47632e418ea1525fd77356d965c5d94bc6f2 Auto-Submitted: auto-generated The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=338a47632e418ea1525fd77356d965c5d94bc6f2 commit 338a47632e418ea1525fd77356d965c5d94bc6f2 Author: Kirill Ponomarev AuthorDate: 2025-01-18 09:33:32 +0000 Commit: Kirill Ponomarev CommitDate: 2025-01-18 09:33:32 +0000 sysutils/py-salt: Fix modules config PR: 284118 Reported by: meka Reviewed by: asomers --- sysutils/py-salt/Makefile | 1 + sysutils/py-salt/files/patch-salt_modules_config.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 19c86921caa9..f969375b7683 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -1,5 +1,6 @@ PORTNAME= salt PORTVERSION= 3006.9 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils python MASTER_SITES= PYPI diff --git a/sysutils/py-salt/files/patch-salt_modules_config.py b/sysutils/py-salt/files/patch-salt_modules_config.py new file mode 100644 index 000000000000..197f64dc1b8e --- /dev/null +++ b/sysutils/py-salt/files/patch-salt_modules_config.py @@ -0,0 +1,17 @@ +--- salt/modules/config.py.orig 2025-01-17 15:15:13 UTC ++++ salt/modules/config.py +@@ -17,13 +17,7 @@ from salt.loader.context import LoaderContext + import salt.utils.sdb as sdb + from salt.loader.context import LoaderContext + +-try: +- # Gated for salt-ssh (salt.utils.cloud imports msgpack) +- import salt.utils.cloud +- +- HAS_CLOUD = True +-except ImportError: +- HAS_CLOUD = False ++HAS_CLOUD = False + + + if salt.utils.platform.is_windows():