diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2004-11-24 06:08:00 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2004-11-24 06:08:00 +0000 |
| commit | 41eb7612f7ffb63d606693a18c32c3f5c6aca0b6 (patch) | |
| tree | 0230bbe14fdc7ab11b87abec038e06cf7d2d173d /sys-fs | |
| parent | initial import from #71845 (Manifest recommit) (diff) | |
| download | gentoo-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')
| -rw-r--r-- | sys-fs/cloop/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/cloop/cloop-2.01.5.ebuild | 3 | ||||
| -rw-r--r-- | sys-fs/cloop/files/cloop.zlib-amd64.patch | 21 |
3 files changed, 28 insertions, 2 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/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; |