From mboxrd@z Thu Jan 1 00:00:00 1970 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 smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 26449C77B61 for ; Tue, 25 Apr 2023 17:16:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id AFB7861467; Tue, 25 Apr 2023 17:16:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org AFB7861467 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8NV6eIIgV7BR; Tue, 25 Apr 2023 17:16:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id B52EE61477; Tue, 25 Apr 2023 17:16:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B52EE61477 Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 3B7691BF82D for ; Tue, 25 Apr 2023 17:15:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id C85AD61458 for ; Tue, 25 Apr 2023 17:15:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C85AD61458 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G9sgOM7JI52M for ; Tue, 25 Apr 2023 17:15:05 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 40AE36145E Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by smtp3.osuosl.org (Postfix) with ESMTPS id 40AE36145E for ; Tue, 25 Apr 2023 17:15:05 +0000 (UTC) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-63b8b19901fso7515544b3a.3 for ; Tue, 25 Apr 2023 10:15:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682442904; x=1685034904; 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=Y0n7STI62O8XI3oymCkuNUBoXUNmzFWEhWp0Fer++t8=; b=hlx6qEIbXOLo9T05nBDRofRIYcyeHFpVp41MDkLJCWYKMsq79htMXCU4Opuy0JdVWZ L9fPuLlzpH+DnEG0Zqx/Zokobz5wKqxo/rJbpWDLoFP3zSVnlvcCfsFHEYt4lLGuNdGO 9fBwvnPRjHfzRndNgbJMwzycxnPYaEvvFbM+NGtHTnApbdnZz81bFEkDF0QKUDiEgru5 ur62AQBbX79LwsnWUWKQ4/cxiU3Ou7uR3H5VXlt01Dj4WoCulLGa7QdSJvUzKO8fxqnR EqE8JGd2VumSZfcmdnP+vV+kkfNrzRpmgu0PC9EefzWopytUh4ZhS9e9bhJ51qyYdt2D 2iTA== X-Gm-Message-State: AAQBX9ecyoFAPC97UyZs9al9UyMVWTqGL4R1YEumiM31psciGLEGn627 0JZrYEJp8WfutMpqrpImJdpHyIbRrxZvDA== X-Google-Smtp-Source: AKy350a/EALnLXHRLp6BAy5olp+bch/XHNw7f8L7fYwbSRIMxDM1oQDd9tSkaPqlZ8Wm7MG+3L3GgQ== X-Received: by 2002:a05:6a00:24c6:b0:5a8:b2bf:26ac with SMTP id d6-20020a056a0024c600b005a8b2bf26acmr25072352pfv.20.1682442904115; Tue, 25 Apr 2023 10:15:04 -0700 (PDT) Received: from fedora.hsd1.wa.comcast.net ([2601:603:2180:ebe0::51c9]) by smtp.gmail.com with ESMTPSA id h11-20020a056a00218b00b0063b8ada8777sm9582454pfi.112.2023.04.25.10.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Apr 2023 10:15:03 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 25 Apr 2023 10:14:46 -0700 Message-Id: <20230425171454.48802-6-aduskett@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230425171454.48802-1-aduskett@gmail.com> References: <20230425171454.48802-1-aduskett@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682442904; x=1685034904; 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=Y0n7STI62O8XI3oymCkuNUBoXUNmzFWEhWp0Fer++t8=; b=p8rrY3fAw86hq7UFTOhl8NQmHB19JFm97pTRLI+mFDCsmjNYhWnZkxwmQ0DF9BW+OA 4xEwK4kvtRrJnBs4JDihYMSEZALhbQ3U8us5KhgVL+uD2HNaGeJ58nr+zHQQDxgBqAaK 1vezcNJJ05+kt9Lo0EGxB/6Y//Jv08CP8OO8WlPwDyn3fDWFkum0qHULTKWJhVNL2ZgO 85VxCoWgSROtxeQuNRlJDKNasldwh6pWOeH/ihRybtz527P7QeKt2pWjshvP+HXRdip2 GzCqXCCGE1vDVgShxIsCQTmROG15+410S2qMRc7t8ADpcAaH8YWAZ0IYfcFEwTeH45ny sEOA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=p8rrY3fA Subject: [Buildroot] [PATCH v2 05/13] package/libselinux: bump to version 3.5 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcus Folkesson , Antoine Tenart , Asaf Kahlon , Thomas Petazzoni , Fabrice Fontaine , Adam Duskett Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" - libselinux now requires pip to install the python tools. - Rebase patches for version 3.5 Signed-off-by: Adam Duskett --- package/libselinux/0001-fix-musl-build.patch | 4 ++-- ...CEXT-and-rely-on-the-installed-file-nam.patch | 8 ++++---- package/libselinux/Config.in | 1 + package/libselinux/libselinux.hash | 2 +- package/libselinux/libselinux.mk | 16 +++++++++++++--- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/package/libselinux/0001-fix-musl-build.patch b/package/libselinux/0001-fix-musl-build.patch index 44189e6400..b8b16be26f 100644 --- a/package/libselinux/0001-fix-musl-build.patch +++ b/package/libselinux/0001-fix-musl-build.patch @@ -12,13 +12,13 @@ Domain, and we want to avoid license propagation, so this macro is completely written from scratch, and non-optimal. Signed-off-by: "Yann E. MORIN" -[Updated for 3.0] +[Updated for 3.5] Signed-off-by: Adam Duskett diff --git a/src/booleans.c b/src/booleans.c index ffa8d26..8569002 100644 --- a/src/booleans.c +++ b/src/booleans.c -@@ -65,6 +65,14 @@ int security_get_boolean_names(char ***names, int *len) +@@ -64,6 +64,14 @@ int security_get_boolean_names(char ***names, int *len) goto bad; } diff --git a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch index 18c79b3b4d..c744ca4069 100644 --- a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch @@ -18,7 +18,7 @@ was installed. Signed-off-by: Antoine Tenart [Refreshed for 3.1] Signed-off-by: Thomas Petazzoni -[Refreshed for 3.0] +[Refreshed for 3.5] Signed-off-by: Adam Duskett --- src/Makefile | 3 +-- @@ -31,14 +31,14 @@ index 190016e2af34..7ee22fd35da3 100644 @@ -15,7 +15,6 @@ 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"]') RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') -@@ -184,7 +183,7 @@ install: all +@@ -189,7 +188,7 @@ install: all install-pywrap: pywrap - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) + $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py - ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) + ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/ diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in index 3098fe3ea4..bc40e32a46 100644 --- a/package/libselinux/Config.in +++ b/package/libselinux/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_PYTHON_SETUPTOOLS if BR2_PACKAGE_PYTHON3 help libselinux is the runtime SELinux library that provides interfaces (e.g. library functions for the SELinux kernel diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index a2e0083f7b..14bc627a80 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057 libselinux-3.3.tar.gz +sha256 9a3a3705ac13a2ccca2de6d652b6356fead10f36fb33115c185c5ccdf29eec19 libselinux-3.5.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index db35da130f..b8de21edaa 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.3 +LIBSELINUX_VERSION = 3.5 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE @@ -31,7 +31,11 @@ LIBSELINUX_MAKE_OPTS += FTS_LDLIBS=-lfts endif ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIBSELINUX_DEPENDENCIES += python3 host-swig +LIBSELINUX_DEPENDENCIES += \ + python3 \ + python-setuptools \ + host-python-pip \ + host-swig LIBSELINUX_MAKE_OPTS += \ $(PKG_PYTHON_DISTUTILS_ENV) \ @@ -77,7 +81,13 @@ define LIBSELINUX_INSTALL_TARGET_CMDS endef HOST_LIBSELINUX_DEPENDENCIES = \ - host-pkgconf host-libsepol host-pcre2 host-swig host-python3 + host-pkgconf \ + host-libsepol \ + host-pcre2 \ + host-swig \ + host-python3 \ + host-python-pip \ + host-python-setuptools HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ -- 2.40.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot