[ptxdist] [PATCH v2 12/17] checkpolicy: version bump 2.1.11 -> 3.11

[Ladislav Michl <oss-lists@triops.cz>]

From: Ladislav Michl <ladis@triops.cz>

Signed-off-by: Ladislav Michl <ladis@triops.cz>
---
 CHANGES:
 - v2: None

 rules/checkpolicy.in   | 15 ++-------------
 rules/checkpolicy.make | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/rules/checkpolicy.in b/rules/checkpolicy.in
index b1e8bca01..6b51dd6be 100644
--- a/rules/checkpolicy.in
+++ b/rules/checkpolicy.in
@@ -1,18 +1,10 @@
-## SECTION=staging
-## old section:
-### SECTION=selinux
+## SECTION=selinux
 
 config CHECKPOLICY
 	tristate
 	prompt "checkpolicy"
-	#
-	# The target package is not functional yet, but we need the host
-	# package. Depend on broken for now.
-	#
-	depends on BROKEN
-	select LIBSELINUX
 	select LIBSEPOL
-	select FLEX
+	select HOST_FLEX
 	help
 	  Security-enhanced Linux is a patch of the Linux kernel and a
 	  number of utilities with enhanced security functionality
@@ -31,6 +23,3 @@ config CHECKPOLICY
 	  the static libsepol since it deals with low level details of
 	  the policy that have not been encapsulated/abstracted by a
 	  proper shared library interface.
-
-	  STAGING: remove in ptxdist-2020.12.0
-	  Old version that need to be updated. Moved to staging with libselinux.
diff --git a/rules/checkpolicy.make b/rules/checkpolicy.make
index 6946fcecd..1cbf427d7 100644
--- a/rules/checkpolicy.make
+++ b/rules/checkpolicy.make
@@ -14,27 +14,26 @@ PACKAGES-$(PTXCONF_CHECKPOLICY) += checkpolicy
 #
 # Paths and names
 #
-CHECKPOLICY_VERSION	:= 2.1.11
-CHECKPOLICY_MD5		:= 046b590de004f8a6cee655c4e95a7970
+CHECKPOLICY_VERSION	:= $(SELINUX_VERSION)
+CHECKPOLICY_SHA256	:= 9b81bfceef7fa9d02f9872e56a786f343dc58ef4b5713dce0d5c416e5b84cefa
 CHECKPOLICY		:= checkpolicy-$(CHECKPOLICY_VERSION)
 CHECKPOLICY_SUFFIX	:= tar.gz
-CHECKPOLICY_URL		:= https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(CHECKPOLICY).$(CHECKPOLICY_SUFFIX)
+CHECKPOLICY_URL		:= $(SELINUX_URL)/$(CHECKPOLICY).$(CHECKPOLICY_SUFFIX)
 CHECKPOLICY_SOURCE	:= $(SRCDIR)/$(CHECKPOLICY).$(CHECKPOLICY_SUFFIX)
 CHECKPOLICY_DIR		:= $(BUILDDIR)/$(CHECKPOLICY)
-CHECKPOLICY_LICENSE	:= unknown
+CHECKPOLICY_LICENSE	:= GPL-2.0-only AND LGPL-2.1-or-later
+CHECKPOLICY_LICENSE_FILES	:= file://LICENSE;md5=393a5ca445f6965873eca0259a17f833
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-#
-# autoconf
-#
-CHECKPOLICY_CONF_TOOL := NO
-CHECKPOLICY_MAKE_ENV := $(CROSS_ENV)
-CHECKPOLICY_MAKE_OPT := LIBDIR=$(PTXDIST_SYSROOT_TARGET)/usr/lib
-CHECKPOLICY_INSTALL_OPT = \
-	PREFIX=$(CHECKPOLICY_PKGDIR) \
+CHECKPOLICY_CONF_TOOL	:= NO
+CHECKPOLICY_MAKE_ENV	:= $(CROSS_ENV)
+CHECKPOLICY_MAKE_OPT	:= \
+	CFLAGS="-O2 -Wall -g"
+CHECKPOLICY_INSTALL_OPT	:= \
+	$(CHECKPOLICY_MAKE_OPT) \
 	install
 
 # ----------------------------------------------------------------------------
@@ -50,7 +49,8 @@ $(STATEDIR)/checkpolicy.targetinstall:
 	@$(call install_fixup, checkpolicy,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, checkpolicy,DESCRIPTION,missing)
 
-	@$(call install_copy, checkpolicy, 0, 0, 0755, $(CHECKPOLICY_DIR)/foobar, /dev/null)
+	@$(call install_copy, checkpolicy, 0, 0, 0755, -, /usr/bin/checkpolicy)
+	@$(call install_copy, checkpolicy, 0, 0, 0755, -, /usr/bin/checkmodule)
 
 	@$(call install_finish, checkpolicy)
 
-- 
2.47.3