[ptxdist] [PATCH v1 10/17] libsemanage: version bump 2.1.9 -> 3.11

[Ladislav Michl]

From: Ladislav Michl <la...@triops.cz>

Signed-off-by: Ladislav Michl <la...@triops.cz>
---
 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..e11efaaed 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 PYTHON3          if LIBSEMANAGE_PYTHON
        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
 
 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