perfinion 14/12/06 23:28:23
Modified: policycoreutils-2.4_rc6-r1.ebuild ChangeLog
Added: policycoreutils-2.3-r3.ebuild
policycoreutils-2.4_rc7.ebuild
Removed: policycoreutils-2.4_rc6.ebuild
policycoreutils-2.4_rc2.ebuild
policycoreutils-2.4_rc5.ebuild
Log:
version bump and ebuild clean up, drop old RC
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0x7EF137EC935B0EAF)
Revision Changes Path
1.2 sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild?r1=1.1&r2=1.2
Index: policycoreutils-2.4_rc6-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policycoreutils-2.4_rc6-r1.ebuild 22 Nov 2014 12:59:49 -0000 1.1
+++ policycoreutils-2.4_rc6-r1.ebuild 6 Dec 2014 23:28:23 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild,v
1.1 2014/11/22 12:59:49 perfinion Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild,v
1.2 2014/12/06 23:28:23 perfinion Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
@@ -85,14 +85,14 @@
}
src_compile() {
- local use_audit="n";
- local use_pam="n";
- local use_dbus="n";
- local use_sesandbox="n";
-
- use audit && use_audit="y";
- use pam && use_pam="y";
- use dbus && use_dbus="y";
+ local use_audit="no";
+ local use_pam="no";
+ local use_dbus="no";
+ local use_sesandbox="no";
+
+ use audit && use_audit="yes";
+ use pam && use_pam="yes";
+ use dbus && use_dbus="yes";
building() {
emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y"
AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}"
SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
@@ -104,14 +104,14 @@
}
src_install() {
- local use_audit="n";
- local use_pam="n";
- local use_dbus="n";
- local use_sesandbox="n";
-
- use audit && use_audit="y";
- use pam && use_pam="y";
- use dbus && use_dbus="y";
+ local use_audit="no";
+ local use_pam="no";
+ local use_dbus="no";
+ local use_sesandbox="no";
+
+ use audit && use_audit="yes";
+ use pam && use_pam="yes";
+ use dbus && use_dbus="yes";
# Python scripts are present in many places. There are no extension
modules.
installation-policycoreutils() {
1.147 sys-apps/policycoreutils/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/ChangeLog?rev=1.147&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/ChangeLog?rev=1.147&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/ChangeLog?r1=1.146&r2=1.147
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- ChangeLog 22 Nov 2014 12:59:49 -0000 1.146
+++ ChangeLog 6 Dec 2014 23:28:23 -0000 1.147
@@ -1,6 +1,18 @@
# ChangeLog for sys-apps/policycoreutils
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.146
2014/11/22 12:59:49 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.147
2014/12/06 23:28:23 perfinion Exp $
+
+*policycoreutils-2.4_rc7 (06 Dec 2014)
+*policycoreutils-2.3-r3 (06 Dec 2014)
+
+ 06 Dec 2014; Jason Zaman <[email protected]>
+ +policycoreutils-2.3-r3.ebuild, +policycoreutils-2.4_rc7.ebuild,
+ -policycoreutils-2.4_rc2.ebuild, -policycoreutils-2.4_rc5.ebuild,
+ -policycoreutils-2.4_rc6.ebuild,
+ files/0020-disable-autodetection-of-pam-and-audit.patch,
+ files/0030-make-inotify-check-use-flag-triggered.patch,
+ policycoreutils-2.4_rc6-r1.ebuild:
+ version bump and ebuild clean up, drop old RC
*policycoreutils-2.4_rc6-r1 (22 Nov 2014)
1.1 sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild?rev=1.1&content-type=text/plain
Index: policycoreutils-2.3-r3.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild,v
1.1 2014/12/06 23:28:23 perfinion Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="xml"
inherit multilib python-r1 toolchain-funcs eutils
MY_P="${P//_/-}"
EXTRAS_VER="1.33"
SEMNG_VER="2.3"
SELNX_VER="2.3"
SEPOL_VER="2.3"
PATCHBUNDLE="3"
IUSE="audit pam dbus"
DESCRIPTION="SELinux core utilities"
HOMEPAGE="http://userspace.selinuxproject.org";
SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz
http://dev.gentoo.org/~swift/patches/policycoreutils/patchbundle-${PN}-${PATCHBUNDLE}.tar.gz
mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
>=sys-libs/glibc-2.4
>=sys-libs/libcap-1.10-r10
>=sys-libs/libsemanage-${SEMNG_VER}[python]
sys-libs/libcap-ng
>=sys-libs/libsepol-${SEPOL_VER}
sys-devel/gettext
dev-python/ipy
dbus? (
sys-apps/dbus
dev-libs/dbus-glib
)
audit? ( >=sys-process/audit-1.5.1 )
pam? ( sys-libs/pam )
${PYTHON_DEPS}"
### libcgroup -> seunshare
### dbus -> restorecond
# pax-utils for scanelf used by rlpkg
RDEPEND="${COMMON_DEPS}
dev-python/sepolgen
app-misc/pax-utils"
DEPEND="${COMMON_DEPS}"
S="${WORKDIR}/${MY_P}"
S1="${WORKDIR}/${MY_P}"
S2="${WORKDIR}/policycoreutils-extra"
src_prepare() {
# rlpkg is more useful than fixfiles
sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
|| die "fixfiles sed 1 failed"
sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
|| die "fixfiles sed 2 failed"
EPATCH_MULTI_MSG="Applying policycoreutils patches ... " \
EPATCH_SUFFIX="patch" \
EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
EPATCH_FORCE="yes" \
epatch
epatch_user
python_copy_sources
# Our extra code is outside the regular directory, so set it to the
extra
# directory. We really should optimize this as it is ugly, but the extra
# code is needed for Gentoo at the same time that policycoreutils is
present
# (so we cannot use an additional package for now).
S="${S2}"
python_copy_sources
}
src_compile() {
local use_audit="n";
local use_pam="n";
local use_dbus="n";
local use_sesandbox="n";
use audit && use_audit="y";
use pam && use_pam="y";
use dbus && use_dbus="y";
building() {
emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y"
AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}"
SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
}
S="${S1}" # Regular policycoreutils
python_foreach_impl building
S="${S2}" # Extra set
python_foreach_impl building
}
src_install() {
local use_audit="n";
local use_pam="n";
local use_dbus="n";
local use_sesandbox="n";
use audit && use_audit="y";
use pam && use_pam="y";
use dbus && use_dbus="y";
# Python scripts are present in many places. There are no extension
modules.
installation-policycoreutils() {
einfo "Installing policycoreutils"
emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}"
PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}"
AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
python_optimize
}
installation-extras() {
einfo "Installing policycoreutils-extra"
emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}"
SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
python_optimize
}
S="${S1}" # policycoreutils
python_foreach_impl installation-policycoreutils
S="${S2}" # extras
python_foreach_impl installation-extras
S="${S1}" # back for later
# remove redhat-style init script
rm -fR "${D}/etc/rc.d"
# compatibility symlinks
dosym /sbin/setfiles /usr/sbin/setfiles
dosym /$(get_libdir)/rc/runscript_selinux.so
/$(get_libdir)/rcscripts/runscript_selinux.so
# location for permissive definitions
dodir /var/lib/selinux
keepdir /var/lib/selinux
# Set version-specific scripts
for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
python_replicate_script "${ED}/usr/bin/${pyscript}"
done
for pyscript in semanage rlpkg; do
python_replicate_script "${ED}/usr/sbin/${pyscript}"
done
dodir /usr/share/doc/${PF}/mcstrans/examples
cp -dR "${S1}"/mcstrans/share/examples/*
"${D}/usr/share/doc/${PF}/mcstrans/examples"
}
1.1 sys-apps/policycoreutils/policycoreutils-2.4_rc7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc7.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc7.ebuild?rev=1.1&content-type=text/plain
Index: policycoreutils-2.4_rc7.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc7.ebuild,v
1.1 2014/12/06 23:28:23 perfinion Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="xml"
inherit multilib python-r1 toolchain-funcs eutils
MY_P="${P//_/-}"
EXTRAS_VER="1.33"
SEMNG_VER="${PV}"
SELNX_VER="${PV}"
SEPOL_VER="${PV}"
IUSE="audit pam dbus"
DESCRIPTION="SELinux core utilities"
HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki";
SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz
mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND=">=sys-libs/libselinux-${SELNX_VER}[python]
>=sys-libs/glibc-2.4
>=sys-libs/libcap-1.10-r10
>=sys-libs/libsemanage-${SEMNG_VER}[python]
sys-libs/libcap-ng
>=sys-libs/libsepol-${SEPOL_VER}
sys-devel/gettext
dev-python/ipy[${PYTHON_USEDEP}]
dbus? (
sys-apps/dbus
dev-libs/dbus-glib
)
audit? ( >=sys-process/audit-1.5.1 )
pam? ( sys-libs/pam )
${PYTHON_DEPS}"
### libcgroup -> seunshare
### dbus -> restorecond
# pax-utils for scanelf used by rlpkg
RDEPEND="${DEPEND}
dev-python/sepolgen
app-misc/pax-utils"
S="${WORKDIR}/${MY_P}"
S1="${WORKDIR}/${MY_P}"
S2="${WORKDIR}/policycoreutils-extra"
src_prepare() {
epatch "${FILESDIR}/0010-remove-sesandbox-support.patch"
epatch "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch"
epatch "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch"
epatch "${FILESDIR}/0040-reverse-access-check-in-run_init.patch"
epatch
"${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch"
epatch "${FILESDIR}/0110-build-mcstrans-bug-472912.patch"
epatch
"${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch"
# rlpkg is more useful than fixfiles
sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
|| die "fixfiles sed 1 failed"
sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
|| die "fixfiles sed 2 failed"
epatch_user
python_copy_sources
# Our extra code is outside the regular directory, so set it to the
extra
# directory. We really should optimize this as it is ugly, but the extra
# code is needed for Gentoo at the same time that policycoreutils is
present
# (so we cannot use an additional package for now).
S="${S2}"
python_copy_sources
}
src_compile() {
building() {
emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="$(usex
audit)" PAMH="$(usex pam)" INOTIFYH="$(usex dbus)" SESANDBOX="n"
CC="$(tc-getCC)" PYLIBVER="${EPYTHON}"
}
S="${S1}" # Regular policycoreutils
python_foreach_impl building
S="${S2}" # Extra set
python_foreach_impl building
}
src_install() {
# Python scripts are present in many places. There are no extension
modules.
installation-policycoreutils() {
einfo "Installing policycoreutils"
emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="$(usex audit)"
PAMH="$(usex pam)" INOTIFYH="$(usex dbus)" SESANDBOX="n" AUDIT_LOG_PRIV="y"
PYLIBVER="${EPYTHON}" install
python_optimize
}
installation-extras() {
einfo "Installing policycoreutils-extra"
emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="$(usex dbus)"
SHLIBDIR="${D}$(get_libdir)/rc" install
python_optimize
}
S="${S1}" # policycoreutils
python_foreach_impl installation-policycoreutils
S="${S2}" # extras
python_foreach_impl installation-extras
S="${S1}" # back for later
# remove redhat-style init script
rm -fR "${D}/etc/rc.d"
# compatibility symlinks
dosym /sbin/setfiles /usr/sbin/setfiles
dosym /$(get_libdir)/rc/runscript_selinux.so
/$(get_libdir)/rcscripts/runscript_selinux.so
# location for policy definitions
dodir /var/lib/selinux
keepdir /var/lib/selinux
# Set version-specific scripts
for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
python_replicate_script "${ED}/usr/bin/${pyscript}"
done
for pyscript in semanage rlpkg; do
python_replicate_script "${ED}/usr/sbin/${pyscript}"
done
dodir /usr/share/doc/${PF}/mcstrans/examples
cp -dR "${S1}"/mcstrans/share/examples/*
"${D}/usr/share/doc/${PF}/mcstrans/examples"
}
pkg_postinst() {
# The selinux_gentoo init script is no longer needed with recent OpenRC
elog "The selinux_gentoo init script will be removed in future versions
when OpenRC 0.13.x is stabilized."
# Migrate the SELinux semanage configuration store if not done already
local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}'
/etc/selinux/config);
if [ -n "${selinuxtype}" ] && [ ! -d /var/lib/selinux/${mcs}/active ] ;
then
ewarn "Since the 2.4 SELinux userspace, the policy module store
is moved"
ewarn "from /etc/selinux to /var/lib/selinux. In order to
continue with"
ewarn "the 2.4 userspace, please migrate the necessary files by
executing"
ewarn "/usr/libexec/selinux/semanage_migrate_store. Warnings
about 'else'"
ewarn "blocks can be safely ignored."
ewarn "For more information, please see"
ewarn "-
https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration";
fi
}
