removed old builds, small merge with upstream policy

11 files changed, 17 insertions, 60 deletions

diff --git a/sec-policy/selinux-postfix/ChangeLog b/sec-policy/selinux-postfix/ChangeLog
index 41711f6a8a1a..3fad03044133 100644
--- a/sec-policy/selinux-postfix/ChangeLog
+++ b/sec-policy/selinux-postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sec-policy/selinux-postfix
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/ChangeLog,v 1.6 2004/11/23 17:12:03 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/ChangeLog,v 1.7 2004/12/12 12:39:11 kaiowas Exp $
+
+*selinux-postfix-20041211 (12 Dec 2004)
+
+  12 Dec 2004; petre rodan <kaiowas@gentoo.org>
+  -selinux-postfix-20040427.ebuild, -selinux-postfix-20041021.ebuild,
+  -selinux-postfix-20041109.ebuild, -selinux-postfix-20041120.ebuild,
+  +selinux-postfix-20041211.ebuild:
+  removed old builds, small merge with upstream policy
 
   23 Nov 2004; petre rodan <kaiowas@gentoo.org>
   selinux-postfix-20041120.ebuild:
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index 253b634239f8..55616efec7e4 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -1,20 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bf9e6c9f2e91d9f1f1e1b4dc06cd3fea ChangeLog 937
+MD5 89311d75a74bd25010086d123a75c787 ChangeLog 1258
 MD5 0b8ee728a701b048ddb9e62d6c08ee02 metadata.xml 381
-MD5 d38de9658f6a93eca7af9b393736e81c selinux-postfix-20040427.ebuild 392
-MD5 1ffb12508a6ffb6802e6e0b5707f818e selinux-postfix-20041021.ebuild 395
-MD5 489a1887c3888035a47e27205d6cecd9 selinux-postfix-20041109.ebuild 395
-MD5 fd1db9539b367697d5a41598729aff26 selinux-postfix-20041120.ebuild 391
-MD5 d68c2a4162175e6950c0c77d9e529f88 files/digest-selinux-postfix-20040427 75
-MD5 8814206bdaf996778f94cb3fadce696a files/digest-selinux-postfix-20041021 75
-MD5 3e527377db06e4cb148b9e63834ae5fe files/digest-selinux-postfix-20041109 75
-MD5 db7cb110720f8ed0107c082896a36106 files/digest-selinux-postfix-20041120 75
+MD5 600a25115f6ebeab04109915f2e57015 selinux-postfix-20041211.ebuild 391
+MD5 019734c900f298c6144fcb9fd9239b33 files/digest-selinux-postfix-20041211 75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBo23XGSBEIeh4AEYRAsWiAKCEzB9NXbmdXJquJFJVqbaRtPZhkQCfZgMp
-/PsNxThVJETnO22zhM7e57I=
-=E7YL
+iD8DBQFBvDC+GSBEIeh4AEYRAi+SAKCNj815APEcwJPfexv3zzpDzd86owCcDVoj
+AxDI8DGGU02zMA1u95iXrIE=
+=0K0o
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20040427 b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20040427
deleted file mode 100644
index 9d8bf1f69f99..000000000000
--- a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20040427
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2efce51a71917c11714e994568a67768 selinux-postfix-20040427.tar.bz2 3180
diff --git a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041021 b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041021
deleted file mode 100644
index 267d1f2715a1..000000000000
--- a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041021
+++ /dev/null
@@ -1 +0,0 @@
-MD5 859a5ea2f6125d19b41126bfa9611b75 selinux-postfix-20041021.tar.bz2 3477
diff --git a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041109 b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041109
deleted file mode 100644
index 0e645e97e287..000000000000
--- a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041109
+++ /dev/null
@@ -1 +0,0 @@
-MD5 815e4637c032d9c7e6d05873395d4b35 selinux-postfix-20041109.tar.bz2 3459
diff --git a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041120 b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041120
deleted file mode 100644
index b4a620b89114..000000000000
--- a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041120
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2068460dd02304165ba7d596d412222 selinux-postfix-20041120.tar.bz2 3490
diff --git a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041211 b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041211
new file mode 100644
index 000000000000..b5429d7d3314
--- /dev/null
+++ b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20041211
@@ -0,0 +1 @@
+MD5 16c9a6e86e0c6ab6e0eafdd073ce1874 selinux-postfix-20041211.tar.bz2 3505
diff --git a/sec-policy/selinux-postfix/selinux-postfix-20040427.ebuild b/sec-policy/selinux-postfix/selinux-postfix-20040427.ebuild
deleted file mode 100644
index 8c08ffeadab6..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-20040427.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-20040427.ebuild,v 1.3 2004/09/20 01:55:47 pebenito Exp $
-
-TEFILES="postfix.te"
-FCFILES="postfix.fc"
-IUSE=""
-
-inherit selinux-policy
-
-DESCRIPTION="SELinux policy for postfix"
-
-KEYWORDS="x86 ppc sparc amd64"
-
diff --git a/sec-policy/selinux-postfix/selinux-postfix-20041021.ebuild b/sec-policy/selinux-postfix/selinux-postfix-20041021.ebuild
deleted file mode 100644
index 13f2dd501271..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-20041021.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-20041021.ebuild,v 1.1 2004/10/27 13:14:18 kaiowas Exp $
-
-inherit selinux-policy
-
-TEFILES="postfix.te"
-FCFILES="postfix.fc"
-IUSE=""
-
-DESCRIPTION="SELinux policy for postfix"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-
diff --git a/sec-policy/selinux-postfix/selinux-postfix-20041109.ebuild b/sec-policy/selinux-postfix/selinux-postfix-20041109.ebuild
deleted file mode 100644
index b0be753c4602..000000000000
--- a/sec-policy/selinux-postfix/selinux-postfix-20041109.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-20041109.ebuild,v 1.1 2004/11/13 18:58:19 kaiowas Exp $
-
-inherit selinux-policy
-
-TEFILES="postfix.te"
-FCFILES="postfix.fc"
-IUSE=""
-
-DESCRIPTION="SELinux policy for postfix"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-
diff --git a/sec-policy/selinux-postfix/selinux-postfix-20041120.ebuild b/sec-policy/selinux-postfix/selinux-postfix-20041211.ebuild
index 1ff6d9b348bb..316f9cf34c7f 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-20041120.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-20041211.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-20041120.ebuild,v 1.2 2004/11/23 17:12:03 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-20041211.ebuild,v 1.1 2004/12/12 12:39:11 kaiowas Exp $
 
 inherit selinux-policy