Hello community, here is the log from the commit of package pbzip2 for openSUSE:Factory checked in at 2011-11-05 11:33:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pbzip2 (Old) and /work/SRC/openSUSE:Factory/.pbzip2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pbzip2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/pbzip2/pbzip2.changes 2011-09-23 12:21:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pbzip2.new/pbzip2.changes 2011-11-05 12:06:33.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Nov 03 08:28:13 UTC 2011 - [email protected] + +- update to 1.1.6: + * fixed bug - deadlock due to unsynchronized broadcasts (bug #876686) + * prevent deletion of input files on error (bug #874543) + * document how to compress/decompress from standard input (bug #820525) + * added more detailed kernel error messages (bug #874605) + * error-handling fixes for multi-archive scenarios (bug #883782) +- use original upstream format archive .gz instead of .bz2 to avoid any + potential chicken/egg (requires bzip2 to uncompress the pbzip2 sources) + +------------------------------------------------------------------- Old: ---- pbzip2-1.1.5.tar.bz2 New: ---- pbzip2-1.1.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pbzip2.spec ++++++ --- /var/tmp/diff_new_pack.KCiwG2/_old 2011-11-05 12:10:03.000000000 +0100 +++ /var/tmp/diff_new_pack.KCiwG2/_new 2011-11-05 12:10:03.000000000 +0100 @@ -18,15 +18,14 @@ Name: pbzip2 -Version: 1.1.5 +Version: 1.1.6 Release: 1 %define pkg_version %{version} License: BSD4c Summary: Parallelized Implementation of bzip2 Url: http://compression.ca/pbzip2/ Group: Productivity/Archiving/Compression -# http://compression.ca/pbzip2/pbzip2-%{pkg_version}.tar.gz -Source: pbzip2-%{pkg_version}.tar.bz2 +Source: http://compression.ca/pbzip2/pbzip2-%{pkg_version}.tar.gz Source1: macros.pbzip2.in # pbleser: add support for DESTDIR, MANDIR, BINDIR and OPTFLAGS in Makefile Patch1: pbzip2-makefile.patch ++++++ pbzip2-fix_printf_format.patch ++++++ --- /var/tmp/diff_new_pack.KCiwG2/_old 2011-11-05 12:10:03.000000000 +0100 +++ /var/tmp/diff_new_pack.KCiwG2/_new 2011-11-05 12:10:03.000000000 +0100 @@ -1,31 +1,68 @@ ---- BZ2StreamScanner.cpp.orig 2010-12-20 19:28:34.000000000 +0100 -+++ BZ2StreamScanner.cpp 2010-12-20 19:33:54.000000000 +0100 -@@ -488,16 +488,16 @@ +--- pbzip2.cpp.orig 2011-11-03 09:38:41.289000463 +0100 ++++ pbzip2.cpp 2011-11-03 09:46:34.882000462 +0100 +@@ -796,7 +796,7 @@ + safe_mutex_lock(OutMutex); + #ifdef PBZIP_DEBUG + unsigned long long thid = (unsigned long long) pthread_self(); +- fprintf(stderr, "(%"PRIu64") syncSetLastGoodBlock: %d -> %d\n", thid, LastGoodBlock, newValue ); ++ fprintf(stderr, "(%zu) syncSetLastGoodBlock: %d -> %d\n", thid, LastGoodBlock, newValue ); + #endif - void BZ2StreamScanner::printCurrentState() + if ( (LastGoodBlock == -1) || (newValue < LastGoodBlock) ) +@@ -881,7 +881,7 @@ { -- fprintf( stderr, "current=%d, search pos=%d, end pos=%d; s-c=%d" -- "; out buf size=%d; out buf capacity=%d; header found=%d; search status=%d", -+ fprintf( stderr, "current=%ld, search pos=%ld, end pos=%ld; s-c=%ld" -+ "; out buf size=%u; out buf capacity=%zu; header found=%d; search status=%d", - getInBuffCurrent() - getInBuffBegin(), - getInBuffSearchPtr() - getInBuffBegin(), - getInBuffEnd() - getInBuffBegin(), - getInBuffSearchPtr() - getInBuffCurrent(), -- (int)_outBuff.bufSize, -- (int)_outBuffCapacity, -- (int)isBz2HeaderFound(), -- (int)getSearchStatus() ); -+ _outBuff.bufSize, -+ _outBuffCapacity, -+ isBz2HeaderFound(), -+ getSearchStatus() ); - } + #ifdef PBZIP_DEBUG + unsigned long long thid = (unsigned long long) pthread_self(); +- fprintf(stderr, "(%"PRIu64") waitForPreviousBlock before check: LastGoodBlock=%d; blockNum=%d; NextBlockToWrite=%d\n", ++ fprintf(stderr, "(%zu) waitForPreviousBlock before check: LastGoodBlock=%d; blockNum=%d; NextBlockToWrite=%d\n", + thid, + LastGoodBlock, blockNum, NextBlockToWrite ); + #endif +@@ -891,7 +891,7 @@ + if (syncGetTerminateFlag() != 0) + { + #ifdef PBZIP_DEBUG +- fprintf(stderr, "(%"PRIu64") waitForPreviousBlock terminated [%d]: blockNum=%d\n", ++ fprintf(stderr, "(%zu) waitForPreviousBlock terminated [%d]: blockNum=%d\n", + thid, -1, blockNum ); + #endif + return -1; +@@ -900,14 +900,14 @@ + safe_mutex_lock(OutMutex); - /** ---- pbzip2.cpp.orig 2010-12-20 19:25:32.000000000 +0100 -+++ pbzip2.cpp 2010-12-20 19:31:28.000000000 +0100 -@@ -898,8 +898,8 @@ + #ifdef PBZIP_DEBUG +- fprintf(stderr, "(%"PRIu64") waitForPreviousBlock before check: LastGoodBlock=%d; blockNum=%d; NextBlockToWrite=%d\n", ++ fprintf(stderr, "(%zu) waitForPreviousBlock before check: LastGoodBlock=%d; blockNum=%d; NextBlockToWrite=%d\n", + thid, LastGoodBlock, blockNum, NextBlockToWrite ); + #endif + + if (blockNum <= NextBlockToWrite) + { + #ifdef PBZIP_DEBUG +- fprintf(stderr, "(%"PRIu64") waitForPreviousBlock exit [%d]: LastGoodBlock=%d; blockNum=%d; NextBlockToWrite=%d\n", ++ fprintf(stderr, "(%zu) waitForPreviousBlock exit [%d]: LastGoodBlock=%d; blockNum=%d; NextBlockToWrite=%d\n", + thid, 0, LastGoodBlock, blockNum, NextBlockToWrite ); + #endif + safe_mutex_unlock(OutMutex); +@@ -917,7 +917,7 @@ + if ( (LastGoodBlock != -1) && (LastGoodBlock < blockNum) ) + { + #ifdef PBZIP_DEBUG +- fprintf(stderr, "(%"PRIu64") waitForPreviousBlock exit [%d]: LastGoodBlock=%d; blockNum=%d; NextBlockToWrite=%d\n", ++ fprintf(stderr, "(%zu) waitForPreviousBlock exit [%d]: LastGoodBlock=%d; blockNum=%d; NextBlockToWrite=%d\n", + thid, 2, LastGoodBlock, blockNum, NextBlockToWrite ); + #endif + safe_mutex_unlock(OutMutex); +@@ -925,7 +925,7 @@ + } + + #ifdef PBZIP_DEBUG +- fprintf(stderr, "(%"PRIu64") waitForPreviousBlock to sleep: LastGoodBlock=%d; blockNum=%d; NextBlockToWrite=%d\n", ++ fprintf(stderr, "(%zu) waitForPreviousBlock to sleep: LastGoodBlock=%d; blockNum=%d; NextBlockToWrite=%d\n", + thid, LastGoodBlock, blockNum, NextBlockToWrite ); + #endif + +@@ -1410,8 +1410,8 @@ // give warning to user if block is larger than 250 million bytes if (fileData->bufSize > 250000000) { @@ -36,7 +73,34 @@ fprintf(stderr, " If program aborts, use regular BZIP2 to decompress.\n"); } } -@@ -1418,7 +1418,7 @@ +@@ -1434,7 +1434,7 @@ + } + } + #ifdef PBZIP_DEBUG +- fprintf(stderr, "producer: Buffer: %x Size: %"PRIu64" Block: %d\n", fileData->buf, ++ fprintf(stderr, "producer: Buffer: %x Size: %zu Block: %d\n", fileData->buf, + (unsigned long long)fileData->bufSize, NumBlocks); + #endif + +@@ -1499,7 +1499,7 @@ + isInterrupted = true; + + #ifdef PBZIP_DEBUG +- fprintf (stderr, "(%"PRIu64") producer_decompress: interrupt1 - TerminateFlag set.\n", thid); ++ fprintf (stderr, "(%zu) producer_decompress: interrupt1 - TerminateFlag set.\n", thid); + #endif + } + if ( (syncGetLastGoodBlock() != -1) && +@@ -1509,7 +1509,7 @@ + isInterrupted = true; + + #ifdef PBZIP_DEBUG +- fprintf (stderr, "(%"PRIu64") consumer_decompress: terminating1 - LastGoodBlock set [%d].\n", thid, syncGetLastGoodBlock()); ++ fprintf (stderr, "(%zu) consumer_decompress: terminating1 - LastGoodBlock set [%d].\n", thid, syncGetLastGoodBlock()); + #endif + } + +@@ -2018,7 +2018,7 @@ if (QuietMode != 1) { @@ -45,7 +109,16 @@ } #ifdef PBZIP_DEBUG -@@ -1657,7 +1657,7 @@ +@@ -2118,7 +2118,7 @@ + inSize = bytesLeft; + + #ifdef PBZIP_DEBUG +- fprintf(stderr, " -> Bytes To Read: %"PRIu64" bytes...\n", inSize); ++ fprintf(stderr, " -> Bytes To Read: %zu bytes...\n", inSize); + #endif + + // allocate memory to read in file +@@ -2261,7 +2261,7 @@ close(hOutfile); if (QuietMode != 1) { @@ -54,7 +127,25 @@ } syncSetProducerDone(1); // Not really needed for direct version -@@ -2357,7 +2357,7 @@ +@@ -2617,7 +2617,7 @@ + inSize = blockSize; + + #ifdef PBZIP_DEBUG +- fprintf(stderr, " -> Bytes To Read: %"PRIu64" bytes...\n", inSize); ++ fprintf(stderr, " -> Bytes To Read: %zu bytes...\n", inSize); + #endif + + // allocate memory to read in file +@@ -2678,7 +2678,7 @@ + } + } + #ifdef PBZIP_DEBUG +- fprintf(stderr, "producer: Buffer: %x Size: %"PRIu64" Block: %d\n", FileData, inSize, NumBlocks); ++ fprintf(stderr, "producer: Buffer: %x Size: %zu Block: %d\n", FileData, inSize, NumBlocks); + #endif + + outBuff * queueElement = new(std::nothrow) outBuff(FileData, inSize, NumBlocks, 0); +@@ -2996,7 +2996,7 @@ // unlikely to get here since more likely exception will be thrown if (OutputBuffer.size() != size) { @@ -63,7 +154,7 @@ safe_mutex_unlock(OutMutex); exit(1); } -@@ -3198,7 +3198,7 @@ +@@ -3940,7 +3940,7 @@ #endif if (sizeof(OFF_T) <= 4) { @@ -72,7 +163,7 @@ if (decompress == 1) fprintf(stderr, " You will only able to uncompress files smaller than 2GB in size.\n\n"); else -@@ -3547,7 +3547,7 @@ +@@ -4309,7 +4309,7 @@ if (decompress == 1) fprintf(stderr, " BWT Block Size: %c00k\n", BWTblockSizeChar); if (strcmp(InFilename, "-") != 0) @@ -81,7 +172,7 @@ } if (decompress == 1) -@@ -3612,7 +3612,7 @@ +@@ -4378,7 +4378,7 @@ } if (QuietMode != 1) { @@ -89,22 +180,56 @@ + fprintf(stderr, " Output Size: %zu bytes\n", sizeof(Bz2HeaderZero)); fprintf(stderr, "-------------------------------------------\n"); } - // remove input file unless requested not to by user -@@ -3664,7 +3664,7 @@ - ret = pthread_create(&fifo->consumers[i], &ChildThreadAttributes, consumer_decompress, fifo); + // remove input file unless requested not to by user or error occurred +@@ -4425,7 +4425,7 @@ + { + NumBufferedBlocksMax = numCPU; + if (QuietMode != 1) +- fprintf(stderr, "*Warning* Max memory limit increased to %d MB to support %d CPUs\n", ((NumBufferedBlocksMax + (numCPU * 2)) * blockSize)/1000000, numCPU); ++ fprintf(stderr, "*Warning* Max memory limit increased to %zd MB to support %d CPUs\n", ((NumBufferedBlocksMax + (numCPU * 2)) * blockSize)/1000000, numCPU); + } + else + { +@@ -4453,7 +4453,7 @@ if (ret != 0) { -- fprintf(stderr, "pbzip2: *ERROR: Not enough resources to create consumer thread #%u (code = %d) Aborting...\n", i, ret); -+ fprintf(stderr, "pbzip2: *ERROR: Not enough resources to create consumer thread #%zu (code = %d) Aborting...\n", i, ret); + ErrorContext::getInstance()->saveError(); +- handle_error(EF_EXIT, 1, "pbzip2: *ERROR: Not enough resources to create consumer thread #%u (code = %d) Aborting...\n", i, ret); ++ handle_error(EF_EXIT, 1, "pbzip2: *ERROR: Not enough resources to create consumer thread #%zu (code = %d) Aborting...\n", i, ret); + ret = pthread_join(TerminatorThread, NULL); return 1; } - } -@@ -3726,7 +3726,7 @@ - ret = pthread_create(&fifo->consumers[i], &ChildThreadAttributes, consumer, fifo); - if (ret != 0) +@@ -4526,7 +4526,7 @@ { -- fprintf(stderr, "pbzip2: *ERROR: Not enough resources to create consumer thread #%u (code = %d) Aborting...\n", i, ret); -+ fprintf(stderr, "pbzip2: *ERROR: Not enough resources to create consumer thread #%zu (code = %d) Aborting...\n", i, ret); + ErrorContext::getInstance()->saveError(); + handle_error(EF_EXIT, 1, +- "pbzip2: *ERROR: Not enough resources to create consumer thread #%u (code = %d) Aborting...\n", i, ret); ++ "pbzip2: *ERROR: Not enough resources to create consumer thread #%zu (code = %d) Aborting...\n", i, ret); + pthread_join(TerminatorThread, NULL); return 1; } - } +--- BZ2StreamScanner.cpp.orig 2011-11-03 09:37:54.461000463 +0100 ++++ BZ2StreamScanner.cpp 2011-11-03 09:38:32.413000463 +0100 +@@ -488,16 +488,16 @@ + + void BZ2StreamScanner::printCurrentState() + { +- fprintf( stderr, "current=%d, search pos=%d, end pos=%d; s-c=%d" +- "; out buf size=%d; out buf capacity=%d; header found=%d; search status=%d", ++ fprintf( stderr, "current=%ld, search pos=%ld, end pos=%ld; s-c=%ld" ++ "; out buf size=%u; out buf capacity=%zu; header found=%d; search status=%d", + getInBuffCurrent() - getInBuffBegin(), + getInBuffSearchPtr() - getInBuffBegin(), + getInBuffEnd() - getInBuffBegin(), + getInBuffSearchPtr() - getInBuffCurrent(), +- (int)_outBuff.bufSize, +- (int)_outBuffCapacity, +- (int)isBz2HeaderFound(), +- (int)getSearchStatus() ); ++ _outBuff.bufSize, ++ _outBuffCapacity, ++ isBz2HeaderFound(), ++ getSearchStatus() ); + } + + /** -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
