[ptxdist] [PATCH v1 05/17] libsepol: version bump 2.1.8 -> 3.11

[Ladislav Michl]

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

Signed-off-by: Ladislav Michl <la...@triops.cz>
---
 rules/host-libsepol.in   |  1 +
 rules/host-libsepol.make | 11 +++++++----
 rules/libsepol.in        |  1 +
 rules/libsepol.make      | 19 ++++++++++++-------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/rules/host-libsepol.in b/rules/host-libsepol.in
index fd5c71bdf..042b9a408 100644
--- a/rules/host-libsepol.in
+++ b/rules/host-libsepol.in
@@ -2,4 +2,5 @@
 
 config HOST_LIBSEPOL
        tristate
+       select HOST_FLEX
        default y if ALLYES
diff --git a/rules/host-libsepol.make b/rules/host-libsepol.make
index b20b2e113..98e136e66 100644
--- a/rules/host-libsepol.make
+++ b/rules/host-libsepol.make
@@ -15,10 +15,13 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBSEPOL) += host-libsepol
 # Prepare
 # ----------------------------------------------------------------------------
 
-HOST_LIBSEPOL_CONF_TOOL := NO
-HOST_LIBSEPOL_MAKE_ENV := \
-       $(HOST_ENV) \
-       SHLIBDIR=$(HOST_LIBSEPOL_PKGDIR)/usr/lib \
+HOST_LIBSEPOL_CONF_TOOL        := NO
+HOST_LIBSEPOL_MAKE_ENV := $(HOST_ENV)
+HOST_LIBSEPOL_MAKE_OPT := \
+       SHLIBDIR=/usr/lib \
        CFLAGS="-O2 -Wall -g"
+HOST_LIBSEPOL_INSTALL_OPT := \
+       $(HOST_LIBSEPOL_MAKE_OPT) \
+       install
 
 # vim: syntax=make
diff --git a/rules/libsepol.in b/rules/libsepol.in
index 4ac087610..08e0aba60 100644
--- a/rules/libsepol.in
+++ b/rules/libsepol.in
@@ -3,6 +3,7 @@
 config LIBSEPOL
        tristate
        prompt "libsepol"
+       select HOST_FLEX
        help
          libsepol provides an API for the manipulation of SELinux binary 
policies.
          It is used by checkpolicy (the policy compiler) and similar tools, as 
well
diff --git a/rules/libsepol.make b/rules/libsepol.make
index cf5f4ef4d..6e63b6b1a 100644
--- a/rules/libsepol.make
+++ b/rules/libsepol.make
@@ -14,24 +14,29 @@ PACKAGES-$(PTXCONF_LIBSEPOL) += libsepol
 #
 # Paths and names
 #
-LIBSEPOL_VERSION       := 2.1.8
-LIBSEPOL_MD5           := 56fa100ed85d7f06bd92f2892d92b3b0
+LIBSEPOL_VERSION       := $(SELINUX_VERSION)
+LIBSEPOL_SHA256                := 
79f3d2c88f44b7eb5cf54d9792e03232297e17f97a179163f2750099a00f164d
 LIBSEPOL               := libsepol-$(LIBSEPOL_VERSION)
 LIBSEPOL_SUFFIX                := tar.gz
-LIBSEPOL_URL           := 
https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(LIBSEPOL).$(LIBSEPOL_SUFFIX)
+LIBSEPOL_URL           := $(SELINUX_URL)/$(LIBSEPOL).$(LIBSEPOL_SUFFIX)
 LIBSEPOL_SOURCE                := $(SRCDIR)/$(LIBSEPOL).$(LIBSEPOL_SUFFIX)
 LIBSEPOL_DIR           := $(BUILDDIR)/$(LIBSEPOL)
 LIBSEPOL_LICENSE       := LGPL-2.1-or-later
+LIBSEPOL_LICENSE_FILES := file://LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343
+LIBSEPOL_CVE_PRODUCT   := selinuxproject:libsepol
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-LIBSEPOL_CONF_TOOL := NO
-LIBSEPOL_MAKE_ENV := \
-       $(CROSS_ENV) \
-       SHLIBDIR=$(LIBSEPOL_PKGDIR)/usr/lib \
+LIBSEPOL_CONF_TOOL     := NO
+LIBSEPOL_MAKE_ENV      := $(CROSS_ENV)
+LIBSEPOL_MAKE_OPT      := \
+       SHLIBDIR=/usr/lib \
        CFLAGS="-O2 -Wall -g"
+LIBSEPOL_INSTALL_OPT   := \
+       $(LIBSEPOL_MAKE_OPT) \
+       install
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.47.3