merge with upstream policy

7 files changed, 12 insertions, 34 deletions

diff --git a/sec-policy/selinux-postgresql/ChangeLog b/sec-policy/selinux-postgresql/ChangeLog
index 5c9f6b62940f..919a1b5e523f 100644
--- a/sec-policy/selinux-postgresql/ChangeLog
+++ b/sec-policy/selinux-postgresql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-postgresql
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.4 2004/11/23 17:13:16 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.5 2004/12/12 17:36:17 kaiowas Exp $
+
+*selinux-postgresql-20041211 (12 Dec 2004)
+
+  12 Dec 2004; petre rodan <kaiowas@gentoo.org>
+  -selinux-postgresql-20041002.ebuild, -selinux-postgresql-20041028.ebuild,
+  +selinux-postgresql-20041211.ebuild:
+  merge with upstream policy
 
   23 Nov 2004; petre rodan <kaiowas@gentoo.org>
   selinux-postgresql-20041120.ebuild:
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index c4ef7ede4174..65f6f23a6ae8 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1c5825f8b394c3ca999ba6dc49c59c0f ChangeLog 809
 MD5 169761c63f66d24015db4b712ba378b6 metadata.xml 513
-MD5 cb5e3e019cd90f1377339ffd95ac5c8f selinux-postgresql-20041002.ebuild 463
-MD5 44739fb8918954b341a5bf0ceda9d6aa selinux-postgresql-20041028.ebuild 463
 MD5 c54ee5047bf3c6234761eb941ae3a7f2 selinux-postgresql-20041120.ebuild 459
-MD5 f096309d0922d0b25c147fd0d2cbb73c files/digest-selinux-postgresql-20041002 78
-MD5 8ed1d6ee47ea4e879e130d6b68c88693 files/digest-selinux-postgresql-20041028 78
+MD5 f8d04b5c31b9a372df34f3acac2e5e5f selinux-postgresql-20041211.ebuild 340
+MD5 ae9fb92028c9753a761a169475dc4b87 files/digest-selinux-postgresql-20041211 78
 MD5 0fbca7c8e98902600683ed4eb2915c26 files/digest-selinux-postgresql-20041120 78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBo23oGSBEIeh4AEYRAiX2AJwNWReUCzltZ7+3lU9TUae09xUd5wCbBVIN
-ITkbgxbpm6+hoUkqb+epPRQ=
-=2ops
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041002 b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041002
deleted file mode 100644
index 3a13ef024aab..000000000000
--- a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041002
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e46dc0d9d728611be7e40330253326fb selinux-postgresql-20041002.tar.bz2 1600
diff --git a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041028 b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041028
deleted file mode 100644
index 2884018700fe..000000000000
--- a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041028
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b486743b38443b40f605d08ef5a0c3a8 selinux-postgresql-20041028.tar.bz2 1620
diff --git a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041211 b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041211
new file mode 100644
index 000000000000..806be0628325
--- /dev/null
+++ b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041211
@@ -0,0 +1 @@
+MD5 5dab72c1653806130f1379f5a25bc12c selinux-postgresql-20041211.tar.bz2 1694
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-20041028.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-20041028.ebuild
deleted file mode 100644
index 56895b2056ab..000000000000
--- a/sec-policy/selinux-postgresql/selinux-postgresql-20041028.ebuild
+++ /dev/null
@@ -1,16 +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-postgresql/selinux-postgresql-20041028.ebuild,v 1.1 2004/11/13 19:00:29 kaiowas Exp $
-
-inherit selinux-policy
-
-TEFILES="postgresql.te"
-FCFILES="postgresql.fc"
-IUSE=""
-
-DESCRIPTION="SELinux policy for PostgreSQL"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-
-RDEPEND=">=sec-policy/selinux-base-policy-20041023"
-
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-20041002.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-20041211.ebuild
index 653d6cf47959..be45d935ed15 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-20041002.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-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-postgresql/selinux-postgresql-20041002.ebuild,v 1.1 2004/10/23 13:58:12 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/selinux-postgresql-20041211.ebuild,v 1.1 2004/12/12 17:36:17 kaiowas Exp $
 
 inherit selinux-policy