summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2004-11-24 06:08:00 +0000
committerStefan Schweizer <genstef@gentoo.org>2004-11-24 06:08:00 +0000
commit41eb7612f7ffb63d606693a18c32c3f5c6aca0b6 (patch)
tree0230bbe14fdc7ab11b87abec038e06cf7d2d173d /sys-fs/cloop/files
parentinitial import from #71845 (Manifest recommit) (diff)
downloadgentoo-2-41eb7612f7ffb63d606693a18c32c3f5c6aca0b6.tar.gz
gentoo-2-41eb7612f7ffb63d606693a18c32c3f5c6aca0b6.tar.bz2
gentoo-2-41eb7612f7ffb63d606693a18c32c3f5c6aca0b6.zip
Adding zlib-amd64 patch from bug 57912 to avoid segfault on amd64
Diffstat (limited to 'sys-fs/cloop/files')
-rw-r--r--sys-fs/cloop/files/cloop.zlib-amd64.patch21
1 files changed, 21 insertions, 0 deletions
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;