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

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

[Sven Vermeulen]

commit:     99cba04bacbd2d38c351ac9582aa4c3a29becf16
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Sat Aug 13 18:28:17 2011 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Sat Aug 13 18:28:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=99cba04b

Introduce selinux-ftp package, make ftpd point to it

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

diff --git a/sec-policy/selinux-ftp/ChangeLog b/sec-policy/selinux-ftp/ChangeLog
new file mode 100644
index 0000000..4f50cdb
--- /dev/null
+++ b/sec-policy/selinux-ftp/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sec-policy/selinux-ftp
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*selinux-apm-2.20110726 (13 Aug 2011)
+
+  13 Aug 2011; <swift@gentoo.org> +selinux-apm-2.20110726.ebuild,
+  +metadata.xml:
+  Introduce SELinux policy module package for ftp
+

diff --git a/sec-policy/selinux-ftp/metadata.xml b/sec-policy/selinux-ftp/metadata.xml
new file mode 100644
index 0000000..ca1762e
--- /dev/null
+++ b/sec-policy/selinux-ftp/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 ftp</longdescription>
+</pkgmetadata>

diff --git a/sec-policy/selinux-ftpd/selinux-ftpd-2.20110726.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20110726.ebuild
similarity index 57%
copy from sec-policy/selinux-ftpd/selinux-ftpd-2.20110726.ebuild
copy to sec-policy/selinux-ftp/selinux-ftp-2.20110726.ebuild
index 62a62bf..5ad7489 100644
--- a/sec-policy/selinux-ftpd/selinux-ftpd-2.20110726.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20110726.ebuild
@@ -4,10 +4,11 @@
 EAPI="4"
 
 IUSE=""
-MODS="ftpd"
+MODS="ftp"
 
 inherit selinux-policy-2
 
-DESCRIPTION="SELinux policy for ftpd"
-
+DESCRIPTION="SELinux policy for ftp"
 KEYWORDS="~amd64 ~x86"
+DEPEND="=sec-policy/selinux-base-policy-2.20110726-r1
+	!<sec-policy/selinux-ftpd-2.20110726"

diff --git a/sec-policy/selinux-ftpd/ChangeLog b/sec-policy/selinux-ftpd/ChangeLog
index bbcb6fa..bd672a4 100644
--- a/sec-policy/selinux-ftpd/ChangeLog
+++ b/sec-policy/selinux-ftpd/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftpd/ChangeLog,v 1.24 2011/06/04 16:43:58 blueness Exp $
 
+  13 Aug 2011; <swift@gentoo.org> selinux-ftpd-2.20110726.ebuild:
+  Make ftpd a meta-package as there is no SELinux ftpd module
+
   04 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
   -selinux-ftpd-2.20090730.ebuild, -selinux-ftpd-2.20091215.ebuild,
   -selinux-ftpd-20080525.ebuild:

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