merge with upstream

(Portage version: 2.0.51.19)

8 files changed, 52 insertions, 23 deletions

diff --git a/sec-policy/selinux-djbdns/ChangeLog b/sec-policy/selinux-djbdns/ChangeLog
index 501af5c0ac15..510f88ced163 100644
--- a/sec-policy/selinux-djbdns/ChangeLog
+++ b/sec-policy/selinux-djbdns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-publicfile
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/ChangeLog,v 1.6 2004/12/12 12:13:23 kaiowas Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/ChangeLog,v 1.7 2005/04/23 17:55:26 kaiowas Exp $
+
+*selinux-djbdns-20050316 (23 Apr 2005)
+
+  23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-djbdns-20050316.ebuild:
+  we have upstream now, so we merge with it
 
   12 Dec 2004; petre rodan <kaiowas@gentoo.org>
   -selinux-djbdns-20041113.ebuild:
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index 55b9b5d9683d..5ce16bf3c38e 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 499dc944794392ec61cdb508e0d74569 ChangeLog 738
 MD5 fb218f45790b91233fae3bf77a791b91 metadata.xml 528
+MD5 4cd48724454ced746764907debb094d7 selinux-djbdns-20050316.ebuild 348
 MD5 38b8eb0480c986d972cc17222c212591 selinux-djbdns-20041121.ebuild 459
+MD5 971fb37d492a6f1e0498a6645770d038 files/digest-selinux-djbdns-20050316 74
 MD5 a9a4901495f3da8547b6eeb997e404f6 files/digest-selinux-djbdns-20041121 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBvC7IGSBEIeh4AEYRArklAJ0ajRVmXHS3QNe6fU5tk9gmRwQ8lgCggtez
-DfZQaiAY9bLg47mxNosKyIA=
-=CM8o
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-djbdns/files/digest-selinux-djbdns-20050316 b/sec-policy/selinux-djbdns/files/digest-selinux-djbdns-20050316
new file mode 100644
index 000000000000..7540abcbc49f
--- /dev/null
+++ b/sec-policy/selinux-djbdns/files/digest-selinux-djbdns-20050316
@@ -0,0 +1 @@
+MD5 b4179f3069bfe576bca4d7dd9cdc7987 selinux-djbdns-20050316.tar.bz2 1010
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-20050316.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-20050316.ebuild
new file mode 100644
index 000000000000..9f20fbf021a4
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-20050316.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/selinux-djbdns-20050316.ebuild,v 1.1 2005/04/23 17:55:26 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="djbdns.te"
+FCFILES="djbdns.fc"
+IUSE=""
+
+RDEPEND="sec-policy/selinux-ucspi-tcp
+		sec-policy/selinux-daemontools"
+
+DESCRIPTION="SELinux policy for djbdns"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
diff --git a/sec-policy/selinux-ftpd/ChangeLog b/sec-policy/selinux-ftpd/ChangeLog
index bc23c127a8d7..7b39789f2d4e 100644
--- a/sec-policy/selinux-ftpd/ChangeLog
+++ b/sec-policy/selinux-ftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ftpd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftpd/ChangeLog,v 1.3 2005/03/23 07:40:45 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftpd/ChangeLog,v 1.4 2005/04/23 17:59:59 kaiowas Exp $
+
+*selinux-ftpd-20050408 (23 Apr 2005)
+
+  23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+  +selinux-ftpd-20050408.ebuild:
+  merge with upstream
 
 *selinux-ftpd-20050211 (23 Mar 2005)
 
diff --git a/sec-policy/selinux-ftpd/Manifest b/sec-policy/selinux-ftpd/Manifest
index aabdc7170034..d647e49ac111 100644
--- a/sec-policy/selinux-ftpd/Manifest
+++ b/sec-policy/selinux-ftpd/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9ecf97846151550246931dcb9cd84301 ChangeLog 644
 MD5 ca13c291511690216cc31fbee7c29544 metadata.xml 381
 MD5 7ca36fb45090bf83b3737d9df9a2388c selinux-ftpd-20050211.ebuild 383
+MD5 588d13d9122ff9ab0e6b9a1bd822e94c selinux-ftpd-20050408.ebuild 276
 MD5 41493fe684dd9b0e407bc51ddf8bfcf2 selinux-ftpd-20041120.ebuild 383
 MD5 c096abe120c55e2d4cfae20857491836 files/digest-selinux-ftpd-20050211 72
+MD5 20427703d4711eb98038a9bf6740df10 files/digest-selinux-ftpd-20050408 72
 MD5 9093ca19af29679e5a3dbbfdaf1a8eb7 files/digest-selinux-ftpd-20041120 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCQRy9GSBEIeh4AEYRAvdBAJ98w7YwmHTvYBYOBHDFob5dwnnbGACghvk8
-f7MPRceTFDgfixeqfkTzF4o=
-=JZV7
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20050408 b/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20050408
new file mode 100644
index 000000000000..17105c42eab4
--- /dev/null
+++ b/sec-policy/selinux-ftpd/files/digest-selinux-ftpd-20050408
@@ -0,0 +1 @@
+MD5 035d1c82bb87077501de1fc0ef1b0f7e selinux-ftpd-20050408.tar.bz2 1734
diff --git a/sec-policy/selinux-ftpd/selinux-ftpd-20050408.ebuild b/sec-policy/selinux-ftpd/selinux-ftpd-20050408.ebuild
new file mode 100644
index 000000000000..e46637900ecc
--- /dev/null
+++ b/sec-policy/selinux-ftpd/selinux-ftpd-20050408.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-ftpd/selinux-ftpd-20050408.ebuild,v 1.1 2005/04/23 17:59:59 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="ftpd.te"
+FCFILES="ftpd.fc"
+IUSE=""
+
+DESCRIPTION="SELinux policy for ftp daemons"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+