From c91c5ee950425279a28645bf54ee62608a43da83 Mon Sep 17 00:00:00 2001 From: Petre Rodan Date: Mon, 22 Nov 2004 21:15:52 +0000 Subject: [PATCH] merge with nsa policy --- sec-policy/selinux-snort/ChangeLog | 8 +++++++- sec-policy/selinux-snort/Manifest | 12 ++---------- .../files/digest-selinux-snort-20041117 | 1 + .../selinux-snort/selinux-snort-20041117.ebuild | 14 ++++++++++++++ sec-policy/selinux-spamassassin/ChangeLog | 8 +++++++- sec-policy/selinux-spamassassin/Manifest | 12 ++---------- .../files/digest-selinux-spamassassin-20041119 | 1 + .../selinux-spamassassin-20041119.ebuild | 15 +++++++++++++++ sec-policy/selinux-squid/ChangeLog | 8 +++++++- sec-policy/selinux-squid/Manifest | 12 ++---------- .../files/digest-selinux-squid-20041120 | 1 + .../selinux-squid/selinux-squid-20041120.ebuild | 16 ++++++++++++++++ sec-policy/selinux-stunnel/Manifest | 10 ++++++---- 13 files changed, 81 insertions(+), 37 deletions(-) create mode 100644 sec-policy/selinux-snort/files/digest-selinux-snort-20041117 create mode 100644 sec-policy/selinux-snort/selinux-snort-20041117.ebuild create mode 100644 sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20041119 create mode 100644 sec-policy/selinux-spamassassin/selinux-spamassassin-20041119.ebuild create mode 100644 sec-policy/selinux-squid/files/digest-selinux-squid-20041120 create mode 100644 sec-policy/selinux-squid/selinux-squid-20041120.ebuild diff --git a/sec-policy/selinux-snort/ChangeLog b/sec-policy/selinux-snort/ChangeLog index 12bd2e2c2cb0..a085af9db9d9 100644 --- a/sec-policy/selinux-snort/ChangeLog +++ b/sec-policy/selinux-snort/ChangeLog @@ -1,6 +1,12 @@ # 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.4 2004/11/13 20:11:05 kaiowas Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/ChangeLog,v 1.5 2004/11/22 21:10:01 kaiowas Exp $ + +*selinux-snort-20041117 (22 Nov 2004) + + 22 Nov 2004; petre rodan + +selinux-snort-20041117.ebuild: + merge with nsa policy *selinux-snort-20041028 (13 Nov 2004) diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest index 71ba562cd62e..b2519dc44796 100644 --- a/sec-policy/selinux-snort/Manifest +++ b/sec-policy/selinux-snort/Manifest @@ -1,14 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 c76c34ce99cac114413f4e50b91d9c79 ChangeLog 409 MD5 a6b87455345059b8524871b4023efe74 metadata.xml 391 +MD5 d99076c6c4b3f420f24e0559019b4f33 selinux-snort-20041117.ebuild 272 MD5 4d7e7bdf7451151e49199ef4cb08cc26 selinux-snort-20041028.ebuild 381 +MD5 2a7e7436c2c1d4917a2fe49886fef0b1 files/digest-selinux-snort-20041117 72 MD5 1ecd9206d089e822fff5f8b4a17d865f files/digest-selinux-snort-20041028 72 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBljuEGSBEIeh4AEYRAlevAJ9LAfyiX5S7oZyrhaCBKdw8fBKaqgCgjSQN -Bn3yZ4oPLusbPSylY9DueEA= -=I1CM ------END PGP SIGNATURE----- diff --git a/sec-policy/selinux-snort/files/digest-selinux-snort-20041117 b/sec-policy/selinux-snort/files/digest-selinux-snort-20041117 new file mode 100644 index 000000000000..1631648db752 --- /dev/null +++ b/sec-policy/selinux-snort/files/digest-selinux-snort-20041117 @@ -0,0 +1 @@ +MD5 288701b5b3a8379d499e89cba8ffeeca selinux-snort-20041117.tar.bz2 728 diff --git a/sec-policy/selinux-snort/selinux-snort-20041117.ebuild b/sec-policy/selinux-snort/selinux-snort-20041117.ebuild new file mode 100644 index 000000000000..657ea030f3fd --- /dev/null +++ b/sec-policy/selinux-snort/selinux-snort-20041117.ebuild @@ -0,0 +1,14 @@ +# 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-20041117.ebuild,v 1.1 2004/11/22 21:10:01 kaiowas Exp $ + +inherit selinux-policy + +TEFILES="snort.te" +FCFILES="snort.fc" +IUSE="" + +DESCRIPTION="SELinux policy for snort" + +KEYWORDS="~x86 ~ppc ~sparc ~amd64" + diff --git a/sec-policy/selinux-spamassassin/ChangeLog b/sec-policy/selinux-spamassassin/ChangeLog index 8a2d13609dcc..067b71c997d6 100644 --- a/sec-policy/selinux-spamassassin/ChangeLog +++ b/sec-policy/selinux-spamassassin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sec-policy/selinux-spamassassin # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.1 2004/07/05 03:16:28 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.2 2004/11/22 21:13:01 kaiowas Exp $ + +*selinux-spamassassin-20041119 (22 Nov 2004) + + 22 Nov 2004; petre rodan + +selinux-spamassassin-20041119.ebuild: + merge with nsa policy *selinux-spamassassin-20040704 (04 Jul 2004) diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest index e853e3a76bd9..245065c4934b 100644 --- a/sec-policy/selinux-spamassassin/Manifest +++ b/sec-policy/selinux-spamassassin/Manifest @@ -1,14 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 1954a1b138db8c37c5f04cf5dd543ff8 ChangeLog 409 MD5 df50b670def71c1790352df31ff8c44f metadata.xml 303 MD5 51431d48486ac340b6b7c3e0809ae737 selinux-spamassassin-20040704.ebuild 485 +MD5 28cad12ea1fbcb62af063b1f1727ecd6 selinux-spamassassin-20041119.ebuild 361 MD5 db611ee47b7b0bac22cf6f366b0e4e93 files/digest-selinux-spamassassin-20040704 80 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.5 (GNU/Linux) - -iD8DBQFBTjkBGFJQsIJWJy4RAoW5AJ95nblw/QYlhlnEJ8KiAugiItJyAgCfTM7H -X9HcD5iYXiZhaFfyu07uJX0= -=zCJa ------END PGP SIGNATURE----- +MD5 a84b040682f569a6f8da4b9d5077e4d0 files/digest-selinux-spamassassin-20041119 80 diff --git a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20041119 b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20041119 new file mode 100644 index 000000000000..b7a6ac4a0e76 --- /dev/null +++ b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20041119 @@ -0,0 +1 @@ +MD5 80e9844691ee351cb5108f0835c5fb31 selinux-spamassassin-20041119.tar.bz2 2217 diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-20041119.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-20041119.ebuild new file mode 100644 index 000000000000..93dcee548422 --- /dev/null +++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-20041119.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-spamassassin/selinux-spamassassin-20041119.ebuild,v 1.1 2004/11/22 21:13:01 kaiowas Exp $ + +inherit selinux-policy + +TEFILES="spamassassin.te spamc.te spamd.te" +FCFILES="spamassassin.fc spamc.fc spamd.fc" +MACROS="spamassassin_macros.te" +IUSE="" + +DESCRIPTION="SELinux policy for SpamAssassin" + +KEYWORDS="~x86 ~ppc ~sparc ~amd64" + diff --git a/sec-policy/selinux-squid/ChangeLog b/sec-policy/selinux-squid/ChangeLog index d6724e218330..c20a77987cac 100644 --- a/sec-policy/selinux-squid/ChangeLog +++ b/sec-policy/selinux-squid/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sec-policy/selinux-squid # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.5 2004/11/13 19:04:50 kaiowas Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.6 2004/11/22 21:15:52 kaiowas Exp $ + +*selinux-squid-20041120 (22 Nov 2004) + + 22 Nov 2004; petre rodan + +selinux-squid-20041120.ebuild: + merge with nsa policy *selinux-squid-20041109 (13 Nov 2004) diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest index 0b1e22202006..ecbafe50b178 100644 --- a/sec-policy/selinux-squid/Manifest +++ b/sec-policy/selinux-squid/Manifest @@ -1,16 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 93d5f70cbbcbd71da044c987ae8e15e4 ChangeLog 939 MD5 24c0cb2d4ce8da969c77f6ada1f8e60c metadata.xml 530 MD5 49231dc4cb4889208fc1db99680122f4 selinux-squid-20040106.ebuild 382 +MD5 9e1cac3749ebfb97a2deb979c42f41df selinux-squid-20041120.ebuild 325 MD5 75547e0314eea980756dc5ad85b4009e selinux-squid-20041109.ebuild 438 MD5 f58029b1e34511ea86b828ba9c4932c2 files/digest-selinux-squid-20040106 73 MD5 f5ed2fcce0e51005a8e47002129845d8 files/digest-selinux-squid-20041109 73 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBljLUGSBEIeh4AEYRAlGnAJwNZng1AYgqLzfihpLkKmR+CGWluACdFO2s -nnSq7F24PD2/Qsd9Aj0Q6sI= -=fq5k ------END PGP SIGNATURE----- +MD5 3bd772328886d221f62b99987b9e079a files/digest-selinux-squid-20041120 73 diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20041120 b/sec-policy/selinux-squid/files/digest-selinux-squid-20041120 new file mode 100644 index 000000000000..d0b0f43f2517 --- /dev/null +++ b/sec-policy/selinux-squid/files/digest-selinux-squid-20041120 @@ -0,0 +1 @@ +MD5 1d51143fa950f0bac36d310462d93aa7 selinux-squid-20041120.tar.bz2 1243 diff --git a/sec-policy/selinux-squid/selinux-squid-20041120.ebuild b/sec-policy/selinux-squid/selinux-squid-20041120.ebuild new file mode 100644 index 000000000000..f047d42926a7 --- /dev/null +++ b/sec-policy/selinux-squid/selinux-squid-20041120.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-20041120.ebuild,v 1.1 2004/11/22 21:15:52 kaiowas Exp $ + +inherit selinux-policy + +TEFILES="squid.te" +FCFILES="squid.fc" +IUSE="" + +DESCRIPTION="SELinux policy for squid" + +KEYWORDS="~x86 ~ppc ~sparc ~amd64" + +RDEPEND=">=sec-policy/selinux-base-policy-20041023" + diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest index 54c76582128c..70f24a1e53dc 100644 --- a/sec-policy/selinux-stunnel/Manifest +++ b/sec-policy/selinux-stunnel/Manifest @@ -1,14 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 89e75a8124b36561829b4de7be5df28b ChangeLog 384 +MD5 ae3c2dd5cbeaefa0821b4226b1fce04c ChangeLog 528 MD5 4589f0004a12b9e69d69d6fbea17c95f metadata.xml 509 MD5 33dee60010e5ac3d55be33452b74b896 selinux-stunnel-20041112.ebuild 395 +MD5 c04993ebe059f28dd70ecc102d4937a2 selinux-stunnel-20041119.ebuild 395 MD5 555ad264358e78df4109887e6988f1ba files/digest-selinux-stunnel-20041112 74 +MD5 6b21ae4d2108d6ba7fe95e5c435bf4e1 files/digest-selinux-stunnel-20041119 74 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBl7cQGSBEIeh4AEYRAs0uAJ9LDtcVShGIZlS9SFh8I3nHQG1TJwCeM1Xx -KWx2dzmxIVavezAGe2MVG/E= -=e2r0 +iD8DBQFBokEZGSBEIeh4AEYRAqq4AJ9R4+7U9bEvFTLR+rOF3GUKpPKfwgCeJJ/s +wxyxPeGKQzEEwiSlc4bAkPQ= +=s/Sc -----END PGP SIGNATURE----- -- 2.26.2