Introduce selinux-ipsec, deprecate selinux-ipsec-tools

7 files changed, 45 insertions, 9 deletions

diff --git a/sec-policy/selinux-ipsec-tools/ChangeLog b/sec-policy/selinux-ipsec-tools/ChangeLog
index 31496321..8c716390 100644
--- a/sec-policy/selinux-ipsec-tools/ChangeLog
+++ b/sec-policy/selinux-ipsec-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ipsec-tools/ChangeLog,v 1.25 2011/06/04 16:49:39 blueness Exp $
 
+  13 Aug 2011; <swift@gentoo.org> selinux-ipsec-tools-2.20110726.ebuild:
+  Revamp to selinux-ipsec
+
   04 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
   -selinux-ipsec-tools-2.20090730.ebuild,
   -selinux-ipsec-tools-2.20091215.ebuild, -selinux-ipsec-tools-20080525.ebuild:
diff --git a/sec-policy/selinux-ipsec-tools/Manifest b/sec-policy/selinux-ipsec-tools/Manifest
index 6992806a..b23dd8d3 100644
--- a/sec-policy/selinux-ipsec-tools/Manifest
+++ b/sec-policy/selinux-ipsec-tools/Manifest
@@ -1,4 +1,3 @@
-DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
-EBUILD selinux-ipsec-tools-2.20110726.ebuild 253 RMD160 2f32919bde53b3c4e931227d79f7c16aebe32e3c SHA1 d8b46f4fcc09ba9dd90605e7fcdb09f200e2025a SHA256 90229a7b454ee685c71d96aa5c338b098878fe359c4ab5f4ef48a60ac8234d11
-MISC ChangeLog 4336 RMD160 dffab2cc5278d62f8f7bac94a2fa7bfb064ccf3c SHA1 bec33e130ff409a0dfa488fface655a34323efc2 SHA256 2aee6cedb4114dade36996b3e680a54aa0dc406f05dbb268fb52801bb07dbc75
+EBUILD selinux-ipsec-tools-2.20110726.ebuild 358 RMD160 09a4ed9f7d0e1fdbf5a9553728fc33f2258685f0 SHA1 931be0ded479e82515563bda8536ab6cd2811c30 SHA256 517ac4ef2bbac8744a25e962d6b7a8e51962641111630f7aab2b321cb0192e5e
+MISC ChangeLog 4436 RMD160 bbbcaaf43cebed6a9f1c942521cca2de0f3c7851 SHA1 8399169ee8c315c9b032f636b44e4637cb44905d SHA256 835855fbd4d3e118fe149703fc5572afc56a5711c1de4929561fb13e39e3c846
 MISC metadata.xml 235 RMD160 4bc6b5a9936928240ba551d41f565c2d97b4ac71 SHA1 92c47e5e45dcb2657f804457cb4b3070a0a4c416 SHA256 d95ed6b866d2103eb6fb3e71e11a799222e14ccd61f588f720ac405ebbca31ef
diff --git a/sec-policy/selinux-ipsec-tools/selinux-ipsec-tools-2.20110726.ebuild b/sec-policy/selinux-ipsec-tools/selinux-ipsec-tools-2.20110726.ebuild
index a5c7f61a..7e5aad13 100644
--- a/sec-policy/selinux-ipsec-tools/selinux-ipsec-tools-2.20110726.ebuild
+++ b/sec-policy/selinux-ipsec-tools/selinux-ipsec-tools-2.20110726.ebuild
@@ -3,11 +3,11 @@
 # $Header: $
 EAPI="4"
 
-IUSE=""
-MODS="ipsec-tools"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for ipsec-tools"
+DEPEND=">=sec-policy/selinux-ipsec-2.20110726"
 
+IUSE=""
+DESCRIPTION="SELinux policy for ipsec-tools (meta-package for ipsec)"
+HOMEPAGE="http://hardened.gentoo.org/selinux"
 KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="public-domain"
diff --git a/sec-policy/selinux-ipsec/ChangeLog b/sec-policy/selinux-ipsec/ChangeLog
new file mode 100644
index 00000000..9b56eea0
--- /dev/null
+++ b/sec-policy/selinux-ipsec/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sec-policy/selinux-ipsec
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*selinux-ipsec-2.20110726 (13 Aug 2011)
+
+  13 Aug 2011; <swift@gentoo.org> +selinux-ipsec-2.20110726.ebuild,
+  +metadata.xml:
+  Initial ebuild for SELinux' ipsec module
+
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
new file mode 100644
index 00000000..8d1bf539
--- /dev/null
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -0,0 +1,4 @@
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
+EBUILD selinux-ipsec-2.20110726.ebuild 340 RMD160 eb4d56a072aabac2eccd7221a8958aaf2e0b6e60 SHA1 184a44dff5f5314e9c28e177e4d0614c603bead6 SHA256 05d00a6c03a15e3b9cf9e95f6d61a322556118ea527a64bff1e42aaa9e4afa99
+MISC ChangeLog 295 RMD160 c46e913ea5ff5970e4198bca44f5bdc005c6b25a SHA1 2a47470fb70d4d85558aca349c22a4d0a4d8e079 SHA256 86f40a0585d126ddb5ca4385989ed35a6d6d2fff327a928a21f201d6f1a30886
+MISC metadata.xml 229 RMD160 d5895e37cbbbb31b409937670f4532ec353f43fe SHA1 456f8b2cbf6b1466f4f951b8b88b3856b6cfdf7b SHA256 8b3a0bf3f7fa4b0d9155230221e33ec2638b9041a3264abb6efe8726c6b7502f
diff --git a/sec-policy/selinux-ipsec/metadata.xml b/sec-policy/selinux-ipsec/metadata.xml
new file mode 100644
index 00000000..3bbae227
--- /dev/null
+++ b/sec-policy/selinux-ipsec/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 ipsec</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20110726.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20110726.ebuild
new file mode 100644
index 00000000..ae680c84
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20110726.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI="4"
+
+IUSE=""
+MODS="ipsec"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ipsec"
+KEYWORDS="~amd64 ~x86"
+DEPEND="=sec-policy/selinux-base-policy-2.20110726-r1
+	!<sec-policy/selinux-ipsec-tools-2.20110726"