Re: [ptxdist] [PATCH 4/5] sepolgen: remove after one year in staging

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Mon, Jun 22, 2020 at 12:29:52AM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  rules/policycoreutils.in | 34 -------------------------
>  rules/sepolgen.in        | 29 ---------------------
>  rules/sepolgen.make      | 54 ----------------------------------------
>  3 files changed, 117 deletions(-)
>  delete mode 100644 rules/sepolgen.in
>  delete mode 100644 rules/sepolgen.make
> 
> diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in
> index 856b50046d5b..27347b9f0188 100644
> --- a/rules/policycoreutils.in
> +++ b/rules/policycoreutils.in
> @@ -11,7 +11,6 @@ menuconfig POLICYCOREUTILS
>  	select LIBSEMANAGE
>  	select LIBSEPOL
>  	select DBUS_GLIB	if POLICYCOREUTILS_RESTORECOND
> -	select SEPOLGEN		if POLICYCOREUTILS_PYTHON
>  	select BUSYBOX_FEATURE_FIND_DEPTH	if BUSYBOX_FIND
>  	select BUSYBOX_FEATURE_FIND_DELETE	if BUSYBOX_FIND
>  	select BUSYBOX_SELINUX			if BUSYBOX_FIND
> @@ -28,39 +27,6 @@ menuconfig POLICYCOREUTILS
>  
>  if POLICYCOREUTILS
>  
> -menuconfig POLICYCOREUTILS_PYTHON
> -	depends on STAGING

Keep the options and replace STAGING with BROKEN and add a comment what's
missing. The options are still referenced in the policycoreutils.make.

Michael

> -	bool "python based tools"
> -
> -if POLICYCOREUTILS_PYTHON
> -
> -config POLICYCOREUTILS_AUDIT2ALLOW
> -	bool "audit2allow"
> -
> -config POLICYCOREUTILS_SEPOLGEN_IFGEN
> -	select POLICYCOREUTILS_AUDIT2ALLOW
> -	bool "sepolgen-ifgen"
> -
> -config POLICYCOREUTILS_AUDIT2WHY
> -	select POLICYCOREUTILS_AUDIT2ALLOW
> -	bool "audit2why"
> -
> -config POLICYCOREUTILS_SANDBOX
> -	bool "sandbox"
> -	depends on BROKEN
> -
> -config POLICYCOREUTILS_CHCAT
> -	select LIBSEMANAGE_PYTHON
> -	depends on BROKEN
> -	bool "chcat"
> -
> -config POLICYCOREUTILS_SEMANAGE
> -	select LIBSEMANAGE_PYTHON
> -	depends on BROKEN
> -	bool "semanage"
> -
> -endif
> -
>  config POLICYCOREUTILS_LOAD_POLICY
>  	bool "load_policy"
>  
> diff --git a/rules/sepolgen.in b/rules/sepolgen.in
> deleted file mode 100644
> index 94f2ce071ab8..000000000000
> --- a/rules/sepolgen.in
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=selinux
> -
> -config SEPOLGEN
> -	tristate
> -	prompt "sepolgen"
> -	select PYTHON
> -	select LIBSELINUX
> -	select LIBSELINUX_PYTHON
> -	help
> -	  A Python module used in SELinux policy generation
> -
> -	  This package contains a Python module that forms the core of
> -	  the modern audit2allow (which is a part of the package
> -	  policycoreutils). The sepolgen library is structured to give
> -	  flexibility to the application using it. The library
> -	  contains: Reference Policy Representation, which are Objects
> -	  for representing policies and the reference policy
> -	  interfaces. Secondly, it has objects and algorithms for
> -	  representing access and sets of access in an abstract way
> -	  and searching that access. It also has a parser for
> -	  reference policy "headers". It contains infrastructure for
> -	  parsing SELinux related messages as produced by the audit
> -	  system. It has facilities for generating policy based on
> -	  required access.
> -
> -	  STAGING: remove in ptxdist-2020.06.0
> -	  Old version that needs to be updated.
> diff --git a/rules/sepolgen.make b/rules/sepolgen.make
> deleted file mode 100644
> index 7084e1d1d348..000000000000
> --- a/rules/sepolgen.make
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen
> -
> -#
> -# Paths and names
> -#
> -SEPOLGEN_VERSION	:= 1.1.8
> -SEPOLGEN_MD5		:= d734ff236639cc1bd3a33901774fa98d
> -SEPOLGEN		:= sepolgen-$(SEPOLGEN_VERSION)
> -SEPOLGEN_SUFFIX		:= tar.gz
> -SEPOLGEN_URL		:= https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
> -SEPOLGEN_SOURCE		:= $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX)
> -SEPOLGEN_DIR		:= $(BUILDDIR)/$(SEPOLGEN)
> -SEPOLGEN_LICENSE	:= GPL-2.0-only
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -SEPOLGEN_CONF_TOOL := NO
> -# no ':=' because of $(PYTHON_SITEPACKAGES)
> -SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/sepolgen.targetinstall:
> -	@$(call targetinfo)
> -
> -	@$(call install_init, sepolgen)
> -	@$(call install_fixup, sepolgen,PRIORITY,optional)
> -	@$(call install_fixup, sepolgen,SECTION,base)
> -	@$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
> -	@$(call install_fixup, sepolgen,DESCRIPTION,missing)
> -
> -	@$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES))
> -	@$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map)
> -
> -	@$(call install_finish, sepolgen)
> -
> -	@$(call touch)
> -
> -# vim: syntax=make
> -- 
> 2.27.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de