Hello community, here is the log from the commit of package pbzip2 for openSUSE:Factory checked in at 2016-02-22 08:58:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pbzip2 (Old) and /work/SRC/openSUSE:Factory/.pbzip2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pbzip2" Changes: -------- --- /work/SRC/openSUSE:Factory/pbzip2/pbzip2.changes 2015-03-12 16:39:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pbzip2.new/pbzip2.changes 2016-02-22 08:58:27.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Feb 20 14:23:18 UTC 2016 - mplus...@suse.com + +- Update to 1.1.13 + * Bugfix release +- Drop no longer needed pbzip2-makefile.patch + +------------------------------------------------------------------- Old: ---- pbzip2-1.1.12.tar.gz pbzip2-makefile.patch New: ---- pbzip2-1.1.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pbzip2.spec ++++++ --- /var/tmp/diff_new_pack.gPwyGe/_old 2016-02-22 08:58:28.000000000 +0100 +++ /var/tmp/diff_new_pack.gPwyGe/_new 2016-02-22 08:58:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pbzip2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: pbzip2 -Version: 1.1.12 +Version: 1.1.13 Release: 0 Summary: Parallelized Implementation of bzip2 License: BSD-4-Clause @@ -25,8 +25,6 @@ Url: http://compression.ca/pbzip2/ Source0: https://launchpad.net/pbzip2/1.1/%{version}/+download/pbzip2-%{version}.tar.gz Source1: macros.pbzip2.in -# pbleser: add support for DESTDIR, MANDIR, BINDIR and OPTFLAGS in Makefile -Patch1: pbzip2-makefile.patch # pbleser: fix not using the result value of fwrite() Patch3: pbzip2-fix_unused_result.patch BuildRequires: gcc-c++ @@ -39,13 +37,12 @@ machines. %prep -%setup -q -n "%{name}-%{version}" -%patch1 +%setup -q %patch3 %build make %{?_smp_mflags} \ - OPTFLAGS="%{optflags} -Wall" \ + CXXFLAGS="%{optflags} -Wall" \ PREFIX="%{_prefix}" \ BINDIR="%{_bindir}" \ MANDIR="%{_mandir}" \ @@ -72,9 +69,9 @@ %{_bindir}/pbzip2 %{_bindir}/pbunzip2 %{_bindir}/pbzcat -%doc %{_mandir}/man1/pbzip2.1%{ext_man} -%doc %{_mandir}/man1/pbunzip2.1%{ext_man} -%doc %{_mandir}/man1/pbzcat.1%{ext_man} +%{_mandir}/man1/pbzip2.1%{ext_man} +%{_mandir}/man1/pbunzip2.1%{ext_man} +%{_mandir}/man1/pbzcat.1%{ext_man} %config %{_sysconfdir}/rpm/macros.%{name} %changelog ++++++ pbzip2-1.1.12.tar.gz -> pbzip2-1.1.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbzip2-1.1.12/COPYING new/pbzip2-1.1.13/COPYING --- old/pbzip2-1.1.12/COPYING 2014-12-21 11:26:26.000000000 +0100 +++ new/pbzip2-1.1.13/COPYING 2015-12-18 00:32:49.000000000 +0100 @@ -37,4 +37,4 @@ Jeff Gilchrist, Ottawa, Canada. pbz...@compression.ca -pbzip2 version 1.1.12 of Dec 21, 2014 +pbzip2 version 1.1.13 of Dec 18, 2015 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbzip2-1.1.12/ChangeLog new/pbzip2-1.1.13/ChangeLog --- old/pbzip2-1.1.12/ChangeLog 2014-12-21 11:26:26.000000000 +0100 +++ new/pbzip2-1.1.13/ChangeLog 2015-12-18 00:32:49.000000000 +0100 @@ -1,3 +1,8 @@ +Changes in 1.1.13 (Dec 18, 2015) +- #1404812 add support for DESTDIR in Makefile (thanks to Ryan Schmidt) +- #1429181 fix bad CYGWIN define (thanks to Marco Atzeri) +- #1337949 rm unused vars; add hasInFile flag (thanks to Mingxing Zhang) +- #1524909 - output sometimes truncated on redirected -cd Changes in 1.1.12 (Dec 21, 2014) - #1402154 - make relative symlinks on install (thanks to Evangelos Foutras) - Install manpages to share folder, thanks to Ryan Schmidt (#1402044) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbzip2-1.1.12/Makefile new/pbzip2-1.1.13/Makefile --- old/pbzip2-1.1.12/Makefile 2014-12-21 11:26:26.000000000 +0100 +++ new/pbzip2-1.1.13/Makefile 2015-12-18 00:32:49.000000000 +0100 @@ -60,6 +60,7 @@ # Where you want pbzip2 installed when you do 'make install' PREFIX = /usr +DESTDIR = all: pbzip2 @@ -74,16 +75,16 @@ # Install the binary pbzip2 program and man page install: pbzip2 - if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi - if ( test ! -d $(PREFIX)/share ) ; then mkdir -p $(PREFIX)/share ; fi - if ( test ! -d $(PREFIX)/share/man ) ; then mkdir -p $(PREFIX)/share/man ; fi - if ( test ! -d $(PREFIX)/share/man/man1 ) ; then mkdir -p $(PREFIX)/share/man/man1 ; fi - cp -f pbzip2 $(PREFIX)/bin/pbzip2 - chmod a+x $(PREFIX)/bin/pbzip2 - ln -s -f pbzip2 $(PREFIX)/bin/pbunzip2 - ln -s -f pbzip2 $(PREFIX)/bin/pbzcat - cp -f pbzip2.1 $(PREFIX)/share/man/man1 - chmod a+r $(PREFIX)/share/man/man1/pbzip2.1 + if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi + if ( test ! -d $(DESTDIR)$(PREFIX)/share ) ; then mkdir -p $(DESTDIR)$(PREFIX)/share ; fi + if ( test ! -d $(DESTDIR)$(PREFIX)/share/man ) ; then mkdir -p $(DESTDIR)$(PREFIX)/share/man ; fi + if ( test ! -d $(DESTDIR)$(PREFIX)/share/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 ; fi + cp -f pbzip2 $(DESTDIR)$(PREFIX)/bin/pbzip2 + chmod a+x $(DESTDIR)$(PREFIX)/bin/pbzip2 + ln -s -f pbzip2 $(DESTDIR)$(PREFIX)/bin/pbunzip2 + ln -s -f pbzip2 $(DESTDIR)$(PREFIX)/bin/pbzcat + cp -f pbzip2.1 $(DESTDIR)$(PREFIX)/share/man/man1 + chmod a+r $(DESTDIR)$(PREFIX)/share/man/man1/pbzip2.1 clean: rm -f *.o pbzip2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbzip2-1.1.12/README new/pbzip2-1.1.13/README --- old/pbzip2-1.1.12/README 2014-12-21 11:26:26.000000000 +0100 +++ new/pbzip2-1.1.13/README 2015-12-18 00:32:49.000000000 +0100 @@ -1,6 +1,6 @@ -Dec 21, 2014 +Dec 18, 2015 -Parallel BZIP2 v1.1.10 - by: Jeff Gilchrist <pbz...@compression.ca> +Parallel BZIP2 v1.1.13 - by: Jeff Gilchrist <pbz...@compression.ca> Available at: http://compression.ca/ This is the README for pbzip2, a parallel implementation of the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbzip2-1.1.12/pbzip2.cpp new/pbzip2-1.1.13/pbzip2.cpp --- old/pbzip2-1.1.12/pbzip2.cpp 2014-12-21 11:26:26.000000000 +0100 +++ new/pbzip2-1.1.13/pbzip2.cpp 2015-12-18 00:32:49.000000000 +0100 @@ -44,7 +44,6 @@ static int unfinishedWorkCleaned = 0; static int numCPU = 2; static int IgnoreTrailingGarbageFlag = 0; // ingnore trailing garbage on decompress flag -static int QUEUESIZE = 2; static int SIG_HANDLER_QUIT_SIGNAL = SIGUSR1; // signal used to stop SignalHandlerThread #ifdef USE_STACKSIZE_CUSTOMIZATION static int ChildThreadStackSize = 0; // -1 - don't modify stacksize; 0 - use minimum; > 0 - use specified @@ -55,7 +54,6 @@ static unsigned char Bz2HeaderZero[] = { 0x42, 0x5A, 0x68, 0x39, 0x17, 0x72, 0x45, 0x38, 0x50, 0x90, 0x00, 0x00, 0x00, 0x00 }; static OFF_T InFileSize; -static OFF_T InBytesProduced = 0; static int NumBlocks = 0; static int NumBlocksEstimated = 0; static int NumBufferedBlocks = 0; @@ -1195,7 +1193,6 @@ int producer_decompress(int hInfile, OFF_T fileSize, queue *fifo) { safe_mutex_lock(&ProgressIndicatorsMutex); - InBytesProduced = 0; NumBlocks = 0; safe_mutex_unlock(&ProgressIndicatorsMutex); @@ -1255,7 +1252,6 @@ safe_cond_signal (fifo->notEmpty); safe_mutex_lock(&ProgressIndicatorsMutex); - InBytesProduced += fileData->bufSize; NumBlocks = fileData->blockNumber + 1; safe_mutex_unlock(&ProgressIndicatorsMutex); @@ -2083,6 +2079,21 @@ return 0; } +void close_streams(FILE *out, FILE *in) +{ + if (out != NULL) { + fflush(out); + } + + if (in != NULL && in != stdin) { + fclose(in); + } + + if (out != NULL && out != stdout) { + fclose(out); + } +} + /* ********************************************************* */ @@ -2125,9 +2136,7 @@ // check file stream for errors if (ferror(zStream)) { - if (zStream != stdin) - fclose(zStream); - + close_streams(stream, zStream); handle_error(EF_EXIT, -1, "pbzip2: *ERROR: Problem with input stream of file [%s]! Aborting...\n", InFilename); return -1; @@ -2155,9 +2164,7 @@ // check file stream for errors if (ferror(stream)) { - if (stream != stdout) - fclose(stream); - + close_streams(stream, zStream); handle_error(EF_EXIT, -1, "pbzip2: *ERROR: Problem with output stream of file [%s]! Aborting...\n", InFilename); return -1; @@ -2169,10 +2176,7 @@ if (syncGetTerminateFlag() != 0) { fprintf (stderr, "directdecompress: terminating1 - terminateFlag set\n"); - if (zStream != stdin) - fclose(zStream); - if (stream != stdout) - fclose(stream); + close_streams(stream, zStream); return -1; } @@ -2180,11 +2184,8 @@ if (bzf == NULL || bzerr != BZ_OK) { ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); - if (zStream != stdin) - fclose(zStream); - if (stream != stdout) - fclose(stream); - + close_streams(stream, zStream); + if (ret != 0) { syncSetTerminateFlag(1); @@ -2200,10 +2201,7 @@ if (syncGetTerminateFlag() != 0) { fprintf (stderr, "directdecompress: terminating2 - terminateFlag set\n"); - if (zStream != stdin) - fclose(zStream); - if (stream != stdout) - fclose(stream); + close_streams(stream, zStream); return -1; } @@ -2225,11 +2223,8 @@ if (ferror(zStream)) { ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); - if (zStream != stdin) - fclose(zStream); - if (stream != stdout) - fclose(stream); - + close_streams(stream, zStream); + if (ret != 0) { syncSetTerminateFlag(1); @@ -2242,11 +2237,8 @@ if (ferror(stream)) { ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); - if (zStream != stdin) - fclose(zStream); - if (stream != stdout) - fclose(stream); - + close_streams(stream, zStream); + if (ret != 0) { syncSetTerminateFlag(1); @@ -2263,11 +2255,8 @@ if (ferror(stream)) { ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); - if (zStream != stdin) - fclose(zStream); - if (stream != stdout) - fclose(stream); - + close_streams(stream, zStream); + if (ret != 0) { syncSetTerminateFlag(1); @@ -2278,11 +2267,8 @@ if (bzerr != BZ_STREAM_END) { ret = testBZ2ErrorHandling(bzerr, bzf, streamNo); - if (zStream != stdin) - fclose(zStream); - if (stream != stdout) - fclose(stream); - + close_streams(stream, zStream); + if (ret != 0) { syncSetTerminateFlag(1); @@ -2416,7 +2402,6 @@ safe_mutex_lock(&ProgressIndicatorsMutex); NumBlocks = 0; - InBytesProduced = 0; safe_mutex_unlock(&ProgressIndicatorsMutex); // keep going until all the file is processed @@ -2510,7 +2495,6 @@ safe_mutex_lock(&ProgressIndicatorsMutex); ++NumBlocks; - InBytesProduced += inSize; safe_mutex_unlock(&ProgressIndicatorsMutex); safe_mutex_unlock(fifo->mut); @@ -2692,7 +2676,6 @@ queue *queueInit(int queueSize) { queue *q; - QUEUESIZE = queueSize; q = new(std::nothrow) queue; if (q == NULL) @@ -3224,7 +3207,7 @@ */ void banner() { - fprintf(stderr, "Parallel BZIP2 v1.1.12 [Dec 21, 2014]\n"); + fprintf(stderr, "Parallel BZIP2 v1.1.13 [Dec 18, 2015]\n"); fprintf(stderr, "By: Jeff Gilchrist [http://compression.ca]\n";); fprintf(stderr, "Major contributions: Yavor Nikolov [http://javornikolov.wordpress.com]\n";); fprintf(stderr, "Uses libbzip2 by Julian Seward\n"); @@ -3298,6 +3281,7 @@ pthread_t output; char **FileList = NULL; char *InFilename = NULL; + bool hasInFile = false; char *progName = NULL; char *progNamePos = NULL; char bz2Header[] = {"BZh91AY&SY"}; // using 900k block size @@ -3870,6 +3854,7 @@ // set input filename InFilename = FileList[fileLoop]; + hasInFile = (strcmp(InFilename, "-") != 0); // test file for errors if requested if (testFile != 0) @@ -3877,7 +3862,7 @@ if (QuietMode != 1) { fprintf(stderr, " File #: %d of %d\n", fileLoop+1, FileListCount); - if (strcmp(InFilename, "-") != 0) + if (hasInFile) fprintf(stderr, " Testing: %s\n", InFilename); else fprintf(stderr, " Testing: <stdin>\n"); @@ -3900,7 +3885,7 @@ // set ouput filename outFilename = std::string(FileList[fileLoop]); - if ((decompress == 1) && (strcmp(InFilename, "-") != 0)) + if ((decompress == 1) && hasInFile) { // check if input file is a valid .bz2 compressed file hInfile = open(InFilename, O_RDONLY | O_BINARY); @@ -4000,7 +3985,7 @@ sigOutFilename = outFilename.c_str(); safe_mutex_unlock(&ErrorHandlerMutex); - if (strcmp(InFilename, "-") != 0) + if (hasInFile) { struct stat statbuf; // read file for compression @@ -4116,7 +4101,7 @@ if (decompress == 1) fprintf(stderr, " BWT Block Size: %c00k\n", BWTblockSizeChar); - if (strcmp(InFilename, "-") != 0) + if (hasInFile) fprintf(stderr, " Input Size: %"PRIuMAX" bytes\n", (uintmax_t)InFileSize); } @@ -4130,7 +4115,7 @@ noThreads = 0; // Enable threads method for uncompressing from stdin - if ((numCPU > 1) && (strcmp(InFilename, "-") == 0)) + if ((numCPU > 1) && !hasInFile) noThreads = 0; } // if (decompress == 1) else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbzip2-1.1.12/pbzip2.h new/pbzip2-1.1.13/pbzip2.h --- old/pbzip2-1.1.12/pbzip2.h 2014-12-21 11:26:26.000000000 +0100 +++ new/pbzip2-1.1.13/pbzip2.h 2015-12-18 00:32:49.000000000 +0100 @@ -68,7 +68,7 @@ //#define PBZIP_NO_LOADAVG // detect systems that are known not to support load average code -#if defined (WIN32) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (__BORLANDC__) || defined (__hpux) || defined (__osf__) || defined(__UCLIBC__) +#if defined (WIN32) || defined (__CYGWIN__) || defined (__MINGW32__) || defined (__BORLANDC__) || defined (__hpux) || defined (__osf__) || defined(__UCLIBC__) #define PBZIP_NO_LOADAVG #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbzip2-1.1.12/pbzip2.spec new/pbzip2-1.1.13/pbzip2.spec --- old/pbzip2-1.1.12/pbzip2.spec 2014-12-21 11:26:26.000000000 +0100 +++ new/pbzip2-1.1.13/pbzip2.spec 2015-12-18 00:32:49.000000000 +0100 @@ -53,6 +53,9 @@ %changelog +* Fri Dec 18 2015 Jeff Gilchrist <pbz...@compression.ca> - 1.1.13-1 +- Release 1.1.13 + * Sun Dec 21 2014 Jeff Gilchrist <pbz...@compression.ca> - 1.1.12-1 - Release 1.1.12
