Thanks, applied as 9fe5462616de2ce93663f409f471ea83a6d5fbb5. Michael
[sent from post-receive hook] On Tue, 07 Jul 2020 07:45:55 +0200, Roland Hieber <[email protected]> wrote: > Signed-off-by: Roland Hieber <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in > index 856b50046d5b..fce42b002821 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 > @@ -29,7 +28,8 @@ menuconfig POLICYCOREUTILS > if POLICYCOREUTILS > > menuconfig POLICYCOREUTILS_PYTHON > - depends on STAGING > + # needs sepolgen > + depends on BROKEN > bool "python based tools" > > if POLICYCOREUTILS_PYTHON > 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 <[email protected]> > -# > -# 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 > <[email protected]>") > - @$(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 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
