summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetre Rodan <kaiowas@gentoo.org>2005-11-28 09:29:17 +0000
committerPetre Rodan <kaiowas@gentoo.org>2005-11-28 09:29:17 +0000
commit270c1efc61db29198211eeacc025e55874e9f0c4 (patch)
tree171237f5daf56827138464e0921cad1e49763490 /sec-policy/selinux-squid
parentadded mips keyword, marked stable on amd64 mips ppc sparc x86, merge with ups... (diff)
downloadgentoo-2-270c1efc61db29198211eeacc025e55874e9f0c4.tar.gz
gentoo-2-270c1efc61db29198211eeacc025e55874e9f0c4.tar.bz2
gentoo-2-270c1efc61db29198211eeacc025e55874e9f0c4.zip
merge with upstream
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'sec-policy/selinux-squid')
-rw-r--r--sec-policy/selinux-squid/ChangeLog8
-rw-r--r--sec-policy/selinux-squid/Manifest14
-rw-r--r--sec-policy/selinux-squid/files/digest-selinux-squid-200506261
-rw-r--r--sec-policy/selinux-squid/files/digest-selinux-squid-200511221
-rw-r--r--sec-policy/selinux-squid/selinux-squid-20051122.ebuild (renamed from sec-policy/selinux-squid/selinux-squid-20050626.ebuild)4
5 files changed, 12 insertions, 16 deletions
diff --git a/sec-policy/selinux-squid/ChangeLog b/sec-policy/selinux-squid/ChangeLog
index 9029be990116..707afb308254 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.15 2005/10/27 19:05:06 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.16 2005/11/28 09:27:03 kaiowas Exp $
+
+*selinux-squid-20051122 (28 Nov 2005)
+
+ 28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+ -selinux-squid-20050626.ebuild, +selinux-squid-20051122.ebuild:
+ merge with upstream
27 Oct 2005; petre rodan <kaiowas@gentoo.org>
selinux-squid-20051023.ebuild:
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 0e1eef6e6f03..828b5d752e57 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 ed26beebb7d5eab994e24357fad78b47 ChangeLog 2351
-MD5 7dbb7d42e94a2a965cb04f32c3107e46 files/digest-selinux-squid-20050626 73
MD5 ebd2fcd11864237df026c0e3e2557a3f files/digest-selinux-squid-20051023 73
+MD5 4e3bb0ea0ef8fc8e0cf89cb195b7ed66 files/digest-selinux-squid-20051122 73
MD5 24c0cb2d4ce8da969c77f6ada1f8e60c metadata.xml 530
-MD5 002b69effed4cc7bddae576c61e46b95 selinux-squid-20050626.ebuild 433
MD5 5fba924ebe2500671530e46faf85ee89 selinux-squid-20051023.ebuild 438
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDYSaFGSBEIeh4AEYRAsBYAJ4mbCix2X0JK7TWusOA2l79sHqtzgCghijU
-b2kmgvFAxXabOEVaNtSOZ8E=
-=R6ZX
------END PGP SIGNATURE-----
+MD5 24a50d63ab5041d9644c076c98b939b0 selinux-squid-20051122.ebuild 330
diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20050626 b/sec-policy/selinux-squid/files/digest-selinux-squid-20050626
deleted file mode 100644
index f2675338c7db..000000000000
--- a/sec-policy/selinux-squid/files/digest-selinux-squid-20050626
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d016372b12cecc57666aa096d215da7f selinux-squid-20050626.tar.bz2 1288
diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20051122 b/sec-policy/selinux-squid/files/digest-selinux-squid-20051122
new file mode 100644
index 000000000000..46d9751e7c68
--- /dev/null
+++ b/sec-policy/selinux-squid/files/digest-selinux-squid-20051122
@@ -0,0 +1 @@
+MD5 bba88465209800227e6701bd55d24710 selinux-squid-20051122.tar.bz2 1346
diff --git a/sec-policy/selinux-squid/selinux-squid-20050626.ebuild b/sec-policy/selinux-squid/selinux-squid-20051122.ebuild
index 38350d563d35..016b087914b9 100644
--- a/sec-policy/selinux-squid/selinux-squid-20050626.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-20051122.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-20050626.ebuild,v 1.1 2005/06/26 17:47:38 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-20051122.ebuild,v 1.1 2005/11/28 09:27:03 kaiowas Exp $
inherit selinux-policy
@@ -11,5 +11,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050618"
DESCRIPTION="SELinux policy for squid"
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"