From 0b2fca607734b1815aa37ac1d39bdd0b4c7acd7c Mon Sep 17 00:00:00 2001 From: Petre Rodan Date: Mon, 28 Nov 2005 09:09:55 +0000 Subject: merge with upstream (Portage version: 2.0.53_rc7) --- sec-policy/selinux-mysql/ChangeLog | 8 +++++++- sec-policy/selinux-mysql/Manifest | 14 ++------------ .../selinux-mysql/files/digest-selinux-mysql-20050605 | 1 - .../selinux-mysql/files/digest-selinux-mysql-20051122 | 1 + sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild | 15 --------------- sec-policy/selinux-mysql/selinux-mysql-20051122.ebuild | 15 +++++++++++++++ 6 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605 create mode 100644 sec-policy/selinux-mysql/files/digest-selinux-mysql-20051122 delete mode 100644 sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild create mode 100644 sec-policy/selinux-mysql/selinux-mysql-20051122.ebuild (limited to 'sec-policy/selinux-mysql') diff --git a/sec-policy/selinux-mysql/ChangeLog b/sec-policy/selinux-mysql/ChangeLog index 412a02b3b1da..04a4f22f65c2 100644 --- a/sec-policy/selinux-mysql/ChangeLog +++ b/sec-policy/selinux-mysql/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sec-policy/selinux-mysql # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.15 2005/10/27 19:01:38 kaiowas Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.16 2005/11/28 09:07:19 kaiowas Exp $ + +*selinux-mysql-20051122 (28 Nov 2005) + + 28 Nov 2005; petre rodan + -selinux-mysql-20050605.ebuild, +selinux-mysql-20051122.ebuild: + merge with upstream 27 Oct 2005; petre rodan selinux-mysql-20051023.ebuild: diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest index 6ae1430c5a29..4b491b13fd0f 100644 --- a/sec-policy/selinux-mysql/Manifest +++ b/sec-policy/selinux-mysql/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 fa9807bad61f09a5308c88dda08e3c6c ChangeLog 2337 -MD5 95b181aed42460f40e3aabd98bf6bcbb files/digest-selinux-mysql-20050605 73 MD5 2080fa4a60e9b1e15f533a6685124fb8 files/digest-selinux-mysql-20051023 73 +MD5 d30135f78d0f9a4110b760747512e19b files/digest-selinux-mysql-20051122 73 MD5 46e72c8d2f5d2d58d53e25b822d9e4c9 metadata.xml 507 -MD5 a9091c4fc27d6312a1942f60d0715047 selinux-mysql-20050605.ebuild 435 MD5 7af3ba42bb882d2f6ab17db4d5bf167c selinux-mysql-20051023.ebuild 440 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFDYST2GSBEIeh4AEYRAu4/AJ4/J+CKyzNHWdMAteWihLRk/q4fHgCfTIaI -TwXD1x9QFvz1iq41pQCbM0w= -=Ssb3 ------END PGP SIGNATURE----- +MD5 fd3f989400f72c073d2050f72d0fac12 selinux-mysql-20051122.ebuild 332 diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605 deleted file mode 100644 index f60d1aba5865..000000000000 --- a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605 +++ /dev/null @@ -1 +0,0 @@ -MD5 caf039db9bb2085462e10c7740542067 selinux-mysql-20050605.tar.bz2 1168 diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20051122 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20051122 new file mode 100644 index 000000000000..13294f5882f8 --- /dev/null +++ b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20051122 @@ -0,0 +1 @@ +MD5 925cdc451364a2870320990220abc93a selinux-mysql-20051122.tar.bz2 1235 diff --git a/sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild b/sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild deleted file mode 100644 index 161a850ab571..000000000000 --- a/sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild,v 1.2 2005/06/27 11:34:54 kaiowas Exp $ - -inherit selinux-policy - -TEFILES="mysqld.te" -FCFILES="mysqld.fc" -IUSE="" -RDEPEND=">=sec-policy/selinux-base-policy-20050224" - -DESCRIPTION="SELinux policy for mysql" - -KEYWORDS="x86 ppc sparc amd64" - diff --git a/sec-policy/selinux-mysql/selinux-mysql-20051122.ebuild b/sec-policy/selinux-mysql/selinux-mysql-20051122.ebuild new file mode 100644 index 000000000000..48b9775bda48 --- /dev/null +++ b/sec-policy/selinux-mysql/selinux-mysql-20051122.ebuild @@ -0,0 +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-mysql/selinux-mysql-20051122.ebuild,v 1.1 2005/11/28 09:07:19 kaiowas Exp $ + +inherit selinux-policy + +TEFILES="mysqld.te" +FCFILES="mysqld.fc" +IUSE="" +RDEPEND=">=sec-policy/selinux-base-policy-20050224" + +DESCRIPTION="SELinux policy for mysql" + +KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" + -- cgit v1.2.3-65-gdbad