summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2012-08-31 18:07:26 +0000
committerRichard Yao <ryao@gentoo.org>2012-08-31 18:07:26 +0000
commit7fdaf6b1b00c7e7d8e8db8b1de532bbaec704b65 (patch)
treecca7481eb043dd1d7ef05a63583a13094b3f5d1d /sys-fs/zfs
parentVersion bump. Remove old. (diff)
downloadhistorical-7fdaf6b1b00c7e7d8e8db8b1de532bbaec704b65.tar.gz
historical-7fdaf6b1b00c7e7d8e8db8b1de532bbaec704b65.tar.bz2
historical-7fdaf6b1b00c7e7d8e8db8b1de532bbaec704b65.zip
Do not permit ZFS to be used with GNU grep 2.13
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/zfs')
-rw-r--r--sys-fs/zfs/ChangeLog6
-rw-r--r--sys-fs/zfs/Manifest6
-rw-r--r--sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild3
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild3
4 files changed, 12 insertions, 6 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 3c27f2e0d5bc..dd6fbaf110b6 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/zfs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.47 2012/08/22 07:51:18 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.48 2012/08/31 18:07:26 ryao Exp $
+
+ 31 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc10-r1.ebuild,
+ zfs-9999.ebuild:
+ Do not permit ZFS to be used with GNU grep 2.13
22 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc10-r1.ebuild,
zfs-9999.ebuild:
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 11173d941ca7..7c3966bb66c9 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -2,7 +2,7 @@ AUX bash-completion 6203 SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515
AUX linuxrc 225 SHA256 69c5f407ae20a5e3000dc6389f8c75ee97e11c353489a00cb619134b103bf538 SHA512 b8f311a9ac9008d4f3b30bb2b7ac0144aec6029245ddb50a32fe0b485c9df96db23569d30de502d31d944588513107e6144b535249b704b90b586a2593dd5200 WHIRLPOOL 9de672c9b2a44fa5daab5c48d988465797a1b6fdb5431366969a0172e733b4933bac6ca256977331862e9410c474431b26cf50658fbac1d9b3282e65bf3f83e2
AUX zfs-shutdown 1252 SHA256 cba63ddf086044c7e041c296ea86f68a1579ac830b8bea56b9f74b4204f96553 SHA512 1c04ba8c1f533efdc2ea938ba508d1789fc6bb653e5ad84dfcd78e41f1271f05309df670b9b8246c3317c96060028266230c83b8c21b7abf71442320cd33a219 WHIRLPOOL 58a3e23d316f673bee78e9837c6aea3be6bfceab5e89a0717b0290257a7a682bef67e6ae98e6f92a0c41a1da043a6ba6eded5974bbff3ee50c39e48ea8d3c77f
DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761
-EBUILD zfs-0.6.0_rc10-r1.ebuild 2529 SHA256 0467831988ff24a791f4bf39ac302c6aff07c8e751961b1ba58789a05ec938c4 SHA512 ee43bfdd1256c9166a3620f3aad30f7a002bc374bd8f2c30138f11a0e48ff10d40713ac2433d83d98b85adc1f6b24da826d9fa7a1651baddd2954888e545d46a WHIRLPOOL 26d3275d8e74d0a8ff9d528cd7b2c9c832def88ca6c8b114a4e48dadf70570b0c43d6f054c6c5d032ddea850c0d075805ac523316bb4325cb368c76d36bccb8e
-EBUILD zfs-9999.ebuild 2521 SHA256 02c1289e85a3a59bebc7e5ce85c11b988a6cfad69c854bd9c5f487382da2d2af SHA512 1e59fd4d22f9effa48f2939e3af4b7a5fb85f1c38e48c1cd56436dde928d257a93e733ff69466e49b02e9227bee295171f040a5eec6c68d3c30f2de891af660a WHIRLPOOL 2f7be086a11d1db5f80885cf703827304a3acbb423dc223777982153f4432c53eb5048a9f3d492088de35d40020527bfe7aed615d101af5f0f29e9b3697e4490
-MISC ChangeLog 8633 SHA256 1b36affcf67a54ad95cc3f33df30861e671dcee0320ff8ec549f90371b5a45be SHA512 f2453c7448305602f675486d97b09ab83aeac6dcc37ed25a9d7ff6bc6f758297fffaef9cea57f17e65bd4844ba4b4ff530aa0a30b94ddbd3134856609b8b0d36 WHIRLPOOL a30691c31b69bcb0db9f2af22fdd3eaf06087f6fee0d079c9232f5dc838fb2da6e958e707a80a700dd7ee499c3da84a8605521b8bf46924f13ec9037c3587e53
+EBUILD zfs-0.6.0_rc10-r1.ebuild 2552 SHA256 d5bdec5b4ae175fa0e6d5e7a902c30b9bfcc35a971a51016ce31ac4751d5ed76 SHA512 21b8edfaa58d7ec6d060c1593b72452e053e9ea808b1a5a1f9a65febe13fc9a45039f33f6a1cd4ca40332f590f8f533d0dddf98eb59f441008afbf9d374c2773 WHIRLPOOL 427ac1455714e166972974955fa4be9b0fda4cf5215c3ed6503bdc397f1b7dddad889947abbfd257ca9c761d68537157024285a47d61a7f047f76923c556f419
+EBUILD zfs-9999.ebuild 2544 SHA256 57f43d9cd944ebcba355b59b087554f418bfeab91af7ab23a22476e9936241d6 SHA512 b53bb77e2a0af86bf09adaf789431ddaabc6b9359e9581db6848912c7ab0f84d7872140127c3b01dbf5bf60eb07ae3543ee71923a549dc415f0a593b466eeb50 WHIRLPOOL 7ea93a6d1bc8a7a3ee285825d98d07b56540545d255c124d8efe2cd1304432d716271d07bacc5947b45be4004991e688e58329b6989467e526cdb58f04bda9f7
+MISC ChangeLog 8774 SHA256 8e6ea42de8360f5a7f446cbbbd46566b866396462d0c6ada11b3748f5ff34746 SHA512 b5c4dfc13e246627a59ae53b2eb7d280e11ba3a38c4d050abafcd0870e8bff3eb2c26d6aa932d628519cd39626a8229d4c74a6fee58c50765be0dfa058649c99 WHIRLPOOL 2db781992850cf95559d209cb67024e28e1a2e35a0e39d73f2faf7d027e7ec069045428b252e43c9cb404c90cf7fb4ca07f2165329db74be3a1b3d7fca3afe5c
MISC metadata.xml 548 SHA256 03ce3fb0462330da4a71ca48948fcf1934e6a5ae1193fc4e3f36fc80f5e6cc22 SHA512 f05831b3d01bd187a6e97252a70dd4e14eb0736b68f79e80905e6345a21229b473f0784d91403152e10de57d7f66b48a0253295b444d5a949f0fdf72f4ee95e3 WHIRLPOOL 3825bb9a365ede4c67069d4b519af28081604009dee6dbe8f99b08028564816f0676baf5239e6adc698de245a596eae7d444a0e82cd2c6555d0bee20e4beb81a
diff --git a/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild
index c1f1c87ddaeb..938fc8402fde 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild,v 1.3 2012/08/22 07:51:18 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild,v 1.4 2012/08/31 18:07:26 ryao Exp $
EAPI="4"
@@ -38,6 +38,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
+ !=sys-apps/grep-2.13*
!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
!sys-fs/zfs-fuse
!prefix? ( sys-fs/udev )
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 6a1ade1dfb17..165d3daab502 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.37 2012/08/22 07:51:18 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.38 2012/08/31 18:07:26 ryao Exp $
EAPI="4"
@@ -38,6 +38,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
+ !=sys-apps/grep-2.13*
!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
!sys-fs/zfs-fuse
!prefix? ( sys-fs/udev )