diff options
| -rw-r--r-- | sys-fs/cloop/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/cloop/Manifest | 5 | ||||
| -rw-r--r-- | sys-fs/cloop/cloop-2.01.5.ebuild | 3 | ||||
| -rw-r--r-- | sys-fs/cloop/files/cloop.zlib-amd64.patch | 21 |
4 files changed, 31 insertions, 4 deletions
diff --git a/sys-fs/cloop/ChangeLog b/sys-fs/cloop/ChangeLog index 325009a70329..1a828407674c 100644 --- a/sys-fs/cloop/ChangeLog +++ b/sys-fs/cloop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/cloop # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.2 2004/11/23 22:50:05 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.3 2004/11/24 06:08:00 genstef Exp $ + + 24 Nov 2004; Stefan Schweizer <genstef@gentoo.org> + +files/cloop.zlib-amd64.patch, cloop-2.01.5.ebuild: + Adding zlib-amd64 patch from bug 57912 to avoid segfault on amd64 *cloop-2.01.5 (23 Nov 2004) diff --git a/sys-fs/cloop/Manifest b/sys-fs/cloop/Manifest index ff1374a5a97a..2c4875be8c96 100644 --- a/sys-fs/cloop/Manifest +++ b/sys-fs/cloop/Manifest @@ -1,11 +1,12 @@ MD5 a9c58ce17c978363b0aa5e2e6545c7ba cloop-0.68.ebuild 2110 -MD5 1cc8186bb0e697edc004574cc2fbc497 cloop-2.01.5.ebuild 1920 +MD5 48fab355f7c8d27fa49a2afb3de0c15f cloop-2.01.5.ebuild 1963 MD5 f921e57967efb1fc6c2cb4ccb0dcbb92 cloop-2.00.ebuild 2027 MD5 7498bc7803ebc9010d29cecefc3079b6 cloop-1.0.ebuild 1832 -MD5 efbd924a18988eb68fb40c3a82c67507 ChangeLog 1965 +MD5 07449247c87c49b59925b8aeb957196d ChangeLog 2141 MD5 4bb124b6d8e7842a97dd4b5fc87c545a cloop-1.02.ebuild 1938 MD5 2d8e24e9e409e35ee446ec8d59f23c8d metadata.xml 269 MD5 fddd6265f57fe660c663a7b5b673f7f7 files/kernel-2.6.8-fs_h-fix.patch 759 +MD5 a2d63d27b9964865fe89d44549587504 files/cloop.zlib-amd64.patch 1091 MD5 35d772e2810697ea7458e58d4cd8dac1 files/digest-cloop-1.0 62 MD5 aeb66341a09c65ce27293e9bc8867e7c files/digest-cloop-0.68 64 MD5 012e4f17d0612ece27ca653c7af35662 files/digest-cloop-1.02 63 diff --git a/sys-fs/cloop/cloop-2.01.5.ebuild b/sys-fs/cloop/cloop-2.01.5.ebuild index 853fd2fd5eda..0fc3d3004817 100644 --- a/sys-fs/cloop/cloop-2.01.5.ebuild +++ b/sys-fs/cloop/cloop-2.01.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.01.5.ebuild,v 1.1 2004/11/23 22:50:05 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.01.5.ebuild,v 1.2 2004/11/24 06:08:00 genstef Exp $ inherit kernel-mod eutils versionator @@ -31,6 +31,7 @@ src_unpack() { kernel-mod_is_2_6_kernel && [ "${KV_PATCH}" -gt 7 ] && epatch ${FILESDIR}/kernel-2.6.8-fs_h-fix.patch cd ${S} epatch ${FILESDIR}/cloop.fix.patch + epatch ${FILESDIR}/cloop.zlib-amd64.patch } src_compile() { diff --git a/sys-fs/cloop/files/cloop.zlib-amd64.patch b/sys-fs/cloop/files/cloop.zlib-amd64.patch new file mode 100644 index 000000000000..f6f024556ea1 --- /dev/null +++ b/sys-fs/cloop/files/cloop.zlib-amd64.patch @@ -0,0 +1,21 @@ +--- cloop-2.01/advancecomp-1.9_create_compressed_fs/advfs.cc 2004-04-18 16:33:29.000000000 -0400 ++++ cloop-2.01.new/advancecomp-1.9_create_compressed_fs/advfs.cc 2004-11-23 18:04:49.859941344 -0500 +@@ -81,7 +81,7 @@ + { + int z_error; + unsigned long total=0; +- unsigned len[maxalg]; ++ uLong len[maxalg]; + unsigned int best; + //memset(compressed,0,len); memset(uncompressed,0,blocksize); + for(j=0; j<maxalg; j++) memset(compressed[j],0,maxlen), len[j]=maxlen; +@@ -111,7 +111,8 @@ + } + + /* Try 7ZIP compression now. */ +- if(!compress_zlib(shrink_extreme, (unsigned char *)compressed[maxalg-1], len[maxalg-1], (unsigned char *)uncompressed, blocksize)) ++ unsigned zlib_length=(unsigned int)len[maxalg-1]; ++ if(!compress_zlib(shrink_extreme, (unsigned char *)compressed[maxalg-1], zlib_length, (unsigned char *)uncompressed, blocksize)) + { + fprintf(stderr, "*** Error %d compressing block %lu! (compressed=%p, len=%lu, uncompressed=%p, blocksize=%lu)\n", z_error, i, compressed,len,uncompressed,blocksize); + goto error_free_cb_list; |