merge with upstream policy

diff --git a/sec-policy/selinux-gnupg/ChangeLog b/sec-policy/selinux-gnupg/ChangeLog
index e0d530580ab6cc03ce42fe24246edd8bff87106b..1e89ed7149ab957bf95cf78ef7238038f8cb15df 100644 (file)
--- a/sec-policy/selinux-gnupg/ChangeLog
+++ b/sec-policy/selinux-gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gnupg
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/ChangeLog,v 1.2 2004/11/13 19:48:01 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/ChangeLog,v 1.3 2004/12/12 12:16:57 kaiowas Exp $
+
+*selinux-gnupg-20041120 (12 Dec 2004)
+
+  12 Dec 2004; petre rodan <kaiowas@gentoo.org>
+  +selinux-gnupg-20041120.ebuild:
+  merge with upstream policy
 
 *selinux-gnupg-20041109 (13 Nov 2004)
 

diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20041120 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20041120
new file mode 100644 (file)
index 0000000..f2f5a3a
--- /dev/null
+++ b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20041120
@@ -0,0 +1 @@
+MD5 e69f095f23e7a072db2a880a78cc4ccc selinux-gnupg-20041120.tar.bz2 2694

diff --git a/sec-policy/selinux-gnupg/selinux-gnupg-20041120.ebuild b/sec-policy/selinux-gnupg/selinux-gnupg-20041120.ebuild
new file mode 100644 (file)
index 0000000..3caee61
--- /dev/null
+++ b/sec-policy/selinux-gnupg/selinux-gnupg-20041120.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/selinux-gnupg-20041120.ebuild,v 1.1 2004/12/12 12:16:57 kaiowas Exp $
+
+inherit selinux-policy
+
+TEFILES="gpg.te"
+FCFILES="gpg.fc"
+MACROS="gpg_macros.te"
+IUSE=""
+
+DESCRIPTION="SELinux policy for GNU privacy guard"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+

diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index 075bbbf8c71a88dbeafb03c7941f2d020458ff17..7f1f6162b41ed4b718f4752f5e1525ad15c3a442 100644 (file)
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6d53a4cead85d899d2bc5f5ec87252c8 ChangeLog 709
+MD5 1304879604f2acbf0f85bbcd44c86835 ChangeLog 894
 MD5 3e6e642d7c225b0a478a79a65f1e3d03 metadata.xml 390
-MD5 95a2eec02ea64a9fcce1342697897509 selinux-gpm-20041110.ebuild 392
-MD5 66f1ea5ef8c0b48898d67ed2269a6518 files/digest-selinux-gpm-20041110 70
+MD5 01dc8dc868cb76e9b889a4b9b5e9b800 selinux-gpm-20041128.ebuild 392
+MD5 7d954a79972d764133c0cbcb3ea6d917 files/digest-selinux-gpm-20041128 70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBljlxGSBEIeh4AEYRAvy3AJ9SkIPeuBdaT5pyEn1d1QXBTh8luQCfUiKK
-H2Wro/TmyxmlQ+cYVC611ic=
-=6b6S
+iD8DBQFBvC9aGSBEIeh4AEYRAm38AKCAV4ovQ86qKsaLNYIMHG+S3C1pMQCeOrlt
+awkgxuqkauX3UYzOkOsoOds=
+=61nc
 -----END PGP SIGNATURE-----