diff options
| author |   Petre Rodan <kaiowas@gentoo.org> | 2004-12-12 12:20:32 +0000 |
|---|---|---|
| committer | Petre Rodan <kaiowas@gentoo.org> | 2004-12-12 12:20:32 +0000 |
| commit | 183fa933ad76a520894a9576533b659b38a0f0de (patch) | |
| tree | db3f7cb75700e4343cafac2ea870bed05b37fb59 /sec-policy/selinux-gpm | |
| parent | merge with upstream policy (Manifest recommit) (diff) | |
| download | gentoo-2-183fa933ad76a520894a9576533b659b38a0f0de.tar.gz gentoo-2-183fa933ad76a520894a9576533b659b38a0f0de.tar.bz2 gentoo-2-183fa933ad76a520894a9576533b659b38a0f0de.zip | |
trivial merge with upstream policy
Diffstat (limited to 'sec-policy/selinux-gpm')
| -rw-r--r-- | sec-policy/selinux-gpm/ChangeLog | 8 | ||||
| -rw-r--r-- | sec-policy/selinux-gpm/Manifest | 14 | ||||
| -rw-r--r-- | sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110 | 1 | ||||
| -rw-r--r-- | sec-policy/selinux-gpm/files/digest-selinux-gpm-20041128 | 1 | ||||
| -rw-r--r-- | sec-policy/selinux-gpm/selinux-gpm-20041128.ebuild (renamed from sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild) | 2 |
5 files changed, 11 insertions, 15 deletions
diff --git a/sec-policy/selinux-gpm/ChangeLog b/sec-policy/selinux-gpm/ChangeLog index b2a36a8c238f..2965e113fce2 100644 --- a/sec-policy/selinux-gpm/ChangeLog +++ b/sec-policy/selinux-gpm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sec-policy/selinux-gpm # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/ChangeLog,v 1.4 2004/11/13 19:51:56 kaiowas Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/ChangeLog,v 1.5 2004/12/12 12:20:32 kaiowas Exp $ + +*selinux-gpm-20041128 (12 Dec 2004) + + 12 Dec 2004; petre rodan <kaiowas@gentoo.org> + -selinux-gpm-20041110.ebuild, +selinux-gpm-20041128.ebuild: + trivial merge with upstream policy *selinux-gpm-20041110 (13 Nov 2004) diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest index 075bbbf8c71a..b25ba0bca79b 100644 --- a/sec-policy/selinux-gpm/Manifest +++ b/sec-policy/selinux-gpm/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 6d53a4cead85d899d2bc5f5ec87252c8 ChangeLog 709 MD5 3e6e642d7c225b0a478a79a65f1e3d03 metadata.xml 390 -MD5 95a2eec02ea64a9fcce1342697897509 selinux-gpm-20041110.ebuild 392 -MD5 66f1ea5ef8c0b48898d67ed2269a6518 files/digest-selinux-gpm-20041110 70 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBljlxGSBEIeh4AEYRAvy3AJ9SkIPeuBdaT5pyEn1d1QXBTh8luQCfUiKK -H2Wro/TmyxmlQ+cYVC611ic= -=6b6S ------END PGP SIGNATURE----- +MD5 a48c02131ff94594e11600812220856c selinux-gpm-20041128.ebuild 283 +MD5 7d954a79972d764133c0cbcb3ea6d917 files/digest-selinux-gpm-20041128 70 diff --git a/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110 b/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110 deleted file mode 100644 index c2bcea7ac8f5..000000000000 --- a/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041110 +++ /dev/null @@ -1 +0,0 @@ -MD5 ffe60e86518e5477665e05c748cf6192 selinux-gpm-20041110.tar.bz2 873 diff --git a/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041128 b/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041128 new file mode 100644 index 000000000000..fac62e289aa3 --- /dev/null +++ b/sec-policy/selinux-gpm/files/digest-selinux-gpm-20041128 @@ -0,0 +1 @@ +MD5 f7dbe6a8f2265da3776c38ee722df613 selinux-gpm-20041128.tar.bz2 862 diff --git a/sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild b/sec-policy/selinux-gpm/selinux-gpm-20041128.ebuild index 7444ef18b9da..575bf11396db 100644 --- a/sec-policy/selinux-gpm/selinux-gpm-20041110.ebuild +++ b/sec-policy/selinux-gpm/selinux-gpm-20041128.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-gpm/selinux-gpm-20041110.ebuild,v 1.1 2004/11/13 19:51:56 kaiowas Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/selinux-gpm-20041128.ebuild,v 1.1 2004/12/12 12:20:32 kaiowas Exp $ inherit selinux-policy |