merge with nsa policy

5 files changed, 11 insertions, 20 deletions

diff --git a/sec-policy/selinux-procmail/ChangeLog b/sec-policy/selinux-procmail/ChangeLog
index 334ad40760ca..57094dde3633 100644
--- a/sec-policy/selinux-procmail/ChangeLog
+++ b/sec-policy/selinux-procmail/ChangeLog
@@ -1,10 +1,9 @@
 # ChangeLog for sec-policy/selinux-procmail
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/ChangeLog,v 1.1 2004/07/05 02:49:50 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/ChangeLog,v 1.2 2004/11/13 20:04:32 kaiowas Exp $
 
-*selinux-procmail-20040704 (04 Jul 2004)
-
-  04 Jul 2004; Chris PeBenito <pebenito@gentoo.org> +metadata.xml,
-  +selinux-procmail-20040704.ebuild:
-  Initial commit, from #55337.
+*selinux-procmail-20041028 (13 Nov 2004)
 
+  13 Nov 2004; petre rodan <kaiowas@gentoo.org>
+  -selinux-procmail-20040704.ebuild, +selinux-procmail-20041028.ebuild:
+  merge with nsa policy
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 232eeb6ba9ba..71bde2d4ed29 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2f670a4d0e40cc3405a129791d5ee6bf ChangeLog 407
 MD5 df50b670def71c1790352df31ff8c44f metadata.xml 303
 MD5 884345dfcb6b90bae16c209a4d76b9d1 selinux-procmail-20040704.ebuild 397
+MD5 66e3df61a29cb82c1ef99caba3df3472 selinux-procmail-20041028.ebuild 281
 MD5 425fdc6eb48427e259c15c2f8182bcac files/digest-selinux-procmail-20040704 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBTjjFGFJQsIJWJy4RAuILAJ4iTAODsj2UgOU6iJEyH2whmcP1FwCfdfX8
-H7V2+NpfdLFjzvzV2o3KPgE=
-=qkdF
------END PGP SIGNATURE-----
+MD5 c3b9b7fa9b6e7c9bb05020e7246e8396 files/digest-selinux-procmail-20041028 76
diff --git a/sec-policy/selinux-procmail/files/digest-selinux-procmail-20040704 b/sec-policy/selinux-procmail/files/digest-selinux-procmail-20040704
deleted file mode 100644
index befeb2f9ba0c..000000000000
--- a/sec-policy/selinux-procmail/files/digest-selinux-procmail-20040704
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a497fa9ecdfb721fefce8220899117c0 selinux-procmail-20040704.tar.bz2 1073
diff --git a/sec-policy/selinux-procmail/files/digest-selinux-procmail-20041028 b/sec-policy/selinux-procmail/files/digest-selinux-procmail-20041028
new file mode 100644
index 000000000000..cf125f636b6a
--- /dev/null
+++ b/sec-policy/selinux-procmail/files/digest-selinux-procmail-20041028
@@ -0,0 +1 @@
+MD5 a6444a1ebf1cf3f71c5d3da5e76743cc selinux-procmail-20041028.tar.bz2 1088
diff --git a/sec-policy/selinux-procmail/selinux-procmail-20040704.ebuild b/sec-policy/selinux-procmail/selinux-procmail-20041028.ebuild
index 4046b4ed02e2..366a1cf92e1b 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-20040704.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-20041028.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/selinux-procmail-20040704.ebuild,v 1.2 2004/09/20 01:55:47 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/selinux-procmail-20041028.ebuild,v 1.1 2004/11/13 20:04:32 kaiowas Exp $
+
+inherit selinux-policy
 
 TEFILES="procmail.te"
 FCFILES="procmail.fc"
 IUSE=""
 
-inherit selinux-policy
-
 DESCRIPTION="SELinux policy for procmail"
 
 KEYWORDS="x86 ppc sparc amd64"