merge with upstream policy

(Portage version: 2.0.51-r15)

10 files changed, 42 insertions, 31 deletions

diff --git a/sec-policy/selinux-snmpd/ChangeLog b/sec-policy/selinux-snmpd/ChangeLog
index f7ce6f0ceb90..6de4b748babf 100644
--- a/sec-policy/selinux-snmpd/ChangeLog
+++ b/sec-policy/selinux-snmpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-snmpd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmpd/ChangeLog,v 1.4 2005/01/20 09:37:00 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmpd/ChangeLog,v 1.5 2005/02/25 08:23:57 kaiowas Exp $
+
+*selinux-snmpd-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-snmpd-20050219.ebuild:
+  merge with upstream policy
 
   20 Jan 2005; petre rodan <kaiowas@gentoo.org>
   selinux-snmpd-20041128.ebuild:
diff --git a/sec-policy/selinux-snmpd/Manifest b/sec-policy/selinux-snmpd/Manifest
index 6fb66d8ec218..14dfe161a0fb 100644
--- a/sec-policy/selinux-snmpd/Manifest
+++ b/sec-policy/selinux-snmpd/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 09d98a298af2f9a2c22268677710aca9 ChangeLog 829
 MD5 b99cfd64dc18e0af6e9328ece6d0f38b metadata.xml 515
+MD5 6dfea9a16565911a4dc5cd09a834348e selinux-snmpd-20050219.ebuild 331
 MD5 443e3fc14f2a8a6bbd3dac597cf9556c selinux-snmpd-20041128.ebuild 388
+MD5 cf1f3be63e5d6fe9052bd36e8b001aaa files/digest-selinux-snmpd-20050219 73
 MD5 89762f06cdb38fb95039b679b7085f73 files/digest-selinux-snmpd-20041128 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB73ZzGSBEIeh4AEYRAlkUAJ9O4UPQX1NiTNVYtJaqNkCA9W8G3wCgj4Iq
-VYRZPHlza2j2Sb17JqM/7c4=
-=3lGM
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20050219 b/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20050219
new file mode 100644
index 000000000000..a0e963e3c3a1
--- /dev/null
+++ b/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20050219
@@ -0,0 +1 @@
+MD5 0dcb7be18d7696ba835472aeb9a140e2 selinux-snmpd-20050219.tar.bz2 1188
diff --git a/sec-policy/selinux-snmpd/selinux-snmpd-20050219.ebuild b/sec-policy/selinux-snmpd/selinux-snmpd-20050219.ebuild
new file mode 100644
index 000000000000..71067c90c571
--- /dev/null
+++ b/sec-policy/selinux-snmpd/selinux-snmpd-20050219.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmpd/selinux-snmpd-20050219.ebuild,v 1.1 2005/02/25 08:23:57 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="snmpd.te"
+FCFILES="snmpd.fc"
+IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
+
+DESCRIPTION="SELinux policy for snmp daemons"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
diff --git a/sec-policy/selinux-snort/ChangeLog b/sec-policy/selinux-snort/ChangeLog
index be632b13e0e7..262b01fb0a3b 100644
--- a/sec-policy/selinux-snort/ChangeLog
+++ b/sec-policy/selinux-snort/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-snort
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/ChangeLog,v 1.6 2004/11/23 17:18:39 kaiowas Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/ChangeLog,v 1.7 2005/02/25 08:27:09 kaiowas Exp $
+
+*selinux-snort-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-snort-20041028.ebuild, +selinux-snort-20050219.ebuild:
+  merge with upstream policy
 
   23 Nov 2004; petre rodan <kaiowas@gentoo.org>
   selinux-snort-20041117.ebuild:
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 016efa5f6d12..ea4caa34611a 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7d1bf8256a4dfd9cf1894fba6184f630 ChangeLog 651
 MD5 a6b87455345059b8524871b4023efe74 metadata.xml 391
+MD5 9335320d6b8f3c86792c57becc359f56 selinux-snort-20050219.ebuild 324
 MD5 b5eb5f9af65c041403dd88f83fbbe928 selinux-snort-20041117.ebuild 381
-MD5 4d7e7bdf7451151e49199ef4cb08cc26 selinux-snort-20041028.ebuild 381
+MD5 3207d2b60a2b861295eef18c487f5887 files/digest-selinux-snort-20050219 72
 MD5 2a7e7436c2c1d4917a2fe49886fef0b1 files/digest-selinux-snort-20041117 72
-MD5 1ecd9206d089e822fff5f8b4a17d865f files/digest-selinux-snort-20041028 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBo240GSBEIeh4AEYRAk5YAJ99+fyyqVUMWe4jrNuBS1DxCz8+twCfbng6
-Mu1FBUBdaZ6z3F3qM1T+JCk=
-=SYTd
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-snort/files/digest-selinux-snort-20041028 b/sec-policy/selinux-snort/files/digest-selinux-snort-20041028
deleted file mode 100644
index 825eb2941dde..000000000000
--- a/sec-policy/selinux-snort/files/digest-selinux-snort-20041028
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6dd549565dc00e68bfc33f43cb693a7d selinux-snort-20041028.tar.bz2 728
diff --git a/sec-policy/selinux-snort/files/digest-selinux-snort-20050219 b/sec-policy/selinux-snort/files/digest-selinux-snort-20050219
new file mode 100644
index 000000000000..d0804bf53bd2
--- /dev/null
+++ b/sec-policy/selinux-snort/files/digest-selinux-snort-20050219
@@ -0,0 +1 @@
+MD5 32811d01e0c90e6a1a3a4b2233aa630a selinux-snort-20050219.tar.bz2 739
diff --git a/sec-policy/selinux-snort/selinux-snort-20041117.ebuild b/sec-policy/selinux-snort/selinux-snort-20041117.ebuild
index 263441ccbd66..7656bec3c5ce 100644
--- a/sec-policy/selinux-snort/selinux-snort-20041117.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-20041117.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-20041117.ebuild,v 1.2 2004/11/23 17:18:39 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-20041117.ebuild,v 1.3 2005/02/25 08:27:09 kaiowas Exp $
 
 inherit selinux-policy
 
diff --git a/sec-policy/selinux-snort/selinux-snort-20041028.ebuild b/sec-policy/selinux-snort/selinux-snort-20050219.ebuild
index 9872c14f28bd..c7bf3c76e366 100644
--- a/sec-policy/selinux-snort/selinux-snort-20041028.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-20050219.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-20041028.ebuild,v 1.1 2004/11/13 20:11:05 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-20050219.ebuild,v 1.1 2005/02/25 08:27:09 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="snort.te"
 FCFILES="snort.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for snort"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"