public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sec-policy/selinux-base: selinux-base-2.20120725-r9.ebuild ChangeLog
@ 2013-01-13 16:03 Sven Vermeulen (swift)
  0 siblings, 0 replies; 3+ messages in thread
From: Sven Vermeulen (swift) @ 2013-01-13 16:03 UTC (permalink / raw
  To: gentoo-commits

swift       13/01/13 16:03:52

  Modified:             selinux-base-2.20120725-r9.ebuild ChangeLog
  Log:
  Stabilizing r9
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xCDBA2FDB)

Revision  Changes    Path
1.3                  sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild?r1=1.2&r2=1.3

Index: selinux-base-2.20120725-r9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- selinux-base-2.20120725-r9.ebuild	30 Dec 2012 18:15:12 -0000	1.2
+++ selinux-base-2.20120725-r9.ebuild	13 Jan 2013 16:03:52 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild,v 1.2 2012/12/30 18:15:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild,v 1.3 2013/01/13 16:03:52 swift Exp $
 EAPI="4"
 
 inherit eutils
@@ -14,7 +14,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-apps/policycoreutils-2.1.10
 	virtual/udev



1.22                 sec-policy/selinux-base/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?r1=1.21&r2=1.22

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog	30 Dec 2012 19:25:39 -0000	1.21
+++ ChangeLog	13 Jan 2013 16:03:52 -0000	1.22
@@ -1,6 +1,10 @@
 # ChangeLog for sec-policy/selinux-base
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.21 2012/12/30 19:25:39 swift Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.22 2013/01/13 16:03:52 swift Exp $
+
+  13 Jan 2013; Sven Vermeulen <swift@gentoo.org>
+  selinux-base-2.20120725-r9.ebuild:
+  Stabilizing r9
 
   30 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   selinux-base-2.20120725-r9.ebuild:





^ permalink raw reply	[flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sec-policy/selinux-base: selinux-base-2.20120725-r9.ebuild ChangeLog
@ 2012-12-30 18:15 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-12-30 18:15 UTC (permalink / raw
  To: gentoo-commits

ssuominen    12/12/30 18:15:13

  Modified:             selinux-base-2.20120725-r9.ebuild ChangeLog
  Log:
  Use virtual/udev instead of sys-fs/udev; regression introduced by swift@g.o 21 Dec 2012 by not using up-to-date ebuild from gentoo-x86 for revision bumping.
  
  (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.2                  sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild?r1=1.1&r2=1.2

Index: selinux-base-2.20120725-r9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- selinux-base-2.20120725-r9.ebuild	21 Dec 2012 20:47:00 -0000	1.1
+++ selinux-base-2.20120725-r9.ebuild	30 Dec 2012 18:15:12 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild,v 1.2 2012/12/30 18:15:12 ssuominen Exp $
 EAPI="4"
 
 inherit eutils
@@ -17,7 +17,7 @@
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=sys-apps/policycoreutils-2.1.10
-	>=sys-fs/udev-151
+	virtual/udev
 	!<=sec-policy/selinux-base-policy-2.20120725"
 DEPEND="${RDEPEND}
 	sys-devel/m4



1.20                 sec-policy/selinux-base/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?r1=1.19&r2=1.20

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog	21 Dec 2012 20:47:00 -0000	1.19
+++ ChangeLog	30 Dec 2012 18:15:12 -0000	1.20
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-base
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.19 2012/12/21 20:47:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.20 2012/12/30 18:15:12 ssuominen Exp $
+
+  30 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  selinux-base-2.20120725-r9.ebuild:
+  Use virtual/udev instead of sys-fs/udev; regression introduced by swift@g.o
+  21 Dec 2012 by not using up-to-date ebuild from gentoo-x86 for revision
+  bumping.
 
 *selinux-base-2.20120725-r9 (21 Dec 2012)
 





^ permalink raw reply	[flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sec-policy/selinux-base: selinux-base-2.20120725-r9.ebuild ChangeLog
@ 2012-12-21 20:47 Sven Vermeulen (swift)
  0 siblings, 0 replies; 3+ messages in thread
From: Sven Vermeulen (swift) @ 2012-12-21 20:47 UTC (permalink / raw
  To: gentoo-commits

swift       12/12/21 20:47:00

  Modified:             ChangeLog
  Added:                selinux-base-2.20120725-r9.ebuild
  Log:
  release of rev 9
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xCDBA2FDB)

Revision  Changes    Path
1.19                 sec-policy/selinux-base/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/ChangeLog?r1=1.18&r2=1.19

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog	17 Dec 2012 20:01:23 -0000	1.18
+++ ChangeLog	21 Dec 2012 20:47:00 -0000	1.19
@@ -1,6 +1,11 @@
 # ChangeLog for sec-policy/selinux-base
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.18 2012/12/17 20:01:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.19 2012/12/21 20:47:00 swift Exp $
+
+*selinux-base-2.20120725-r9 (21 Dec 2012)
+
+  21 Dec 2012; <swift@gentoo.org> +selinux-base-2.20120725-r9.ebuild:
+  Bumping to revision 9
 
   17 Dec 2012; Sven Vermeulen -selinux-base-2.20120215-r13.ebuild,
   -selinux-base-2.20120215-r14.ebuild, -selinux-base-2.20120215-r15.ebuild,



1.1                  sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild?rev=1.1&content-type=text/plain

Index: selinux-base-2.20120725-r9.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20120725-r9.ebuild,v 1.1 2012/12/21 20:47:00 swift Exp $
EAPI="4"

inherit eutils

IUSE="+peer_perms +open_perms +ubac unconfined doc"

DESCRIPTION="Gentoo base policy for SELinux"
HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
	http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"

KEYWORDS="~amd64 ~x86"

RDEPEND=">=sys-apps/policycoreutils-2.1.10
	>=sys-fs/udev-151
	!<=sec-policy/selinux-base-policy-2.20120725"
DEPEND="${RDEPEND}
	sys-devel/m4
	>=sys-apps/checkpolicy-2.1.8"

S=${WORKDIR}/

src_prepare() {
	# Apply the gentoo patches to the policy. These patches are only necessary
	# for base policies, or for interface changes on modules.
	EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
	EPATCH_SUFFIX="patch" \
	EPATCH_SOURCE="${WORKDIR}" \
	EPATCH_FORCE="yes" \
	epatch

	cd "${S}/refpolicy"
	# Fix bug 257111 - Correct the initial sid for cron-started jobs in the
	# system_r role
	sed -i -e 's:system_crond_t:system_cronjob_t:g' \
		"${S}/refpolicy/config/appconfig-standard/default_contexts"
	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
		"${S}/refpolicy/config/appconfig-mls/default_contexts"
	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
		"${S}/refpolicy/config/appconfig-mcs/default_contexts"
}

src_configure() {
	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"

	# Update the SELinux refpolicy capabilities based on the users' USE flags.

	if ! use peer_perms; then
		sed -i -e '/network_peer_controls/d' \
			"${S}/refpolicy/policy/policy_capabilities"
	fi

	if ! use open_perms; then
		sed -i -e '/open_perms/d' \
			"${S}/refpolicy/policy/policy_capabilities"
	fi

	if ! use ubac; then
		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
			|| die "Failed to disable User Based Access Control"
	fi

	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf"

	# Prepare initial configuration
	cd "${S}/refpolicy";
	make conf || die "Make conf failed"

	# Setup the policies based on the types delivered by the end user.
	# These types can be "targeted", "strict", "mcs" and "mls".
	for i in ${POLICY_TYPES}; do
		cp -a "${S}/refpolicy" "${S}/${i}"
		cd "${S}/${i}";

		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf"

		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
			"${S}/${i}/build.conf" || die "build.conf setup failed."

		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
		then
			# MCS/MLS require additional settings
			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
				|| die "failed to set type to mls"
		fi

		if [ "${i}" == "targeted" ]; then
			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
			"${S}/${i}/config/appconfig-standard/seusers" \
			|| die "targeted seusers setup failed."
		fi

		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
			"${S}/${i}/config/appconfig-${i}/seusers" \
			|| die "policy seusers setup failed."
		fi
	done
}

src_compile() {
	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"

	for i in ${POLICY_TYPES}; do
		cd "${S}/${i}"
		make base || die "${i} compile failed"
		if use doc; then
			make html || die
		fi
	done
}

src_install() {
	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"

	for i in ${POLICY_TYPES}; do
		cd "${S}/${i}"

		make DESTDIR="${D}" install \
			|| die "${i} install failed."

		make DESTDIR="${D}" install-headers \
			|| die "${i} headers install failed."

		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"

		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"

		# libsemanage won't make this on its own
		keepdir "/etc/selinux/${i}/policy"

		if use doc; then
			dohtml doc/html/*;
		fi

		insinto /usr/share/selinux/devel;
		doins doc/policy.xml;

	done

	dodoc doc/Makefile.example doc/example.{te,fc,if}

	insinto /etc/selinux
	doins "${FILESDIR}/config"
}

pkg_preinst() {
	has_version "<${CATEGORY}/${PN}-2.20101213-r13"
	previous_less_than_r13=$?
}





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-01-13 16:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-13 16:03 [gentoo-commits] gentoo-x86 commit in sec-policy/selinux-base: selinux-base-2.20120725-r9.ebuild ChangeLog Sven Vermeulen (swift)
  -- strict thread matches above, loose matches on Subject: below --
2012-12-30 18:15 Samuli Suominen (ssuominen)
2012-12-21 20:47 Sven Vermeulen (swift)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox