From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sat, 31 Oct 2026 21:38:59 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xNFqt-005gQi-1i for lore@lore.pengutronix.de; Sat, 31 Oct 2026 21:38:59 +0100 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xNFqr-00038J-89; Sat, 31 Oct 2026 21:38:57 +0100 Received: from mx1.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::107]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xNFqO-0001wg-6d for ptxdist@pengutronix.de; Sat, 31 Oct 2026 21:38:28 +0100 Received: from h4.cmg2.smtp.forpsi.com (h4.cmg2.smtp.forpsi.com [185.129.138.189]) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPS id 0561C202882 for ; Sat, 31 Oct 2026 21:38:27 +0100 (CET) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=pengutronix.de; s=20260414; t=1793479108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=axxZxh9tB4mo3INBQ6Pt9EswSqt82v9hL4z8bw8wWD0=; b=c2ZoT3QOZpOQGAN395akbHQDyfVPldBDDDKAVh3hE2ntCfyL3KPw9GnwqGvc1l3obfL0P+ 9+3YamROr0K5B6J7TLHPbMDL4mDtRc7So2nAJ/utLUC0StQTdRqCLbopxuRuLx/VXo29PD Zdbbi1UAnSla1lylh7E4wO+KvL9PjDrBtuCgc9GVd2bYMxbIMsEJbn4sgJYK89zfequ/ex OpKCgTWJXbMGFd4D4Q0J07fRSVJhkzDaGdfUYMm0gNqI6srBhsQZDEXTGOrYclmLCenulx RLXPNI0SOC1Svm4eDNwzO8rG3NGGJLcIRYyC8N61H+Xh6z2hHvbrX07walNRjQ== ARC-Authentication-Results: i=1; mx1.white.stw.pengutronix.de; dkim=pass header.d=triops.cz header.s=f2019 header.b=IzJYy5L+; spf=none (mx1.white.stw.pengutronix.de: domain of oss-lists@triops.cz has no SPF policy when checking 185.129.138.189) smtp.mailfrom=oss-lists@triops.cz; dmarc=none ARC-Seal: i=1; s=20260414; d=pengutronix.de; t=1793479108; a=rsa-sha256; cv=none; b=HXjaCjNdeA5AXhYyzcq5HyaVKhF/+r4TQXuwkqgIT0ZsBoKsvp6cBiuCBL7SBEhfnQrsMp dluw48HfRZ8d/uRJPT8P6T+2Oe+dQEbU6NZIonEcHMIl95StGG/LyUiVokG2BKXgvJ8gtX qfRUo78nz+4oDp/xGFHNvkony/a8yePiD3U/7eiViFOvqyU2Ub1+F66qLe3VQaoY+fwVm2 8oF2Bka8DBNLhAUSHoPUKNi3TAulsKRmX+3gcUFkQEVXVUrCeztOMLT2qElhab7oKTQUfY C9C3tVB3DWW5fteVjppjRrtQXPB49AbkX5gcYC5iQgNhA8lVv0JlHbe+hijakQ== Received: from localhost.localdomain ([91.218.190.200]) by cmgsmtp with ESMTPSA id NFqKxUpN38HlqNFqNxK73i; Sat, 31 Oct 2026 21:38:27 +0100 From: Ladislav Michl To: ptxdist@pengutronix.de Date: Sat, 31 Oct 2026 21:38:11 +0100 Message-ID: <20261031203823.357406-11-oss-lists@triops.cz> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261031203823.357406-1-oss-lists@triops.cz> References: <20261031203823.357406-1-oss-lists@triops.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4xfOUL+NQ2rVoubYeLoGE32BRgRKNm0ZyaYYZiOYd7Z1ds3Fx2+kxuLOXnJIH5hCJxnQICL7unBaq45f0sV82UWStZHYPZarUjfV30Q9wXJFJnZBIFEiP4 zH9H1rcJGWTWwKUnBEnLEIiZU06F56zVUdum5zsiN8uxJf5sP6KUoGd4I9u8fLY0kGxDwpkBCZ9HIh2DUAomxzXUdh9RkKu0EwY= X-Spamd-Result: default: False [-1.60 / 15.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; ONCE_RECEIVED(0.20)[]; R_DKIM_ALLOW(-0.20)[triops.cz:s=f2019]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; RCVD_TLS_ALL(0.00)[]; ASN(0.00)[asn:24806, ipnet:185.129.136.0/22, country:CZ]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_ONE(0.00)[1]; ARC_SIGNED(0.00)[pengutronix.de:s=20260414:i=1]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DMARC_NA(0.00)[triops.cz]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM(0.00)[0.540]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_NONE(0.00)[]; R_SPF_NA(0.00)[no SPF record]; DKIM_TRACE(0.00)[triops.cz:+] X-Rspamd-Action: no action X-Rspamd-Server: mx1 X-Stat-Signature: toyzs9bcttyarz1xt1mx75danhqrhqas X-Rspamd-Queue-Id: 0561C202882 Subject: [ptxdist] [PATCH v2 10/17] libsemanage: version bump 2.1.9 -> 3.11 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false From: Ladislav Michl Signed-off-by: Ladislav Michl --- CHANGES: - v2: make python wrapper depend on PYTHON3 instead of selecting it. rules/libsemanage.in | 13 ++++------- rules/libsemanage.make | 49 ++++++++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/rules/libsemanage.in b/rules/libsemanage.in index 9d7ebf03d..aaf46c4a9 100644 --- a/rules/libsemanage.in +++ b/rules/libsemanage.in @@ -1,29 +1,24 @@ -## SECTION=staging -## old section: -### SECTION=selinux +## SECTION=selinux menuconfig LIBSEMANAGE tristate prompt "libsemanage " + select AUDIT select BZIP2 select BZIP2_LIBBZ2 select LIBSEPOL select LIBSELINUX - select USTR - select PYTHON if LIBSEMANAGE_PYTHON + select HOST_FLEX select HOST_SWIG if LIBSEMANAGE_PYTHON help This package provides the shared libraries for SELinux policy management. It uses libsepol for binary policy manipulation and libselinux for interacting with the SELinux system. - STAGING: remove in ptxdist-2020.12.0 - Old version that need to be updated. Moved to staging with libselinux. - if LIBSEMANAGE config LIBSEMANAGE_PYTHON bool "python wrapper" - depends on STAGING + depends on PYTHON3 endif diff --git a/rules/libsemanage.make b/rules/libsemanage.make index 9e8a641e9..c9972c474 100644 --- a/rules/libsemanage.make +++ b/rules/libsemanage.make @@ -14,36 +14,57 @@ PACKAGES-$(PTXCONF_LIBSEMANAGE) += libsemanage # # Paths and names # -LIBSEMANAGE_VERSION := 2.1.9 -LIBSEMANAGE_MD5 := 209e11da5b36c595a796751583f016f8 +LIBSEMANAGE_VERSION := $(SELINUX_VERSION) +LIBSEMANAGE_SHA256 := e76160286bbfb0821602c6c0c3220ebcf366ad3246d3b9d0a0fbefcd35e86043 LIBSEMANAGE := libsemanage-$(LIBSEMANAGE_VERSION) LIBSEMANAGE_SUFFIX := tar.gz -LIBSEMANAGE_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(LIBSEMANAGE).$(LIBSEMANAGE_SUFFIX) +LIBSEMANAGE_URL := $(SELINUX_URL)/$(LIBSEMANAGE).$(LIBSEMANAGE_SUFFIX) LIBSEMANAGE_SOURCE := $(SRCDIR)/$(LIBSEMANAGE).$(LIBSEMANAGE_SUFFIX) LIBSEMANAGE_DIR := $(BUILDDIR)/$(LIBSEMANAGE) LIBSEMANAGE_LICENSE := LGPL-2.1-or-later +LIBSEMANAGE_LICENSE_FILES := file://LICENSE;md5=03068f550c635f6520e0f0252da412fc +LIBSEMANAGE_CVE_PRODUCT := selinuxproject:libsemanage # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -LIBSEMANAGE_CONF_TOOL := NO -# no := due to CROSS_PYTHON -LIBSEMANAGE_MAKE_ENV = \ - $(CROSS_ENV) \ - CFLAGS="-O2 -Wall -g" \ - PYTHON=$(CROSS_PYTHON) +LIBSEMANAGE_CONF_TOOL := NO +LIBSEMANAGE_MAKE_ENV := $(CROSS_ENV) +LIBSEMANAGE_MAKE_OPT = \ + PREFIX=/usr \ + LIBDIR=/usr/lib \ + INCLUDEDIR=/usr/include \ + SYSCONFDIR=/etc \ + DISABLE_SHARED=n \ + CFLAGS="-O2 -Wall -g" -LIBSEMANAGE_MAKE_OPT := \ - LIBDIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib -LIBSEMANAGE_INSTALL_OPT := \ +ifdef PTXCONF_LIBSEMANAGE_PYTHON +LIBSEMANAGE_MAKE_OPT += \ + PYTHON=$(CROSS_PYTHON3) \ + PYTHONLIBDIR=$(PYTHON3_SITEPACKAGES) +endif + +LIBSEMANAGE_INSTALL_OPT = \ + $(LIBSEMANAGE_MAKE_OPT) \ install ifdef PTXCONF_LIBSEMANAGE_PYTHON -LIBSEMANAGE_MAKE_OPT += pywrap LIBSEMANAGE_INSTALL_OPT += install-pywrap endif +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +$(STATEDIR)/libsemanage.compile: + @$(call targetinfo) + @$(call world/compile, LIBSEMANAGE) +ifdef PTXCONF_LIBSEMANAGE_PYTHON + @$(call compile, LIBSEMANAGE, $(LIBSEMANAGE_MAKE_OPT) pywrap) +endif + @$(call touch) + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -61,7 +82,7 @@ $(STATEDIR)/libsemanage.targetinstall: @$(call install_alternative, libsemanage, 0, 0, 0644, /etc/selinux/semanage.conf) ifdef PTXCONF_LIBSEMANAGE_PYTHON - @$(call install_tree, libsemanage, 0, 0, -, $(PYTHON_SITEPACKAGES)) + @$(call install_tree, libsemanage, 0, 0, -, $(PYTHON3_SITEPACKAGES)) endif @$(call install_finish, libsemanage) -- 2.47.3