summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2004-05-24 17:10:37 +0000
committerTavis Ormandy <taviso@gentoo.org>2004-05-24 17:10:37 +0000
commitbd19ef04a01776cbcf95d3db9f615b19275406fc (patch)
tree3062f1b0114b094b25f9de4875ad9404f5284461 /app-arch/advancecomp/files
parentMarked stable on hppa. (Manifest recommit) (diff)
downloadgentoo-2-bd19ef04a01776cbcf95d3db9f615b19275406fc.tar.gz
gentoo-2-bd19ef04a01776cbcf95d3db9f615b19275406fc.tar.bz2
gentoo-2-bd19ef04a01776cbcf95d3db9f615b19275406fc.zip
new release
Diffstat (limited to 'app-arch/advancecomp/files')
-rw-r--r--app-arch/advancecomp/files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff62
-rw-r--r--app-arch/advancecomp/files/digest-advancecomp-1.101
2 files changed, 63 insertions, 0 deletions
diff --git a/app-arch/advancecomp/files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff b/app-arch/advancecomp/files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff
new file mode 100644
index 000000000000..c3f89e9c81d1
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.10-bzip2-compile-plz-k-thx.diff
@@ -0,0 +1,62 @@
+diff -ruNd advancecomp-1.10.orig/compress.cc advancecomp-1.10/compress.cc
+--- advancecomp-1.10.orig/compress.cc 2004-04-02 16:43:52.000000000 +0100
++++ advancecomp-1.10/compress.cc 2004-05-24 17:56:18.940619088 +0100
+@@ -179,14 +179,14 @@
+ }
+
+ #if USE_BZIP2
+-bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor) {
+- return BZ2_bzBuffToBuffCompress(out_data,&out_size,const_cast<unsigned char*>(in_data),in_size,blocksize,0,workfactor) == BZ_OK;
++bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor) {
++ return BZ2_bzBuffToBuffCompress(out_data,&out_size,const_cast<char*>(in_data),in_size,blocksize,0,workfactor) == BZ_OK;
+ }
+
+-bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size) {
++bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size) {
+ unsigned size = out_size;
+
+- if (BZ2_bzBuffToBuffDecompress(out_data,&size,const_cast<unsigned char*>(in_data),in_size,0,0)!=BZ_OK)
++ if (BZ2_bzBuffToBuffDecompress(out_data,&size,const_cast< char*>(in_data),in_size,0,0)!=BZ_OK)
+ return false;
+
+ if (size != out_size)
+diff -ruNd advancecomp-1.10.orig/compress.h advancecomp-1.10/compress.h
+--- advancecomp-1.10.orig/compress.h 2003-11-02 20:09:41.000000000 +0000
++++ advancecomp-1.10/compress.h 2004-05-24 17:56:18.941618936 +0100
+@@ -40,8 +40,8 @@
+ bool decompress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+ bool compress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
+
+-bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+-bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor);
++bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size);
++bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor);
+
+ bool decompress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
+ bool compress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
+diff -ruNd advancecomp-1.10.orig/stamp-h1 advancecomp-1.10/stamp-h1
+--- advancecomp-1.10.orig/stamp-h1 1970-01-01 01:00:00.000000000 +0100
++++ advancecomp-1.10/stamp-h1 2004-05-24 17:56:18.942618784 +0100
+@@ -0,0 +1 @@
++timestamp for config.h
+diff -ruNd advancecomp-1.10.orig/zipsh.cc advancecomp-1.10/zipsh.cc
+--- advancecomp-1.10.orig/zipsh.cc 2004-04-02 17:13:02.000000000 +0100
++++ advancecomp-1.10/zipsh.cc 2004-05-24 17:56:18.943618632 +0100
+@@ -39,7 +39,7 @@
+ }
+ #ifdef USE_BZIP2
+ } else if (info.compression_method == ZIP_METHOD_BZIP2) {
+- if (!decompress_bzip2(data,compressed_size_get(),uncompressed_data,uncompressed_size_get())) {
++ if (!decompress_bzip2((char *)data,compressed_size_get(),(char *)uncompressed_data,uncompressed_size_get())) {
+ data_free(uncompressed_data);
+ throw error() << "Invalid compressed data on file " << name_get();
+ }
+@@ -247,7 +247,7 @@
+ c1_met = ZIP_METHOD_BZIP2;
+ c1_fla = 0;
+
+- if (!compress_bzip2(uncompressed_data,uncompressed_size_get(),c1_data,c1_size,bzip2_level,bzip2_workfactor)) {
++ if (!compress_bzip2((char *)uncompressed_data,uncompressed_size_get(),(char *)c1_data,c1_size,bzip2_level,bzip2_workfactor)) {
+ data_free(c1_data);
+ c1_data = 0;
+ }
diff --git a/app-arch/advancecomp/files/digest-advancecomp-1.10 b/app-arch/advancecomp/files/digest-advancecomp-1.10
new file mode 100644
index 000000000000..00a25a1e4bfd
--- /dev/null
+++ b/app-arch/advancecomp/files/digest-advancecomp-1.10
@@ -0,0 +1 @@
+MD5 757f6ed0f528a1d44991802361b61e13 advancecomp-1.10.tar.gz 353727