summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2007-07-15 20:23:44 +0000
committerTiziano Müller <dev-zero@gentoo.org>2007-07-15 20:23:44 +0000
commite5fdda5f3daebc13fd2321399eb925fa16c0bdaa (patch)
tree2f6134bb363c91cf19fc6a8c25be5d39d0d76947 /sys-fs
parentFix building with asneeded for bug 184668. (diff)
downloadhistorical-e5fdda5f3daebc13fd2321399eb925fa16c0bdaa.tar.gz
historical-e5fdda5f3daebc13fd2321399eb925fa16c0bdaa.tar.bz2
historical-e5fdda5f3daebc13fd2321399eb925fa16c0bdaa.zip
Added disk_cache patch for bug #185369 (thanks to Attila Jecs)
Dropped old versions Package-Manager: portage-2.1.3_rc8
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/evms/ChangeLog10
-rw-r--r--sys-fs/evms/Manifest33
-rw-r--r--sys-fs/evms/evms-2.5.5-r1.ebuild93
-rw-r--r--sys-fs/evms/evms-2.5.5-r6.ebuild (renamed from sys-fs/evms/evms-2.5.5-r4.ebuild)17
-rw-r--r--sys-fs/evms/files/2.5.5/disk_cache.patch106
-rw-r--r--sys-fs/evms/files/digest-evms-2.5.5-r43
-rw-r--r--sys-fs/evms/files/digest-evms-2.5.5-r6 (renamed from sys-fs/evms/files/digest-evms-2.5.5-r1)0
7 files changed, 140 insertions, 122 deletions
diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 40d2855ca079..a666a25fb80d 100644
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-fs/evms
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.66 2007/04/06 20:32:39 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.67 2007/07/15 20:23:43 dev-zero Exp $
+
+*evms-2.5.5-r6 (15 Jul 2007)
+
+ 15 Jul 2007; Tiziano Müller <dev-zero@gentoo.org>
+ +files/2.5.5/disk_cache.patch, -evms-2.5.5-r1.ebuild,
+ -evms-2.5.5-r4.ebuild, +evms-2.5.5-r6.ebuild:
+ Added disk_cache patch for bug #185369 (thanks to Attila Jecs)
+ Dropped old versions
06 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
evms-2.5.5-r5.ebuild:
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index 9258eef31ba7..e70828bd4ab0 100644
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -10,6 +10,10 @@ AUX 2.5.5/cli_reload_options.patch 542 RMD160 e9a6be80b7fe665cbc58e5538a36fd0961
MD5 9daa792a87326c97077dccd007ac9af7 files/2.5.5/cli_reload_options.patch 542
RMD160 e9a6be80b7fe665cbc58e5538a36fd09615fe3e8 files/2.5.5/cli_reload_options.patch 542
SHA256 6d824343f2675dbf1a9ae0a8e211a913c1a8d22b95c712a113c729433046bc57 files/2.5.5/cli_reload_options.patch 542
+AUX 2.5.5/disk_cache.patch 4240 RMD160 5b5ed03a7241be498b8c6ac8bd29d6d412211d91 SHA1 c325965defd0b7cbb56b425a2759c6f8d486a39b SHA256 eb6ccfd070b719641fb0c7f5d3a1294764c89bdc2492a832d3ca86351e1ea92d
+MD5 a5e00a9f6f7ea6ec8a776d1cc7cb76bf files/2.5.5/disk_cache.patch 4240
+RMD160 5b5ed03a7241be498b8c6ac8bd29d6d412211d91 files/2.5.5/disk_cache.patch 4240
+SHA256 eb6ccfd070b719641fb0c7f5d3a1294764c89bdc2492a832d3ca86351e1ea92d files/2.5.5/disk_cache.patch 4240
AUX 2.5.5/get_geometry.patch 1230 RMD160 7ee1fe8344a5d8154d2916baa7cfdd9506f8e4b9 SHA1 10bfc8d74c5768d1ce516aadcf92c611f26b2ead SHA256 86e1fba9bfcf0ab2aecaec29945df57ed482c26497bb795c1d30418be9956922
MD5 2122d3cb2374153f2569f05d14fdee13 files/2.5.5/get_geometry.patch 1230
RMD160 7ee1fe8344a5d8154d2916baa7cfdd9506f8e4b9 files/2.5.5/get_geometry.patch 1230
@@ -63,32 +67,25 @@ MD5 5eb632aa94b0537e1983f935e3706d74 files/evms2-start.sh 382
RMD160 a9dbd94b537ddcc9b0798cb904769b075e7d529a files/evms2-start.sh 382
SHA256 ea36fbde78590067029405ab18b09106b083913688ea4863c2e63eece8e74021 files/evms2-start.sh 382
DIST evms-2.5.5.tar.gz 2286321 RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 SHA1 8c679e958398a299f7b3c76f4dd552d6bf35a28b SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c
-EBUILD evms-2.5.5-r1.ebuild 2527 RMD160 e2dcac6d5c5876512720a5b3ccdfee4ad1612fe3 SHA1 c93ad47f13ad8402fccbc7681dfb13eceebe8db4 SHA256 1a2da02d4f60befa28048583576801919835ef6c3169f35e5631850b6f7edd72
-MD5 65b8e5021b94072f3fd8176d84ae6660 evms-2.5.5-r1.ebuild 2527
-RMD160 e2dcac6d5c5876512720a5b3ccdfee4ad1612fe3 evms-2.5.5-r1.ebuild 2527
-SHA256 1a2da02d4f60befa28048583576801919835ef6c3169f35e5631850b6f7edd72 evms-2.5.5-r1.ebuild 2527
-EBUILD evms-2.5.5-r4.ebuild 4810 RMD160 c4858c05b849d701f5b643dbdfe112b3cbb8172c SHA1 ec3545d785da0b3c94638a9bbd387314e30dbf37 SHA256 7f01a3c6aa8e5c4a89fabb96cb256f27932a7ae3e030de99fdcaff2173e9d953
-MD5 459d32e5b7ff45cc0d383cbd236c8113 evms-2.5.5-r4.ebuild 4810
-RMD160 c4858c05b849d701f5b643dbdfe112b3cbb8172c evms-2.5.5-r4.ebuild 4810
-SHA256 7f01a3c6aa8e5c4a89fabb96cb256f27932a7ae3e030de99fdcaff2173e9d953 evms-2.5.5-r4.ebuild 4810
EBUILD evms-2.5.5-r5.ebuild 4892 RMD160 4e998bb4a476dd841f624f4bf51d0f78d9724716 SHA1 cd0fb789199199050b320debcb53f2cbc4f693b9 SHA256 4a96bd738031df807ea56a3b4e8e63c13998e8cd64262233151ea894488b9a82
MD5 a0b777cc181e4b21c770511f5ac4ce04 evms-2.5.5-r5.ebuild 4892
RMD160 4e998bb4a476dd841f624f4bf51d0f78d9724716 evms-2.5.5-r5.ebuild 4892
SHA256 4a96bd738031df807ea56a3b4e8e63c13998e8cd64262233151ea894488b9a82 evms-2.5.5-r5.ebuild 4892
-MISC ChangeLog 13817 RMD160 556aadf2c8166f62937e77ec052a60f2c83c91e7 SHA1 02d900ba8421a6f2b262f1044ba6d315204e86b6 SHA256 2be2468970767560c63c99b62b958b46309517d76101c453f204b0fd86a83ef2
-MD5 304c92bd204f2a9bf7e621bc48aade08 ChangeLog 13817
-RMD160 556aadf2c8166f62937e77ec052a60f2c83c91e7 ChangeLog 13817
-SHA256 2be2468970767560c63c99b62b958b46309517d76101c453f204b0fd86a83ef2 ChangeLog 13817
+EBUILD evms-2.5.5-r6.ebuild 4941 RMD160 e1c9bd25e54ec114db3ac213ecbd566649d56467 SHA1 0c5b4f658dd273dcff3257ba888ac1ac36573e36 SHA256 8f6e24b566a4edd428ebc83954a8ccfdcb6932f83853e16c764fa239d31c1587
+MD5 025b8aed751408494bfba5825af7020f evms-2.5.5-r6.ebuild 4941
+RMD160 e1c9bd25e54ec114db3ac213ecbd566649d56467 evms-2.5.5-r6.ebuild 4941
+SHA256 8f6e24b566a4edd428ebc83954a8ccfdcb6932f83853e16c764fa239d31c1587 evms-2.5.5-r6.ebuild 4941
+MISC ChangeLog 14091 RMD160 3d7178a00bea425a21ba187c56844b95ce22dee2 SHA1 e98cf896cd70f23e982c2eda76b3ee42f4924bdd SHA256 2777aaeca76d35278806616fa1b6fa065ca1896010f114cbcee20f0875c75bfa
+MD5 3ebe42f0fb134a6426cfe82e9bfdab74 ChangeLog 14091
+RMD160 3d7178a00bea425a21ba187c56844b95ce22dee2 ChangeLog 14091
+SHA256 2777aaeca76d35278806616fa1b6fa065ca1896010f114cbcee20f0875c75bfa ChangeLog 14091
MISC metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 SHA1 23d81d62b6e49d0867ad90698ea3ac087b2a9d95 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b
MD5 515e2b0ddb7f8c4e6fad2c72fda19768 metadata.xml 383
RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 metadata.xml 383
SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b metadata.xml 383
-MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r1 235
-RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r1 235
-SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r1 235
-MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r4 235
-RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r4 235
-SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r4 235
MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r5 235
RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r5 235
SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r5 235
+MD5 83e877452227406dad19b93325f98ca2 files/digest-evms-2.5.5-r6 235
+RMD160 8b33887302192148a7f141f6c96deb68ebcf31ef files/digest-evms-2.5.5-r6 235
+SHA256 3c7b17329fb2f3fb7c0f65550c2d12c958b315af49b88160b7b43f6538b80c3d files/digest-evms-2.5.5-r6 235
diff --git a/sys-fs/evms/evms-2.5.5-r1.ebuild b/sys-fs/evms/evms-2.5.5-r1.ebuild
deleted file mode 100644
index 1d059ff67eee..000000000000
--- a/sys-fs/evms/evms-2.5.5-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r1.ebuild,v 1.10 2006/08/20 21:23:00 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Utilities for the IBM Enterprise Volume Management System"
-HOMEPAGE="http://www.sourceforge.net/projects/evms"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
-IUSE="ncurses gtk nls"
-
-#EVMS uses libuuid from e2fsprogs
-RDEPEND="virtual/libc
- sys-fs/e2fsprogs
- sys-fs/device-mapper
- >=sys-apps/baselayout-1.9.4-r6
- gtk? ( =x11-libs/gtk+-1* )
- ncurses? ( sys-libs/ncurses
- =dev-libs/glib-1* )"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${PV}/raid5_degrade_fix.patch
- epatch ${FILESDIR}/${PV}/md_super_fix.patch
- epatch ${FILESDIR}/evms-2.5.5-as-needed.patch
-}
-
-src_compile() {
- # Bug #54856
- # filter-flags "-fstack-protector"
- replace-flags -O3 -O2
- replace-flags -Os -O2
-
- local excluded_interfaces=""
- use ncurses || excluded_interfaces="--disable-text-mode"
- use gtk || excluded_interfaces="${excluded_interfaces} --disable-gui"
-
- econf \
- --libdir=/$(get_libdir) \
- --sbindir=/sbin \
- --includedir=/usr/include \
- $(use_enable nls) \
- ${excluded_interfaces} || die "Failed configure"
- emake || die "Failed emake"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "Make install died"
- dodoc ChangeLog INSTALL* PLUGIN.IDS README TERMINOLOGY doc/linuxrc
-
- insinto /$(get_libdir)/rcscripts/addons
- newins "${FILESDIR}"/evms2-start.sh evms-start.sh || die "rcscript addon failed"
-
- # install the sample configuration into the doc dir
- dodoc ${D}/etc/evms.conf.sample
- rm -f ${D}/etc/evms.conf.sample
-
- # the kernel patches may come handy for people compiling their own kernel
- docinto kernel/2.4
- dodoc kernel/2.4/*
- docinto kernel/2.6
- dodoc kernel/2.6/*
-
- # move static libraries to /usr/lib
- dodir /usr/$(get_libdir)
- mv -f ${D}/$(get_libdir)/*.a ${D}/usr/$(get_libdir)
-
- # Create linker scripts for dynamic libs in /lib, else gcc
- # links to the static ones in /usr/lib first. Bug #4411.
- for x in ${D}/usr/$(get_libdir)/*.a
- do
- if [ -f ${x} ]
- then
- local lib="${x##*/}"
- gen_usr_ldscript ${lib/\.a/\.so}
- fi
- done
-
- # the gtk+ frontend should live in /usr/sbin
- if use gtk
- then
- dodir /usr/sbin
- mv -f ${D}/sbin/evmsgui ${D}/usr/sbin
- fi
-
- # Needed for bug #51252
- dosym libevms-2.5.so.0.0 /$(get_libdir)/libevms-2.5.so.0
-}
diff --git a/sys-fs/evms/evms-2.5.5-r4.ebuild b/sys-fs/evms/evms-2.5.5-r6.ebuild
index 2e7ca5b75d9d..efe5fa706bd6 100644
--- a/sys-fs/evms/evms-2.5.5-r4.ebuild
+++ b/sys-fs/evms/evms-2.5.5-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r4.ebuild,v 1.4 2007/02/04 19:16:40 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r6.ebuild,v 1.1 2007/07/15 20:23:43 dev-zero Exp $
WANT_AUTOMAKE="latest"
WANT_AUTOCONF="latest"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug gtk ncurses nls"
#EVMS uses libuuid from e2fsprogs
@@ -41,10 +41,13 @@ src_unpack() {
epatch "${FILESDIR}/${PV}/cli_query_segfault.patch"
epatch "${FILESDIR}/${PV}/get_geometry.patch"
epatch "${FILESDIR}/${PV}/BaseName.patch"
+ epatch "${FILESDIR}/${PV}/disk_cache.patch"
- epatch "${FILESDIR}/evms-2.5.5-as-needed.patch"
- epatch "${FILESDIR}/evms-2.5.5-glib_dep.patch"
- epatch "${FILESDIR}/evms-2.5.5-ocfs2.patch"
+ epatch "${FILESDIR}/${P}-as-needed.patch"
+ epatch "${FILESDIR}/${P}-glib_dep.patch"
+ epatch "${FILESDIR}/${P}-ocfs2.patch"
+ epatch "${FILESDIR}/${P}-use_disk_group.patch"
+ epatch "${FILESDIR}/${P}-pagesize.patch"
eautoreconf
}
@@ -124,7 +127,7 @@ src_test() {
einfo " dd if=/dev/zero of=/tmp/evms_test_file bs=1M count=4096"
einfo "- Activate a loop device on this file:"
einfo " losetup /dev/loop0 /tmp/evms_test_file"
- einfo "- export EVMS_TEST_VOLUME=loop0"
+ einfo "- export EVMS_TEST_VOLUME=loop/0"
einfo "The disk has to be at least 4GB!"
einfo "To deactivate the loop-device afterwards:"
einfo "- losetup -d /dev/loop0"
@@ -147,5 +150,5 @@ src_test() {
addwrite /var/lock/evms-engine
cd "${S}/tests/suite"
- PATH="${PATH}:/sbin:/${S}/tests" ./run_tests ${EVMS_TEST_VOLUME} || die "tests failed"
+ PATH="${S}/ui/cli:${S}/tests:/sbin:${PATH}" ./run_tests ${EVMS_TEST_VOLUME} || die "tests failed"
}
diff --git a/sys-fs/evms/files/2.5.5/disk_cache.patch b/sys-fs/evms/files/2.5.5/disk_cache.patch
new file mode 100644
index 000000000000..c6433c1b6bfc
--- /dev/null
+++ b/sys-fs/evms/files/2.5.5/disk_cache.patch
@@ -0,0 +1,106 @@
+The local disk cache uses the address of an object as the identification for a
+cached entry. However, the addresses are not unique (in some cases). In our
+tests, the cache returned wrong data and caused serious problems.
+
+I changed the code to use the device major/minor number to identify cache
+entries.
+
+"Changju Gao" <CGAO@novell.com>
+
+--- evms-2.5.5/plugins/disk/cache.c 2003-08-27 13:18:45.000000000 -0600
++++ evms-2.5.5/plugins/disk/cache.c 2007-06-06 09:52:48.000000000 -0600
+@@ -49,7 +49,8 @@
+ * Structure to hold information about a cache
+ ***/
+ typedef struct cache_entry_s {
+- storage_object_t * disk;
++ u_int32_t dev_major;
++ u_int32_t dev_minor;
+ lsn_t sector;
+ sector_count_t count;
+ void * buffer;
+@@ -180,7 +181,8 @@
+
+ cache_entry = hash_entry->next;
+ while (cache_entry != hash_entry &&
+- (cache_entry->disk != disk ||
++ (cache_entry->dev_major != disk->dev_major ||
++ cache_entry->dev_minor != disk->dev_minor ||
+ cache_entry->sector != sector ||
+ cache_entry->count < count)) {
+ cache_entry = cache_entry->next;
+@@ -191,8 +193,8 @@
+ goto out;
+ }
+
+- LOG_DEBUG("Read from cache. disk %s, sector %"PRIu64", count %"PRIu64".\n",
+- disk->name, sector, count);
++ LOG_DEBUG("Read from cache. disk %s (%d:%d), sector %"PRIu64", count %"PRIu64".\n",
++ disk->name, disk->dev_major, disk->dev_minor, sector, count);
+ memcpy(buffer, cache_entry->buffer, count << EVMS_VSECTOR_SIZE_SHIFT);
+ cache_hit_count++;
+ rc = 0;
+@@ -228,7 +230,8 @@
+
+ cache_entry = hash_entry->next;
+ while (cache_entry != hash_entry &&
+- (cache_entry->disk != disk ||
++ (cache_entry->dev_major != disk->dev_major ||
++ cache_entry->dev_minor != disk->dev_minor ||
+ cache_entry->sector != sector)) {
+ cache_entry = cache_entry->next;
+ }
+@@ -236,14 +239,14 @@
+ if (cache_entry != hash_entry) {
+ /* Found a cache entry. */
+ if (cache_entry->count >= count) {
+- LOG_DEBUG("Cache entry already exists for disk %s, sector %"PRIu64".\n",
+- disk->name, sector);
++ LOG_DEBUG("Cache entry already exists for disk %s (%d:%d), sector %"PRIu64".\n",
++ disk->name, disk->dev_major, disk->dev_minor, sector);
+ rc = EEXIST;
+ goto out;
+ }
+
+- LOG_DEBUG("Cache entry for disk %s, sector %"PRIu64" is too small.\n",
+- disk->name, sector);
++ LOG_DEBUG("Cache entry for disk %s (%d:%d) sector %"PRIu64" is too small.\n",
++ disk->name, disk->dev_major, disk->dev_minor, sector);
+ LOG_DEBUG(" Has %"PRIu64" sectors; need %"PRIu64" sectors.\n",
+ cache_entry->count, count);
+ free(cache_entry->buffer);
+@@ -251,8 +254,8 @@
+ cache_entry->count = 0;
+ } else {
+ /* Need a new cache entry. */
+- LOG_DEBUG("Create a new cache entry for disk %s, sector %"PRIu64", count %"PRIu64".\n",
+- disk->name, sector, count);
++ LOG_DEBUG("Create a new cache entry for disk %s (%d:%d), sector %"PRIu64", count %"PRIu64".\n",
++ disk->name, disk->dev_major, disk->dev_minor, sector, count);
+ cache_entry = calloc(1, sizeof(cache_entry_t));
+ if (!cache_entry) {
+ LOG_SERIOUS("Could not allocate memory for a new cache entry.\n");
+@@ -260,17 +263,18 @@
+ goto out;
+ }
+
+- cache_entry->disk = disk;
++ cache_entry->dev_major = disk->dev_major;
++ cache_entry->dev_minor = disk->dev_minor;
+ cache_entry->sector = sector;
+ }
+
+ if (cache_entry->buffer == NULL) {
+- LOG_DEBUG("Allocate a new buffer for the cache entry for disk %s, sector %"PRIu64", count %"PRIu64".\n",
+- disk->name, sector, count);
++ LOG_DEBUG("Allocate a new buffer for the cache entry for disk %s (%d:%d), sector %"PRIu64", count %"PRIu64".\n",
++ disk->name, disk->dev_major, disk->dev_minor, sector, count);
+ cache_entry->buffer = malloc(count << EVMS_VSECTOR_SIZE_SHIFT);
+ if (!cache_entry->buffer) {
+- LOG_SERIOUS("Could not allocate memory for a buffer for a cache entry for disk %s, sector %"PRIu64", count %"PRIu64".\n",
+- disk->name, sector, count);
++ LOG_SERIOUS("Could not allocate memory for a buffer for a cache entry for disk %s (%d:%d), sector %"PRIu64", count %"PRIu64".\n",
++ disk->name, disk->dev_major, disk->dev_minor, sector, count);
+ if (cache_entry->prev) {
+ list_delete(cache_entry);
+ }
diff --git a/sys-fs/evms/files/digest-evms-2.5.5-r4 b/sys-fs/evms/files/digest-evms-2.5.5-r4
deleted file mode 100644
index 33b12c6760ce..000000000000
--- a/sys-fs/evms/files/digest-evms-2.5.5-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 45b463f0cbade194dc0a08be432b572e evms-2.5.5.tar.gz 2286321
-RMD160 716d6b34f48f6f7a3f5f4627bc4a2c34957607f7 evms-2.5.5.tar.gz 2286321
-SHA256 9dbfaac148d822068ba883f6533935e03ae5cfc9fdf8836dea6aee99c859307c evms-2.5.5.tar.gz 2286321
diff --git a/sys-fs/evms/files/digest-evms-2.5.5-r1 b/sys-fs/evms/files/digest-evms-2.5.5-r6
index 33b12c6760ce..33b12c6760ce 100644
--- a/sys-fs/evms/files/digest-evms-2.5.5-r1
+++ b/sys-fs/evms/files/digest-evms-2.5.5-r6