From patchwork Fri Oct 28 20:38:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Carter X-Patchwork-Id: 13024280 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66E97C38A02 for ; Fri, 28 Oct 2022 20:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229501AbiJ1UjD (ORCPT ); Fri, 28 Oct 2022 16:39:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229544AbiJ1UjC (ORCPT ); Fri, 28 Oct 2022 16:39:02 -0400 Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9058223643C for ; Fri, 28 Oct 2022 13:39:01 -0700 (PDT) Received: by mail-qv1-xf33.google.com with SMTP id ml12so4874749qvb.0 for ; Fri, 28 Oct 2022 13:39:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6uygWuYBy9wdgTo+YR2Pf2NOhXJWrZ17lCvPJoA4UBI=; b=PqRsziP7kLfjEB8PEeFrjJUupnok25sbEoll1fo9/N3eKIj2kAQXHn9h0ODmEc88i/ gdqcpx1OX6Mj3kFBOMVf1c/kozNd4tC8M6IC4juOz+wNo/U82C+MFyg4t/wyC49iBls2 xvp949Vy0iZFa3aZSF/FgtHhF5bn2bgRnScv5fGYoj1MOoFmtR5rAz5MM5jV+CfjG37z MTJilKD+ITnjxnZMUpksdvH7yLaziBMpq3byD5188BqK/RsAcB0XSSIfrtyRM1MyLBHW I8VA+RXdnAQ27RagPcVLH7Em0aVTIikWVw/Sik42T4KdTZsX4lKtAtEtcKR3AhdZoqbj 1LGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6uygWuYBy9wdgTo+YR2Pf2NOhXJWrZ17lCvPJoA4UBI=; b=OuSt+39hPGF3O4YU6PEl8Z3S/MoKg0dElBoEiRo5wh9Vihq6j7weoDG09MaJ5NFIl5 Qy+R0SnquxdFhIr8xBlMt7l7JOp38LlD+0gC0xMu1tVxK598dPpkg8h3gmmAKuG35jxh gCNxJ9eCh/WvcZXOnX5yx0agJgfmvE7hn6bjF2zinGBFbdiMkLTkPTIEpe1MUGaUpzV0 LQRo/Owd1pphgYTnQXnoUB4H3HO8EuNkFDrvlx2ycTPMQwzv7yfBozc85F1+oQ+8k/GN nZdZmHafSv05Cwh8gtNgwsxqYyyZ9UNxkaL1ek2v0tQMv0LNISIzBNwspJamJi7qgMqC zY9w== X-Gm-Message-State: ACrzQf1nJXTMBJ10alJ0moSEJD6RuYdQ+9hLj2qt7Zd9SCpVqvpN92FV i2gX0p4tl844I77Xk6MT8OTfEFVUJ3E= X-Google-Smtp-Source: AMsMyM5pEqsR4UqvKxxZhMvCd9CpFEh5x+KhFQYOAEtwLm4baW5MDP8yjaLiZphNmzZQ36t4Z6Cxsw== X-Received: by 2002:a0c:979a:0:b0:4b7:4a8c:a80d with SMTP id l26-20020a0c979a000000b004b74a8ca80dmr1371975qvd.42.1666989540374; Fri, 28 Oct 2022 13:39:00 -0700 (PDT) Received: from electric.. (c-73-200-155-132.hsd1.md.comcast.net. [73.200.155.132]) by smtp.gmail.com with ESMTPSA id v17-20020a05620a0f1100b006ecfb2c86d3sm3606642qkl.130.2022.10.28.13.38.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 13:38:59 -0700 (PDT) From: James Carter To: selinux@vger.kernel.org Cc: James Carter Subject: [PATCH 1/5] libselinux: Remove dependency on the Python module distutils Date: Fri, 28 Oct 2022 16:38:48 -0400 Message-Id: <20221028203852.526472-2-jwcart2@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221028203852.526472-1-jwcart2@gmail.com> References: <20221028203852.526472-1-jwcart2@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The distutils package is deprecated and scheduled to be removed in Python 3.12. Use the setuptools and sysconfig modules instead. Signed-off-by: James Carter --- libselinux/src/Makefile | 2 +- libselinux/src/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index 49b7d60a..dc284832 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -14,7 +14,7 @@ SHLIBDIR ?= /lib INCLUDEDIR ?= $(PREFIX)/include PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX)) -PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(plat_specific=1, prefix='$(PREFIX)'))") +PYTHONLIBDIR ?= $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '$(PREFIX)', 'base': '$(PREFIX)'}))") PYCEXT ?= $(shell $(PYTHON) -c 'import importlib.machinery;print(importlib.machinery.EXTENSION_SUFFIXES[0])') RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') diff --git a/libselinux/src/setup.py b/libselinux/src/setup.py index 71e69a10..6cbe3a0e 100644 --- a/libselinux/src/setup.py +++ b/libselinux/src/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -from distutils.core import Extension, setup +from setuptools import Extension, setup setup( name="selinux", From patchwork Fri Oct 28 20:38:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Carter X-Patchwork-Id: 13024282 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE075FA3743 for ; Fri, 28 Oct 2022 20:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229544AbiJ1UjE (ORCPT ); Fri, 28 Oct 2022 16:39:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbiJ1UjC (ORCPT ); Fri, 28 Oct 2022 16:39:02 -0400 Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 497FF236411 for ; Fri, 28 Oct 2022 13:39:02 -0700 (PDT) Received: by mail-qk1-x731.google.com with SMTP id b25so4238357qkk.7 for ; Fri, 28 Oct 2022 13:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1//3EjPXUygil4S96s4E9Xj62821VC9xZkBYGGEd9M4=; b=Qq7XRJUokVUtmYIOAupdEuf03j5YlycjfhjB/Ob008MOvUfbeU1EnwAaRNexL3ZRZL gc/uGyfRvbxWKKRJChQPhqj0lkGKSEbkiPLl5GlW6VuQ4iXUl6WsN0anV/gW7LK5Aeoq cq56r7YUFto3HL6SYRTcLFoAqzY4jA+R4V3AjW+2uQqV6FpWyy6O3aqSaqullf5LV6RJ ESxULORPzGAivd//PinIEUxEvuz2DBuxwB7CCVlPAkNLdjDYyPSEaVbO7Obxkx6AscnI PrW6uiU6dReyhzGPVzphfML+GrSOTqLRc2MRF05Yu96aeB64fZZsHMd5acti4AHzqYM0 O7TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1//3EjPXUygil4S96s4E9Xj62821VC9xZkBYGGEd9M4=; b=2/enCL6KXf0rvvtBwTJs/cVcbGNY9H/WAMJEc7yO3vff6G14uv6LTTyUpvX4i3We0w VxhK2kHRiSmFX6BdcL8TJMEHa+OheVexQAS7Ml+z89Tej+Ljt4dqlO1kP0WEZQopSFd/ ZQHmUCZ0U14o214EaGF1eZq2XL9vOk5POW9LCt33V3LOWTR4g0qpACWSo5na5SqseM2R r4totlz+Rm1nYOJjS5hn6MC5Fwx+d5jNsIlkCbFGV2BangT87T11Vpa8jE8cys3lUT32 NAc38G0rNgKZga7gyIWlVlRapUC1AOmOb6Oh/1sKuQYc0J2mihtbHpv/77nQB8lQ1Ezf c//Q== X-Gm-Message-State: ACrzQf1DOdyDulRNUgx5uIHfDxnowP9T4S2X7fcgDBe9iQopIqdn0w5V kpr2rN46tQ663vH0Sxw4G248HZqB3ME= X-Google-Smtp-Source: AMsMyM62FQcJQySzFIeKa+G77px1RwQtJVWWbiP/db7nbS2FoUiCTITKZVYe3K8l+WzhBLaR6JfvVg== X-Received: by 2002:a05:620a:440a:b0:6ec:d931:652d with SMTP id v10-20020a05620a440a00b006ecd931652dmr923243qkp.344.1666989541259; Fri, 28 Oct 2022 13:39:01 -0700 (PDT) Received: from electric.. (c-73-200-155-132.hsd1.md.comcast.net. [73.200.155.132]) by smtp.gmail.com with ESMTPSA id v17-20020a05620a0f1100b006ecfb2c86d3sm3606642qkl.130.2022.10.28.13.39.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 13:39:00 -0700 (PDT) From: James Carter To: selinux@vger.kernel.org Cc: James Carter Subject: [PATCH 2/5] libsemanage: Remove dependency on the Python module distutils Date: Fri, 28 Oct 2022 16:38:49 -0400 Message-Id: <20221028203852.526472-3-jwcart2@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221028203852.526472-1-jwcart2@gmail.com> References: <20221028203852.526472-1-jwcart2@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The distutils package is deprecated and scheduled to be removed in Python 3.12. Use the sysconfig module instead. Signed-off-by: James Carter --- libsemanage/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile index 01df0181..589e4a70 100644 --- a/libsemanage/src/Makefile +++ b/libsemanage/src/Makefile @@ -14,7 +14,7 @@ INCLUDEDIR ?= $(PREFIX)/include SYSCONFDIR ?= /etc PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX)) -PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(plat_specific=1, prefix='$(PREFIX)'))") +PYTHONLIBDIR ?= $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '$(PREFIX)', 'base': '$(PREFIX)'}))") PYCEXT ?= $(shell $(PYTHON) -c 'import importlib.machinery;print(importlib.machinery.EXTENSION_SUFFIXES[0])') RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') From patchwork Fri Oct 28 20:38:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Carter X-Patchwork-Id: 13024281 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDAC4FA3740 for ; Fri, 28 Oct 2022 20:39:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229648AbiJ1UjF (ORCPT ); Fri, 28 Oct 2022 16:39:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbiJ1UjE (ORCPT ); Fri, 28 Oct 2022 16:39:04 -0400 Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5A36236423 for ; Fri, 28 Oct 2022 13:39:03 -0700 (PDT) Received: by mail-qk1-x733.google.com with SMTP id x26so4252354qki.0 for ; Fri, 28 Oct 2022 13:39:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=19AE9+A9622PSs8MFLOsASoysosQHzardGYfNLeCNOw=; b=K7LLgA3TZYMAXsGy16fsrRVVSI8yH74rQrocVn6NU95qlG7mG+nEUfzZPDNdGBM8bT FPyYrrEDsUIxQxnrL2pQAe1YPLYJe/0QF51EBev4KBpzPM9X8KTg/lXAQ2VpMRw7H+XY Ya0hZwLwgRM9NMf1VMff7NuwTWVJ2Lb77zySlZ2VjkvaKl3VXByWwi3WUqo/m2PA+P5p rcCJFQrO519An8okVUl2krX7hpKgcgbZ2m5XbmHJBHpSww+H0G9yS3XK9InfXk8qQsEb k5RPrW4xlM/lb+IkO0isBt9TXKFVKKYEyE+JfkSHcogzy8ym68a6DEB9M9OHIi3mh9iN GlDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=19AE9+A9622PSs8MFLOsASoysosQHzardGYfNLeCNOw=; b=yiL0El5uIxqh34NVk5fXloTh5rnWbsmySg7FUJ39lZS4sD+4NxgBmMkNAuUigB6sXN WTIIdPDdCaZvu2ib+rZU8PdbXKcLDMEjN1pXAI9ZAakF67Zh4hVVGYUSmaN0FQ5GAJoA AC2X+d9qw47VRJ+OkUxaiBeAl1AAOCK7Q6IIZbFX7pVDvgP+i0EJnUekkXCm5z+A9Mre bP8WlQGxLlKkxXkQ8sFXBOTReTJMAGp07xFS+HiQhCPQ8cgZ7QWNi8DWM+mhkkxfMqdP tSMNzSX9EjLxzPqWg6zfBmzmrXXlzyLLCGgCo9eAYa6RMfUpC5/akclIgTr+3SQ1UJGm QdcA== X-Gm-Message-State: ACrzQf1TkLR6XD0xAlpQCZVTuKEiyyinbu+sZ7HL09UgCEurByJgvZ1F J8lDfqpUjOE9LgvXdpLVoJzkZXz4wSU= X-Google-Smtp-Source: AMsMyM4SrhvL56aYFiDYomomMH679e15vcXaZXnaEuN9PHi/dp2C42KVkBNfdnXY6F6hT/aqj44GRQ== X-Received: by 2002:ae9:e895:0:b0:6ee:74f7:d0e6 with SMTP id a143-20020ae9e895000000b006ee74f7d0e6mr931967qkg.398.1666989542224; Fri, 28 Oct 2022 13:39:02 -0700 (PDT) Received: from electric.. (c-73-200-155-132.hsd1.md.comcast.net. [73.200.155.132]) by smtp.gmail.com with ESMTPSA id v17-20020a05620a0f1100b006ecfb2c86d3sm3606642qkl.130.2022.10.28.13.39.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 13:39:01 -0700 (PDT) From: James Carter To: selinux@vger.kernel.org Cc: James Carter Subject: [PATCH 3/5] python: Remove dependency on the Python module distutils Date: Fri, 28 Oct 2022 16:38:50 -0400 Message-Id: <20221028203852.526472-4-jwcart2@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221028203852.526472-1-jwcart2@gmail.com> References: <20221028203852.526472-1-jwcart2@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The distutils package is deprecated and scheduled to be removed in Python 3.12. Use the setuptools and sysconfig modules instead. Signed-off-by: James Carter --- python/semanage/Makefile | 2 +- python/sepolgen/src/sepolgen/Makefile | 2 +- python/sepolicy/sepolicy/gui.py | 2 +- python/sepolicy/setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/semanage/Makefile b/python/semanage/Makefile index 024e9640..b1f1bd3a 100644 --- a/python/semanage/Makefile +++ b/python/semanage/Makefile @@ -5,7 +5,7 @@ LINGUAS ?= ru PREFIX ?= /usr SBINDIR ?= $(PREFIX)/sbin MANDIR = $(PREFIX)/share/man -PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(prefix='$(PREFIX)'))") +PYTHONLIBDIR ?= $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '$(PREFIX)', 'base': '$(PREFIX)'}))") PACKAGEDIR ?= $(PYTHONLIBDIR) BASHCOMPLETIONDIR ?= $(PREFIX)/share/bash-completion/completions diff --git a/python/sepolgen/src/sepolgen/Makefile b/python/sepolgen/src/sepolgen/Makefile index cac8def7..9578af23 100644 --- a/python/sepolgen/src/sepolgen/Makefile +++ b/python/sepolgen/src/sepolgen/Makefile @@ -1,6 +1,6 @@ PREFIX ?= /usr PYTHON ?= python3 -PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(prefix='$(PREFIX)'))") +PYTHONLIBDIR ?= $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '$(PREFIX)', 'base': '$(PREFIX)'}))") PACKAGEDIR ?= /$(PYTHONLIBDIR)/sepolgen all: diff --git a/python/sepolicy/sepolicy/gui.py b/python/sepolicy/sepolicy/gui.py index 5bdbfeba..63f2371f 100644 --- a/python/sepolicy/sepolicy/gui.py +++ b/python/sepolicy/sepolicy/gui.py @@ -77,7 +77,7 @@ def cmp(a, b): return 1 return (a > b) - (a < b) -import distutils.sysconfig +import sysconfig ADVANCED_LABEL = (_("Advanced >>"), _("Advanced <<")) ADVANCED_SEARCH_LABEL = (_("Advanced Search >>"), _("Advanced Search <<")) OUTBOUND_PAGE = 0 diff --git a/python/sepolicy/setup.py b/python/sepolicy/setup.py index b0f9650d..c8220664 100644 --- a/python/sepolicy/setup.py +++ b/python/sepolicy/setup.py @@ -2,7 +2,7 @@ # Author: Thomas Liu # Author: Dan Walsh -from distutils.core import setup +from setuptools import setup setup( name="sepolicy", From patchwork Fri Oct 28 20:38:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Carter X-Patchwork-Id: 13024283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B834ECAAA1 for ; Fri, 28 Oct 2022 20:39:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229692AbiJ1UjG (ORCPT ); Fri, 28 Oct 2022 16:39:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229670AbiJ1UjF (ORCPT ); Fri, 28 Oct 2022 16:39:05 -0400 Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94D9823643C for ; Fri, 28 Oct 2022 13:39:04 -0700 (PDT) Received: by mail-qk1-x735.google.com with SMTP id 8so4239138qka.1 for ; Fri, 28 Oct 2022 13:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2RLk2jhO9ygRPUDTuBWAIeIidKHAkFbxo5zSuB1sBQQ=; b=nhepSbi2Ip0HXr57cxtozzSOfwpWUfGabkXzptUtSMB8hXlvtKaNg2YnDQl4PIiVIT CWPX+b7vDyz+sUV03D1DpQe3c3VOFDM9PLFJmCQeQRxglRa7DaXudZoF8cEZL7y8CFSY tzJ/fmsAhrxOS5zXmV6iytO0RSud6vok+rMmMINfYwoa3ERkQ6yhFIZtoy14l+GPzLbb gFfM9y7Wbb+dhsIz7poQlfgCGurrD0eo2bTLaBmaD5+klO619LhMdw/xFGF2JpKoa3mo tdT7WPWHJY4PAKo/ND2xggPsXMSLU2wKHNz2Y98xhmZZy5ObzLTy1tl/nQOcgTLG6DCu C1WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2RLk2jhO9ygRPUDTuBWAIeIidKHAkFbxo5zSuB1sBQQ=; b=f6vJg+mSRVvVg2I7V43j4TLa4/1zApcm5z+d90JVGlKal9k/0X6TiJcW3gta5qSzOR Rc1EJex39rBWqJ55GFO25SJe0RdkkwniVNymbiVyAZ86Lt78Al672Z0Rjkpa/62JlCp9 JW/oJj6jwvN4LYkHHZZA3vCpn/CgJ6BBInSlkEoYTi6v4kA7VXsbNMC7DUCpxvHKuL85 sEftGJUAuaoOaOBNmfJiCA0o4C/lcId8al21F5n+iLwlzux08vQbDPYLNqLggkX8Fp4o rXmLvwqIhb9/+KXVSo0k2BPxz4ciE9U6pis8VEY9lOaeYDhu5Iep/fnqWmc3Kpbuxf5w XRvQ== X-Gm-Message-State: ACrzQf0NC5ljdpTvirAhWtbIMReXbvjrFJU8M1LvWc5g8B5rqp9lwwX8 14Gw48mQ2vB+XZ6kc8mT+bYFXZYR4fU= X-Google-Smtp-Source: AMsMyM6+xUmuIcUDCpt+PVg5jp92SJ7Rj6iZOQxQk+umFlMWXo+DWfhvyiB9EXogeI8qYPAJPf+EgA== X-Received: by 2002:a05:620a:8c9:b0:6fa:120f:9776 with SMTP id z9-20020a05620a08c900b006fa120f9776mr910359qkz.235.1666989543480; Fri, 28 Oct 2022 13:39:03 -0700 (PDT) Received: from electric.. (c-73-200-155-132.hsd1.md.comcast.net. [73.200.155.132]) by smtp.gmail.com with ESMTPSA id v17-20020a05620a0f1100b006ecfb2c86d3sm3606642qkl.130.2022.10.28.13.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 13:39:02 -0700 (PDT) From: James Carter To: selinux@vger.kernel.org Cc: James Carter Subject: [PATCH 4/5] scripts: Remove dependency on the Python module distutils Date: Fri, 28 Oct 2022 16:38:51 -0400 Message-Id: <20221028203852.526472-5-jwcart2@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221028203852.526472-1-jwcart2@gmail.com> References: <20221028203852.526472-1-jwcart2@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org The distutils package is deprecated and scheduled to be removed in Python 3.12. Use the sysconfig module instead. Signed-off-by: James Carter --- scripts/env_use_destdir | 2 +- scripts/run-scan-build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/env_use_destdir b/scripts/env_use_destdir index 8274013e..89d989a2 100755 --- a/scripts/env_use_destdir +++ b/scripts/env_use_destdir @@ -43,7 +43,7 @@ if [ -n "${SBINDIR:-}" ] ; then PATH="$DESTDIR$SBINDIR:$PATH" fi -NEW_PYTHONPATH="$DESTDIR$(${PYTHON:-python3} -c "from distutils.sysconfig import *;print(get_python_lib(plat_specific=1, prefix='/usr'))"):$DESTDIR$(${PYTHON:-python3} -c "from distutils.sysconfig import *;print(get_python_lib(prefix='/usr'))")" +NEW_PYTHONPATH="$DESTDIR$(${PYTHON:-python3} -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '/usr', 'base': '/usr'}))"):$DESTDIR$(${PYTHON:-python3} -c "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '/usr', 'base': '/usr'}))")" if [ -n "${PYTHONPATH:-}" ] ; then # Prefix the PYTHONPATH with the new directories export PYTHONPATH="$NEW_PYTHONPATH:$PYTHONPATH" diff --git a/scripts/run-scan-build b/scripts/run-scan-build index 77e02ca9..931ffd2a 100755 --- a/scripts/run-scan-build +++ b/scripts/run-scan-build @@ -21,7 +21,7 @@ fi # Make sure to use the newly-installed libraries when running tests export LD_LIBRARY_PATH="$DESTDIR/usr/lib:$DESTDIR/lib" export PATH="$DESTDIR/usr/sbin:$DESTDIR/usr/bin:$DESTDIR/sbin:$DESTDIR/bin:$PATH" -export PYTHONPATH="$DESTDIR$(${PYTHON:-python3} -c "from distutils.sysconfig import *;print(get_python_lib(prefix='/usr'))")" +export PYTHONPATH="$DESTDIR$(${PYTHON:-python3} -c "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '/usr', 'base': '/usr'}))")" export RUBYLIB="$DESTDIR/$(${RUBY:-ruby} -e 'puts RbConfig::CONFIG["vendorlibdir"]'):$DESTDIR/$(${RUBY:-ruby} -e 'puts RbConfig::CONFIG["vendorarchdir"]')" if [ -f /etc/debian_version ] && [ -z "${IS_CIRCLE_CI:-}" ] ; then From patchwork Fri Oct 28 20:38:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Carter X-Patchwork-Id: 13024284 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A865EC38A02 for ; Fri, 28 Oct 2022 20:39:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229668AbiJ1UjH (ORCPT ); Fri, 28 Oct 2022 16:39:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbiJ1UjG (ORCPT ); Fri, 28 Oct 2022 16:39:06 -0400 Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9767E236423 for ; Fri, 28 Oct 2022 13:39:05 -0700 (PDT) Received: by mail-qt1-x835.google.com with SMTP id f22so4230665qto.3 for ; Fri, 28 Oct 2022 13:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EqoV5l825hG0eWPYvxn+bwKlJaBDNcwDIvXDP9USAMs=; b=nFLOgBEiTS1VolBEmLR6ShTAXZ53ZsBSc3R2RxHDNoNNzgp5X7Ba0l1gbaaRqFSSXq g9I0lSdI1nmqI9UINbWZFGnHnFbbXnHNRVCnGm2XW5iOG/SD9s4nZEWG68/0oSIURzfh lMhZqMJxFAMIPrgbGOyDW0vklp3mz8YIWZ9/rAGyZGzx0u/HEzz0Rwqd9jX8vDr7uKOJ QsM15TTVNfWGef/knKh59Mo6XkdX5cC/hgBOPnVf+Xuyp2EzTtBMIQpIuSEzyGqr7XYl 0BghsW7479C1B3Suf58XN/dmukqscmxTSjvf0KJve/M2oi0mfCI7h4/bMq4X2V2xxqeq NX5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EqoV5l825hG0eWPYvxn+bwKlJaBDNcwDIvXDP9USAMs=; b=E18ywjnR3wYaRnr0GajDMm7Tv6tgNdnURjwSYYakOjk6kNrbAQb6aEXgZN0khmRIjO YpjU57pcOUrRYnFIhsYULAzfU7yRa2MoDjgIi3Mv7NiQtrhYJgODkLZw4xVE6pmCYCJ2 B8oQWdiGcrK6y0jfTV57hRphjie9u+ZqVZpVjy1aZu4rDFUvhAkRYsakIS2MzaoCLm/F uFJ7xw5Aj99MY3sp9l+yLK7J91srptvXRCMg71tyvCHmPYATHy4/G03tt8oAJNnY68mb mq58+UPb4lcp5Wexx4zipST4Mm2LtM123SuA9eRxO4O1UTzzFMCZU3IimOpwnxiPsvoe gOig== X-Gm-Message-State: ACrzQf1JcGYwKmVyxkeW6ENmHUajLSA6GXWYsn76mwpG4adOlzKUnq9O A+gDHm7Q31QyAHwwMYvd6dwPetPOCwc= X-Google-Smtp-Source: AMsMyM7Ae6YqCC8z9L+MSXUXEixgdD13U002RtX55JoBIftwNrtEGHgW/Bcfo+o/X+owuqTBNgHZcA== X-Received: by 2002:ac8:5b05:0:b0:399:9b82:77b4 with SMTP id m5-20020ac85b05000000b003999b8277b4mr1143216qtw.681.1666989544457; Fri, 28 Oct 2022 13:39:04 -0700 (PDT) Received: from electric.. (c-73-200-155-132.hsd1.md.comcast.net. [73.200.155.132]) by smtp.gmail.com with ESMTPSA id v17-20020a05620a0f1100b006ecfb2c86d3sm3606642qkl.130.2022.10.28.13.39.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 13:39:03 -0700 (PDT) From: James Carter To: selinux@vger.kernel.org Cc: James Carter Subject: [PATCH 5/5] README.md: Remove mention of python3-distutils dependency Date: Fri, 28 Oct 2022 16:38:52 -0400 Message-Id: <20221028203852.526472-6-jwcart2@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221028203852.526472-1-jwcart2@gmail.com> References: <20221028203852.526472-1-jwcart2@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org With the removal of any dependence on the python disutils module, Debian no longer depends on the python3-disutils package. Signed-off-by: James Carter --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 74b0a0c3..f91cb7d9 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,6 @@ apt-get install --no-install-recommends --no-install-suggests \ libpcre2-dev \ pkgconf \ python3 \ - python3-distutils \ systemd \ xmlto