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-ntp/ChangeLog | 8 +++++++- sec-policy/selinux-ntp/Manifest | 14 ++------------ sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918 | 1 - sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122 | 1 + sec-policy/selinux-ntp/selinux-ntp-20050918.ebuild | 15 --------------- sec-policy/selinux-ntp/selinux-ntp-20051122.ebuild | 15 +++++++++++++++ 6 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918 create mode 100644 sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122 delete mode 100644 sec-policy/selinux-ntp/selinux-ntp-20050918.ebuild create mode 100644 sec-policy/selinux-ntp/selinux-ntp-20051122.ebuild (limited to 'sec-policy/selinux-ntp') diff --git a/sec-policy/selinux-ntp/ChangeLog b/sec-policy/selinux-ntp/ChangeLog index db992d352440..0dbace0b2966 100644 --- a/sec-policy/selinux-ntp/ChangeLog +++ b/sec-policy/selinux-ntp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sec-policy/selinux-ntp # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.17 2005/10/27 19:03:26 kaiowas Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.18 2005/11/28 09:09:55 kaiowas Exp $ + +*selinux-ntp-20051122 (28 Nov 2005) + + 28 Nov 2005; petre rodan + -selinux-ntp-20050918.ebuild, +selinux-ntp-20051122.ebuild: + merge with upstream 27 Oct 2005; petre rodan selinux-ntp-20051023.ebuild: mark stable on amd64 mips ppc sparc x86 diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest index 17002325d349..2433f153c70c 100644 --- a/sec-policy/selinux-ntp/Manifest +++ b/sec-policy/selinux-ntp/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 64fb8645db41149e5692179069015307 ChangeLog 2364 -MD5 61c66db11638dd8eb879fa487fa4750b files/digest-selinux-ntp-20050918 71 MD5 e0719cd21ec4ffcd66c3c1d57cbcc596 files/digest-selinux-ntp-20051023 71 +MD5 6874234b1f5a59a5f421fd50c8a56bdc files/digest-selinux-ntp-20051122 71 MD5 ed58290361b061defc07c7f48ee829af metadata.xml 532 -MD5 8f7d71e14e5f15877334aef6bfb809d1 selinux-ntp-20050918.ebuild 459 MD5 848b9309a916d59d15da445e5759749f selinux-ntp-20051023.ebuild 459 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFDYSVuGSBEIeh4AEYRAgDrAJ9hYpq0I/oHqgliKw44M8p8xjeVkgCggUus -8F69oY4XeqljhWBDOqNI1AQ= -=fWxG ------END PGP SIGNATURE----- +MD5 9462ef5eebc48ad0691093b9fd576b0b selinux-ntp-20051122.ebuild 355 diff --git a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918 b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918 deleted file mode 100644 index ebb302ea7ed9..000000000000 --- a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918 +++ /dev/null @@ -1 +0,0 @@ -MD5 62b7c72ba016b7cb32d19860fd1eb666 selinux-ntp-20050918.tar.bz2 1437 diff --git a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122 b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122 new file mode 100644 index 000000000000..0e81caa0b1e9 --- /dev/null +++ b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122 @@ -0,0 +1 @@ +MD5 70378c6a643440032eee2961da70a39c selinux-ntp-20051122.tar.bz2 1483 diff --git a/sec-policy/selinux-ntp/selinux-ntp-20050918.ebuild b/sec-policy/selinux-ntp/selinux-ntp-20050918.ebuild deleted file mode 100644 index 94e3ca70f2c6..000000000000 --- a/sec-policy/selinux-ntp/selinux-ntp-20050918.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-ntp/selinux-ntp-20050918.ebuild,v 1.2 2005/10/18 10:42:19 kaiowas Exp $ - -inherit selinux-policy - -TEFILES="ntpd.te" -FCFILES="ntpd.fc" -IUSE="" -RDEPEND=">=sec-policy/selinux-base-policy-20050618" - -DESCRIPTION="SELinux policy for the network time protocol daemon" - -KEYWORDS="amd64 mips ppc sparc x86" - diff --git a/sec-policy/selinux-ntp/selinux-ntp-20051122.ebuild b/sec-policy/selinux-ntp/selinux-ntp-20051122.ebuild new file mode 100644 index 000000000000..a455151fcc84 --- /dev/null +++ b/sec-policy/selinux-ntp/selinux-ntp-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-ntp/selinux-ntp-20051122.ebuild,v 1.1 2005/11/28 09:09:55 kaiowas Exp $ + +inherit selinux-policy + +TEFILES="ntpd.te" +FCFILES="ntpd.fc" +IUSE="" +RDEPEND=">=sec-policy/selinux-base-policy-20050618" + +DESCRIPTION="SELinux policy for the network time protocol daemon" + +KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" + -- cgit v1.2.3-65-gdbad