diff options
Diffstat (limited to 'dev-python/sepolgen')
| -rw-r--r-- | dev-python/sepolgen/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild | 19 | ||||
| -rw-r--r-- | dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild | 22 | ||||
| -rw-r--r-- | dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild | 20 | ||||
| -rw-r--r-- | dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild | 20 |
5 files changed, 67 insertions, 21 deletions
diff --git a/dev-python/sepolgen/ChangeLog b/dev-python/sepolgen/ChangeLog index b35c808714c8..1da7b276c11c 100644 --- a/dev-python/sepolgen/ChangeLog +++ b/dev-python/sepolgen/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/sepolgen # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.36 2013/09/25 18:36:00 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/ChangeLog,v 1.37 2013/09/30 18:38:10 swift Exp $ + + 30 Sep 2013; Sven Vermeulen <swift@gentoo.org> sepolgen-1.1.9-r1.ebuild, + sepolgen-1.1.9-r2.ebuild, sepolgen-1.1.9-r3.ebuild, sepolgen-1.1.9-r4.ebuild: + Drop selinux-base dependency again, creates circular dep :-( Instead check if + file exists and, if not, fall back to POLICY_TYPES content 25 Sep 2013; Sven Vermeulen <swift@gentoo.org> sepolgen-1.1.9-r2.ebuild, sepolgen-1.1.9-r3.ebuild, sepolgen-1.1.9-r4.ebuild: diff --git a/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild b/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild index 5208271741b4..272f70fb3bcd 100644 --- a/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild +++ b/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild,v 1.2 2013/05/18 18:03:42 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r1.ebuild,v 1.3 2013/09/30 18:38:10 swift Exp $ EAPI="3" PYTHON_DEPEND="*" @@ -56,9 +56,20 @@ src_install() { python_execute_function installation # Create sepolgen.conf with different devel location definition - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + if [[ -f /etc/selinux/config ]]; + then + local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + else + local selinuxtype="${POLICY_TYPES%% *}"; + if [[ -n "${selinuxtype}" ]]; + then + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + else + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include" > "${D}"/etc/selinux/sepolgen.conf; + fi + fi } pkg_postinst() { diff --git a/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild b/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild index 1b234d9e5e46..839acf50607a 100644 --- a/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild +++ b/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild,v 1.3 2013/09/25 18:36:00 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild,v 1.4 2013/09/30 18:38:10 swift Exp $ EAPI="3" PYTHON_DEPEND="*" @@ -20,8 +20,7 @@ KEYWORDS="amd64 x86" IUSE="" DEPEND=">=sys-libs/libselinux-2.0[python] - app-admin/setools[python] - sec-policy/selinux-base" + app-admin/setools[python]" RDEPEND="${DEPEND}" src_prepare() { @@ -59,9 +58,20 @@ src_install() { python_execute_function installation # Create sepolgen.conf with different devel location definition - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + if [[ -f /etc/selinux/config ]]; + then + local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + else + local selinuxtype="${POLICY_TYPES%% *}"; + if [[ -n "${selinuxtype}" ]]; + then + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + else + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include" > "${D}"/etc/selinux/sepolgen.conf; + fi + fi } pkg_postinst() { diff --git a/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild b/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild index d8979ed47dba..d1f316c273d3 100644 --- a/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild +++ b/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild,v 1.2 2013/09/25 18:36:00 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild,v 1.3 2013/09/30 18:38:10 swift Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 ) @@ -19,7 +19,6 @@ IUSE="" DEPEND=">=sys-libs/libselinux-2.0[python] app-admin/setools[python] - sec-policy/selinux-base ${PYTHON_DEPS}" RDEPEND="${DEPEND}" @@ -57,7 +56,18 @@ src_install() { python_foreach_impl installation # Create sepolgen.conf with different devel location definition - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + if [[ -f /etc/selinux/config ]]; + then + local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + else + local selinuxtype="${POLICY_TYPES%% *}"; + if [[ -n "${selinuxtype}" ]]; + then + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + else + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include" > "${D}"/etc/selinux/sepolgen.conf; + fi + fi } diff --git a/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild b/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild index 6101bb096b83..d865327911c2 100644 --- a/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild +++ b/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild,v 1.2 2013/09/25 18:36:00 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r4.ebuild,v 1.3 2013/09/30 18:38:10 swift Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 ) @@ -19,7 +19,6 @@ IUSE="" DEPEND=">=sys-libs/libselinux-2.0[python] app-admin/setools[python] - sec-policy/selinux-base ${PYTHON_DEPS}" RDEPEND="${DEPEND}" @@ -57,7 +56,18 @@ src_install() { python_foreach_impl installation # Create sepolgen.conf with different devel location definition - local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; - echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; + if [[ -f /etc/selinux/config ]]; + then + local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + else + local selinuxtype="${POLICY_TYPES%% *}"; + if [[ -n "${selinuxtype}" ]]; + then + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include" > "${D}"/etc/selinux/sepolgen.conf; + else + echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include" > "${D}"/etc/selinux/sepolgen.conf; + fi + fi } |