From afcfd759a25e75a66ef65210a4c983cd4a1385b6 Mon Sep 17 00:00:00 2001 From: Petre Rodan Date: Sat, 13 Nov 2004 20:11:05 +0000 Subject: [PATCH] merge with nsa policy, cleanup --- sec-policy/selinux-snort/ChangeLog | 16 +++++----------- sec-policy/selinux-snort/Manifest | 14 +++++++------- .../files/digest-selinux-snort-20040412 | 1 - .../files/digest-selinux-snort-20041028 | 1 + ...0412.ebuild => selinux-snort-20041028.ebuild} | 6 +++--- 5 files changed, 16 insertions(+), 22 deletions(-) delete mode 100644 sec-policy/selinux-snort/files/digest-selinux-snort-20040412 create mode 100644 sec-policy/selinux-snort/files/digest-selinux-snort-20041028 rename sec-policy/selinux-snort/{selinux-snort-20040412.ebuild => selinux-snort-20041028.ebuild} (82%) diff --git a/sec-policy/selinux-snort/ChangeLog b/sec-policy/selinux-snort/ChangeLog index 03d4da092655..12bd2e2c2cb0 100644 --- a/sec-policy/selinux-snort/ChangeLog +++ b/sec-policy/selinux-snort/ChangeLog @@ -1,16 +1,10 @@ # ChangeLog for sec-policy/selinux-snort # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/ChangeLog,v 1.3 2004/06/28 00:10:37 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/ChangeLog,v 1.4 2004/11/13 20:11:05 kaiowas Exp $ -*selinux-snort-20040412 (12 Apr 2004) +*selinux-snort-20041028 (13 Nov 2004) - 12 Apr 2004; Chris PeBenito - selinux-snort-20040116.ebuild, selinux-snort-20040412.ebuild: - Badly needed update to fix syntax error in snort.te. - -*selinux-snort-20040116 (16 Jan 2004) - - 16 Jan 2004; Chris PeBenito metadata.xml, - selinux-snort-20040116.ebuild: - Initial commit. Gentoo fixes by Patrick and Bill McCarty. + 13 Nov 2004; petre rodan + -selinux-snort-20040412.ebuild, +selinux-snort-20041028.ebuild: + merge with nsa policy, cleanup diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest index e03659440639..71ba562cd62e 100644 --- a/sec-policy/selinux-snort/Manifest +++ b/sec-policy/selinux-snort/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 871dde11933c9a2ae1c94d203daac61d ChangeLog 634 +MD5 c76c34ce99cac114413f4e50b91d9c79 ChangeLog 409 MD5 a6b87455345059b8524871b4023efe74 metadata.xml 391 -MD5 e2f3534a3b4399f62b832e07aa1abbbb selinux-snort-20040412.ebuild 382 -MD5 a9e1d9ae3aa93355788b13cdad297918 files/digest-selinux-snort-20040412 72 +MD5 4d7e7bdf7451151e49199ef4cb08cc26 selinux-snort-20041028.ebuild 381 +MD5 1ecd9206d089e822fff5f8b4a17d865f files/digest-selinux-snort-20041028 72 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.5 (GNU/Linux) +Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBTjjvGFJQsIJWJy4RAlbbAJ9tNld/9CfQc9CQ1m+zUtW8gGOqcwCeNQTd -PjBzeSxhGTIxa0N7eO9kX6A= -=7Lfq +iD8DBQFBljuEGSBEIeh4AEYRAlevAJ9LAfyiX5S7oZyrhaCBKdw8fBKaqgCgjSQN +Bn3yZ4oPLusbPSylY9DueEA= +=I1CM -----END PGP SIGNATURE----- diff --git a/sec-policy/selinux-snort/files/digest-selinux-snort-20040412 b/sec-policy/selinux-snort/files/digest-selinux-snort-20040412 deleted file mode 100644 index 4529dc2f37b6..000000000000 --- a/sec-policy/selinux-snort/files/digest-selinux-snort-20040412 +++ /dev/null @@ -1 +0,0 @@ -MD5 e249bb69ec3d085d641383d0f73520fd selinux-snort-20040412.tar.bz2 816 diff --git a/sec-policy/selinux-snort/files/digest-selinux-snort-20041028 b/sec-policy/selinux-snort/files/digest-selinux-snort-20041028 new file mode 100644 index 000000000000..825eb2941dde --- /dev/null +++ b/sec-policy/selinux-snort/files/digest-selinux-snort-20041028 @@ -0,0 +1 @@ +MD5 6dd549565dc00e68bfc33f43cb693a7d selinux-snort-20041028.tar.bz2 728 diff --git a/sec-policy/selinux-snort/selinux-snort-20040412.ebuild b/sec-policy/selinux-snort/selinux-snort-20041028.ebuild similarity index 82% rename from sec-policy/selinux-snort/selinux-snort-20040412.ebuild rename to sec-policy/selinux-snort/selinux-snort-20041028.ebuild index 95e140b29cce..9872c14f28bd 100644 --- a/sec-policy/selinux-snort/selinux-snort-20040412.ebuild +++ b/sec-policy/selinux-snort/selinux-snort-20041028.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-20040412.ebuild,v 1.3 2004/09/20 01:55:47 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-20041028.ebuild,v 1.1 2004/11/13 20:11:05 kaiowas Exp $ + +inherit selinux-policy TEFILES="snort.te" FCFILES="snort.fc" IUSE="" -inherit selinux-policy - DESCRIPTION="SELinux policy for snort" KEYWORDS="x86 ppc sparc amd64" -- 2.26.2