merge with upstream policy

Package-Manager: portage-2.0.51-r15

6 files changed, 23 insertions, 18 deletions

diff --git a/sec-policy/selinux-postgresql/ChangeLog b/sec-policy/selinux-postgresql/ChangeLog
index 0793dcb9d96d..3240a4752dd5 100644
--- a/sec-policy/selinux-postgresql/ChangeLog
+++ b/sec-policy/selinux-postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-postgresql
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.7 2005/01/20 10:34:48 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.8 2005/02/25 08:14:35 kaiowas Exp $
+
+*selinux-postgresql-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-postgresql-20050119.ebuild, +selinux-postgresql-20050219.ebuild:
+  merge with upstream policy
 
 *selinux-postgresql-20050119 (20 Jan 2005)
 
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index e1a114d6678d..0cd22c2d0c23 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 53ecafe613d544b75324bc2b2ebd1bf1 ChangeLog 1345
+MD5 1554f0aacef85e60512f026677b9520e ChangeLog 1543
 MD5 169761c63f66d24015db4b712ba378b6 metadata.xml 513
-MD5 565e84f0e3604c813f4fbfe631fe701d selinux-postgresql-20050119.ebuild 463
+MD5 f9ed5a18379baac31e4f305372b810c4 selinux-postgresql-20050219.ebuild 462
 MD5 fb446eda4a75c6fe6af7c4c444de257a selinux-postgresql-20041211.ebuild 459
+MD5 bb44fcbe364e5daf5c167ab23abfd41d files/digest-selinux-postgresql-20050219 78
 MD5 ae9fb92028c9753a761a169475dc4b87 files/digest-selinux-postgresql-20041211 78
-MD5 015c4c879e28f4a562b55e03b33ab586 files/digest-selinux-postgresql-20050119 78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB735lGSBEIeh4AEYRArOWAJ98FNuJKSxj6B7XbRjso9U30mU4EACdHtCW
-4Wux0JOqJ6x7GLBfoBR8NZU=
-=/YU7
+iD8DBQFCHv5bGSBEIeh4AEYRAhqHAJ0Z+6uCv/p3Ahwm67iMNG++U1ri9ACeJD/l
+/L8kAEqQxnCG9naI5gQQig0=
+=VnwG
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050119 b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050119
deleted file mode 100644
index 201f65c6c039..000000000000
--- a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050119
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06b223afe55cfec272b0fa9a65e4ddc4 selinux-postgresql-20050119.tar.bz2 1714
diff --git a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050219 b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050219
new file mode 100644
index 000000000000..190122179eaa
--- /dev/null
+++ b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050219
@@ -0,0 +1 @@
+MD5 91b15bfe320e64e8578ad3c57a2807bc selinux-postgresql-20050219.tar.bz2 1691
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-20050119.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-20050219.ebuild
index 0d312946fb6c..8aede8e9c592 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-20050119.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-20050219.ebuild
@@ -1,16 +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-postgresql/selinux-postgresql-20050119.ebuild,v 1.1 2005/01/20 10:34:48 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/selinux-postgresql-20050219.ebuild,v 1.1 2005/02/25 08:14:35 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="postgresql.te"
 FCFILES="postgresql.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for PostgreSQL"
 
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
-RDEPEND=">=sec-policy/selinux-base-policy-20041023"
-
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 55e9afc8295e..0daeea6e89de 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2399913bb6a13414600128b7d9c1fc2b ChangeLog 665
+MD5 d4dd1ee437b2e05912be8953201a9f1f ChangeLog 869
 MD5 df50b670def71c1790352df31ff8c44f metadata.xml 303
-MD5 4105ea4ee3e5b6d4fa901e08060100a1 selinux-procmail-20041119.ebuild 396
-MD5 4c9ebd8ffd97af2f4abd32ddca26a742 selinux-procmail-20041028.ebuild 396
+MD5 a4294ca58e54670518f8f060aa66d9f1 selinux-procmail-20050219.ebuild 452
+MD5 60f66632f4f11fbae47d815c9f480955 selinux-procmail-20041119.ebuild 396
+MD5 7016674e43e74e32bc7e8a1ec2ef8110 files/digest-selinux-procmail-20050219 76
 MD5 0e8d168c7687fc4d6f91e92c3c2fa64c files/digest-selinux-procmail-20041119 76
-MD5 c3b9b7fa9b6e7c9bb05020e7246e8396 files/digest-selinux-procmail-20041028 76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBo235GSBEIeh4AEYRAuwSAJwLByvgiFfkxEIMO7Ki8ilGKLNH3ACfeA/j
-3Ab/vZp7yqB3nqlCyjkUsxY=
-=p0dn
+iD8DBQFCHv6JGSBEIeh4AEYRAtgWAJ9P4MdvXMuQ0H93ic1pLlZOg7qsBQCffafl
+tzS9ZB8qwzmKjjLkp4+d8xQ=
+=CvHX
 -----END PGP SIGNATURE-----