merge with upstream policy

(Portage version: 2.0.51-r15)

8 files changed, 31 insertions, 28 deletions

diff --git a/sec-policy/selinux-dhcp/ChangeLog b/sec-policy/selinux-dhcp/ChangeLog
index 0600a1b2b5a9..c2f335a27be4 100644
--- a/sec-policy/selinux-dhcp/ChangeLog
+++ b/sec-policy/selinux-dhcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dhcp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/ChangeLog,v 1.11 2005/01/20 09:19:31 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/ChangeLog,v 1.12 2005/02/25 07:49:05 kaiowas Exp $
+
+*selinux-dhcp-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-dhcp-20050219.ebuild:
+  merge with upstream policy
 
   20 Jan 2005; petre rodan <kaiowas@gentoo.org>
   -selinux-dhcp-20041120.ebuild, selinux-dhcp-20041125.ebuild:
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 76902257b4cd..84779efa0494 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c0aef3eb7ecfee531acc8a297670e30b ChangeLog 1882
 MD5 30408c1d604aa79a5d18881b61cb68c7 metadata.xml 548
+MD5 165bd1978b82a510bffe815cb78113e3 selinux-dhcp-20050219.ebuild 383
 MD5 d64a8c94ea48916824619563464de5ae selinux-dhcp-20041125.ebuild 438
+MD5 c38614a55c5f54b18268f8c541434a7e files/digest-selinux-dhcp-20050219 72
 MD5 1081d4507890b93ceceea1e08cd890af files/digest-selinux-dhcp-20041125 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB73PJGSBEIeh4AEYRAn42AJ950TAlKltexDWzZ7lF7wH83p6wHgCePjIL
-uZqZnHXnyptGEmXQ5T0jlts=
-=d7v7
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050219 b/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050219
new file mode 100644
index 000000000000..7478c04daefd
--- /dev/null
+++ b/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050219
@@ -0,0 +1 @@
+MD5 322f4a7a575c2d4d04562719e1b0d082 selinux-dhcp-20050219.tar.bz2 1503
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-20050219.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-20050219.ebuild
new file mode 100644
index 000000000000..8e8a1d5bc9c2
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-20050219.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/selinux-dhcp-20050219.ebuild,v 1.1 2005/02/25 07:49:05 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="dhcpd.te"
+FCFILES="dhcpd.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for dhcp server"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
diff --git a/sec-policy/selinux-ftpd/Manifest b/sec-policy/selinux-ftpd/Manifest
index ffc17a2b0276..9e8b5bd9e380 100644
--- a/sec-policy/selinux-ftpd/Manifest
+++ b/sec-policy/selinux-ftpd/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b87f7b8c7ba0eb1f39ce59c44b558d8d ChangeLog 511
 MD5 ca13c291511690216cc31fbee7c29544 metadata.xml 381
-MD5 bccdc5bfcfc54ec5fa9b5c20b9636864 selinux-ftpd-20040713.ebuild 383
+MD5 588d13d9122ff9ab0e6b9a1bd822e94c selinux-ftpd-20050211.ebuild 276
 MD5 41493fe684dd9b0e407bc51ddf8bfcf2 selinux-ftpd-20041120.ebuild 383
-MD5 d4be74a3ae4f41f4d63011051d8dd6f5 files/digest-selinux-ftpd-20040713 72
+MD5 c096abe120c55e2d4cfae20857491836 files/digest-selinux-ftpd-20050211 72
 MD5 9093ca19af29679e5a3dbbfdaf1a8eb7 files/digest-selinux-ftpd-20041120 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB73QaGSBEIeh4AEYRAlilAJ9nhBRnotXM3diwdGRk0H098HxCTQCfXfT0
-ULlw14jTI0/UywFIn23SacI=
-=Qg+I
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20040713 b/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20040713
deleted file mode 100644
index e96dfa29500d..000000000000
--- a/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20040713
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9bb2a36a3acd13d98ef4bbeaf350e862 selinux-ftpd-20040713.tar.bz2 1542
diff --git a/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20050211 b/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20050211
new file mode 100644
index 000000000000..243683cee34c
--- /dev/null
+++ b/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20050211
@@ -0,0 +1 @@
+MD5 700c9f09b5cda8176a2e13940ce1e2c8 selinux-ftpd-20050211.tar.bz2 1664
diff --git a/sec-policy/selinux-ftpd/selinux-ftpd-20040713.ebuild b/sec-policy/selinux-ftpd/selinux-ftpd-20050211.ebuild
index 9ee0f80163b7..a4eb6d87a727 100644
--- a/sec-policy/selinux-ftpd/selinux-ftpd-20040713.ebuild
+++ b/sec-policy/selinux-ftpd/selinux-ftpd-20050211.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftpd/selinux-ftpd-20040713.ebuild,v 1.3 2005/01/20 09:21:35 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftpd/selinux-ftpd-20050211.ebuild,v 1.1 2005/02/25 07:51:54 kaiowas Exp $
+
+inherit selinux-policy
 
 TEFILES="ftpd.te"
 FCFILES="ftpd.fc"
 IUSE=""
 
-inherit selinux-policy
-
 DESCRIPTION="SELinux policy for ftp daemons"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"