[gentoo-commits] proj/hardened-dev:master commit in: sec-policy/selinux-jabber/, sec-policy/selinux-jabber-server/

[gentoo-commits] proj/hardened-dev:master commit in: sec-policy/selinux-jabber/, sec-policy/selinux-jabber-server/

[Sven Vermeulen]

commit:     36ff4a3665f719105627fac7ef73ca1c35b53d67
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Sat Aug 13 19:36:03 2011 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Sat Aug 13 19:36:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=36ff4a36

Introduce selinux-jabber

---
 sec-policy/selinux-jabber-server/ChangeLog         |    3 +++
 .../selinux-jabber-server-2.20110726.ebuild        |   12 ++++++------
 sec-policy/selinux-jabber/ChangeLog                |   10 ++++++++++
 sec-policy/selinux-jabber/metadata.xml             |    6 ++++++
 .../selinux-jabber-2.20110726.ebuild}              |    7 ++++---
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/sec-policy/selinux-jabber-server/ChangeLog b/sec-policy/selinux-jabber-server/ChangeLog
index 13f035f..ee160c9 100644
--- a/sec-policy/selinux-jabber-server/ChangeLog
+++ b/sec-policy/selinux-jabber-server/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-jabber-server/ChangeLog,v 1.18 2011/06/04 17:13:10 blueness Exp $
 
+  13 Aug 2011; <swift@gentoo.org> selinux-jabber-server-2.20110726.ebuild:
+  Use selinux-jabber instead of selinux-jabber-server
+
   04 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
   -selinux-jabber-server-2.20090730.ebuild,
   -selinux-jabber-server-2.20091215.ebuild,

diff --git a/sec-policy/selinux-jabber-server/selinux-jabber-server-2.20110726.ebuild b/sec-policy/selinux-jabber-server/selinux-jabber-server-2.20110726.ebuild
index 7e2f680..219a0a0 100644
--- a/sec-policy/selinux-jabber-server/selinux-jabber-server-2.20110726.ebuild
+++ b/sec-policy/selinux-jabber-server/selinux-jabber-server-2.20110726.ebuild
@@ -3,11 +3,11 @@
 # $Header: $
 EAPI="4"
 
-IUSE=""
-MODS="jabber-server"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for jabber-server"
+DEPEND=">=sec-policy/selinux-jabber-2.20110726"
 
+IUSE=""
+DESCRIPTION="SELinux policy for Jabber server (meta-package for jabber)"
+HOMEPAGE="http://hardened.gentoo.org/selinux"
 KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="public-domain"

diff --git a/sec-policy/selinux-jabber/ChangeLog b/sec-policy/selinux-jabber/ChangeLog
new file mode 100644
index 0000000..980ff1c
--- /dev/null
+++ b/sec-policy/selinux-jabber/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sec-policy/selinux-jabber
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*selinux-jabber-2.20110726 (13 Aug 2011)
+
+  13 Aug 2011; <swift@gentoo.org> +selinux-jabber-2.20110726.ebuild,
+  +metadata.xml:
+  Initial ebuild for jabber (deprecates selinux-jabber-server)
+

diff --git a/sec-policy/selinux-jabber/metadata.xml b/sec-policy/selinux-jabber/metadata.xml
new file mode 100644
index 0000000..82e2550
--- /dev/null
+++ b/sec-policy/selinux-jabber/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for jabber</longdescription>
+</pkgmetadata>

diff --git a/sec-policy/selinux-jabber-server/selinux-jabber-server-2.20110726.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20110726.ebuild
similarity index 54%
copy from sec-policy/selinux-jabber-server/selinux-jabber-server-2.20110726.ebuild
copy to sec-policy/selinux-jabber/selinux-jabber-2.20110726.ebuild
index 7e2f680..7c225fe 100644
--- a/sec-policy/selinux-jabber-server/selinux-jabber-server-2.20110726.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20110726.ebuild
@@ -4,10 +4,11 @@
 EAPI="4"
 
 IUSE=""
-MODS="jabber-server"
+MODS="jabber"
 
 inherit selinux-policy-2
 
-DESCRIPTION="SELinux policy for jabber-server"
-
+DESCRIPTION="SELinux policy for jabber"
 KEYWORDS="~amd64 ~x86"
+DEPEND="=sec-policy/selinux-base-policy-2.20110726-r1
+	!<sec-policy/selinux-jabber-server-2.20110726"