April 2017 - openSUSE Commits - openSUSE Mailing Lists

commit cmake for openSUSE:Factory
by root＠hilbert.suse.de 06 Apr '17

06 Apr '17

Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2017-04-06 10:59:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmake" Thu Apr 6 10:59:51 2017 rev:131 rq:483468 version:3.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2017-01-18 21:30:48.437923830 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2017-04-06 10:59:52.914818916 +0200 @@ -1,0 +2,12 @@ +Wed Mar 29 14:59:26 UTC 2017 - bwiedemann(a)suse.com + +- Add reproducible.patch and reproducible2.patch + to allow for reproducible builds of freerdp and other packages + +------------------------------------------------------------------- +Tue Mar 28 09:14:23 UTC 2017 - pgajdos(a)suse.com + +- find ImageMagick 7 + + cmake-ImageMagick7.patch + +------------------------------------------------------------------- New: ---- cmake-ImageMagick7.patch reproducible.patch reproducible2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.Lygvu6/_old 2017-04-06 10:59:55.498453760 +0200 +++ /var/tmp/diff_new_pack.Lygvu6/_new 2017-04-06 10:59:55.502453194 +0200 @@ -36,6 +36,12 @@ Patch4: form.patch # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs Patch5: system-libs.patch +# PATCH-FIX-UPSTREAM cmake-ImageMagick7.patch -- find also ImageMagick 7 +Patch6: cmake-ImageMagick7.patch +# PATCH-FIX-UPSTREAM reproducible.patch -- https://gitlab.kitware.com/cmake/cmake/merge_requests/432 +Patch7: reproducible.patch +# PATCH-FIX-UPSTREAM reproducible2.patch -- https://gitlab.kitware.com/cmake/cmake/merge_requests/446 +Patch8: reproducible2.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -75,6 +81,9 @@ %patch2 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build export CFLAGS="%{optflags}" ++++++ cmake-ImageMagick7.patch ++++++ Index: cmake-3.7.2/Modules/FindImageMagick.cmake =================================================================== --- cmake-3.7.2.orig/Modules/FindImageMagick.cmake 2017-01-13 15:05:41.000000000 +0100 +++ cmake-3.7.2/Modules/FindImageMagick.cmake 2017-03-28 11:00:23.197144625 +0200 @@ -88,13 +88,13 @@ find_package(PkgConfig QUIET) #--------------------------------------------------------------------- # Helper functions #--------------------------------------------------------------------- -function(FIND_IMAGEMAGICK_API component header) +function(FIND_IMAGEMAGICK_API component header6 header7) set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE) pkg_check_modules(PC_${component} QUIET ${component}) find_path(ImageMagick_${component}_INCLUDE_DIR - NAMES ${header} + NAMES ${header6} ${header7} HINTS ${PC_${component}_INCLUDEDIR} ${PC_${component}_INCLUDE_DIRS} @@ -195,17 +195,17 @@ foreach(component ${ImageMagick_FIND_COM ) if(component STREQUAL "Magick++") FIND_IMAGEMAGICK_API(Magick++ Magick++.h - Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI + Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-7.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-7.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-7.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-7.Q8HDRI Magick++-Q8HDRI ) list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) elseif(component STREQUAL "MagickWand") - FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h - Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI + FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h MagickWand/MagickWand.h + Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-7.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-7.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-7.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-7.Q8HDRI MagickWand-Q8HDRI ) list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) elseif(component STREQUAL "MagickCore") - FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h - Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI + FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h MagickCore/MagickCore.h + Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-7.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-7.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-7.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-7.Q8HDRI MagickCore-Q8HDRI ) list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) else() ++++++ reproducible.patch ++++++ commit 243aed525a2fd8e5fe32139fd0f8d0cc0e40cc33 Author: Bernhard M. Wiedemann <bwiedemann(a)suse.de> Date: Wed Jan 25 07:15:40 2017 +0100 cmTimestamp: Support SOURCE_DATE_EPOCH to override current time See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable. diff --git a/Help/command/string.rst b/Help/command/string.rst index 77538f6..2c7847a 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -329,6 +329,12 @@ If no explicit ``<format string>`` is given it will default to: Write a string which can be used as an identifier in C. +.. note:: + + If the ``SOURCE_DATE_EPOCH`` environment variable is set, + its value will be used instead of the current time. + See https://reproducible-builds.org/specs/source-date-epoch/ for details. + UUID """" diff --git a/Help/release/dev/SOURCE_DATE_EPOCH.rst b/Help/release/dev/SOURCE_DATE_EPOCH.rst new file mode 100644 index 0000000..576e1da --- /dev/null +++ b/Help/release/dev/SOURCE_DATE_EPOCH.rst @@ -0,0 +1,5 @@ +SOURCE_DATE_EPOCH +----------------- + +* The :command:`string(TIMESTAMP)` will now honor the ``SOURCE_DATE_EPOCH`` + environment variable and use its value instead of the current time. diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 4a97114..1e5ac5b 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -12,6 +13,16 @@ std::string cmTimestamp::CurrentTime(const std::string& formatString, bool utcFlag) { time_t currentTimeT = time(CM_NULLPTR); + std::string source_date_epoch; + cmSystemTools::GetEnv("SOURCE_DATE_EPOCH", source_date_epoch); + if (!source_date_epoch.empty()) { + std::istringstream iss(source_date_epoch); + iss >> currentTimeT; + if (iss.fail() || !iss.eof()) { + cmSystemTools::Error("Cannot parse SOURCE_DATE_EPOCH as integer"); + exit(27); + } + } if (currentTimeT == time_t(-1)) { return std::string(); } diff --git a/Tests/RunCMake/string/RunCMakeTest.cmake b/Tests/RunCMake/string/RunCMakeTest.cmake index 8067d9d..38a77b0 100644 --- a/Tests/RunCMake/string/RunCMakeTest.cmake +++ b/Tests/RunCMake/string/RunCMakeTest.cmake @@ -6,6 +6,11 @@ run_cmake(AppendNoArgs) run_cmake(Concat) run_cmake(ConcatNoArgs) +run_cmake(Timestamp) +run_cmake(TimestampEmpty) +run_cmake(TimestampInvalid) +run_cmake(TimestampInvalid2) + run_cmake(Uuid) run_cmake(UuidMissingNamespace) run_cmake(UuidMissingNamespaceValue) diff --git a/Tests/RunCMake/string/Timestamp-result.txt b/Tests/RunCMake/string/Timestamp-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/string/Timestamp-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/string/Timestamp-stderr.txt b/Tests/RunCMake/string/Timestamp-stderr.txt new file mode 100644 index 0000000..c12b070 --- /dev/null +++ b/Tests/RunCMake/string/Timestamp-stderr.txt @@ -0,0 +1 @@ +RESULT=2005-08-07 23:19:49 Sun Aug 05 day=219 wd=0 week=32 %%I=11 diff --git a/Tests/RunCMake/string/Timestamp.cmake b/Tests/RunCMake/string/Timestamp.cmake new file mode 100644 index 0000000..1232300 --- /dev/null +++ b/Tests/RunCMake/string/Timestamp.cmake @@ -0,0 +1,3 @@ +set(ENV{SOURCE_DATE_EPOCH} "1123456789") +string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S %a %b %y day=%j wd=%w week=%U %%I=%I" UTC) +message("RESULT=${RESULT}") diff --git a/Tests/RunCMake/string/TimestampEmpty-result.txt b/Tests/RunCMake/string/TimestampEmpty-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/string/TimestampEmpty-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/string/TimestampEmpty-stderr.txt b/Tests/RunCMake/string/TimestampEmpty-stderr.txt new file mode 100644 index 0000000..35cbd3c --- /dev/null +++ b/Tests/RunCMake/string/TimestampEmpty-stderr.txt @@ -0,0 +1 @@ +RESULT=2 diff --git a/Tests/RunCMake/string/TimestampEmpty.cmake b/Tests/RunCMake/string/TimestampEmpty.cmake new file mode 100644 index 0000000..21b770f --- /dev/null +++ b/Tests/RunCMake/string/TimestampEmpty.cmake @@ -0,0 +1,3 @@ +set(ENV{SOURCE_DATE_EPOCH} "") +string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC) +message("RESULT=${RESULT}") diff --git a/Tests/RunCMake/string/TimestampInvalid-result.txt b/Tests/RunCMake/string/TimestampInvalid-result.txt new file mode 100644 index 0000000..f64f5d8 --- /dev/null +++ b/Tests/RunCMake/string/TimestampInvalid-result.txt @@ -0,0 +1 @@ +27 diff --git a/Tests/RunCMake/string/TimestampInvalid-stderr.txt b/Tests/RunCMake/string/TimestampInvalid-stderr.txt new file mode 100644 index 0000000..75566da --- /dev/null +++ b/Tests/RunCMake/string/TimestampInvalid-stderr.txt @@ -0,0 +1 @@ +CMake Error: Cannot parse SOURCE_DATE_EPOCH as integer diff --git a/Tests/RunCMake/string/TimestampInvalid.cmake b/Tests/RunCMake/string/TimestampInvalid.cmake new file mode 100644 index 0000000..ab36270 --- /dev/null +++ b/Tests/RunCMake/string/TimestampInvalid.cmake @@ -0,0 +1,3 @@ +set(ENV{SOURCE_DATE_EPOCH} "invalid-integer") +string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC) +message("RESULT=${RESULT}") diff --git a/Tests/RunCMake/string/TimestampInvalid2-result.txt b/Tests/RunCMake/string/TimestampInvalid2-result.txt new file mode 100644 index 0000000..f64f5d8 --- /dev/null +++ b/Tests/RunCMake/string/TimestampInvalid2-result.txt @@ -0,0 +1 @@ +27 diff --git a/Tests/RunCMake/string/TimestampInvalid2-stderr.txt b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt new file mode 100644 index 0000000..75566da --- /dev/null +++ b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt @@ -0,0 +1 @@ +CMake Error: Cannot parse SOURCE_DATE_EPOCH as integer diff --git a/Tests/RunCMake/string/TimestampInvalid2.cmake b/Tests/RunCMake/string/TimestampInvalid2.cmake new file mode 100644 index 0000000..5cc61b8 --- /dev/null +++ b/Tests/RunCMake/string/TimestampInvalid2.cmake @@ -0,0 +1,3 @@ +set(ENV{SOURCE_DATE_EPOCH} "123trailing-garbage") +string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC) +message("RESULT=${RESULT}") ++++++ reproducible2.patch ++++++ commit 5181f1f86a4d4c2ac09a540285c938fe2c2fa262 Author: Bernhard M. Wiedemann <bwiedemann(a)suse.de> Date: Sun Jan 29 11:52:55 2017 +0100 Tests: make tests pass with SOURCE_DATE_EPOCH set Fix tests to account for commit 243aed52 (cmTimestamp: Support SOURCE_DATE_EPOCH to override current time, 2017-01-25). In openSUSE we are running the test-suite as part of the build and that failed in these two places when building everything with `SOURCE_DATE_EPOCH` set. diff --git a/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake b/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake index d0e5fe3..f1aa390 100644 --- a/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake +++ b/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake @@ -1,6 +1,7 @@ set(STAMP_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/FileTimestamp-Stamp") set(STAMP_FORMAT "%Y-%m-%d") +unset(ENV{SOURCE_DATE_EPOCH}) string(TIMESTAMP timestamp1 "${STAMP_FORMAT}") file(WRITE "${STAMP_FILENAME}" "foo") diff --git a/Tests/CTestTestStopTime/GetDate.cmake b/Tests/CTestTestStopTime/GetDate.cmake index 1f4cb24..46ab2fb 100644 --- a/Tests/CTestTestStopTime/GetDate.cmake +++ b/Tests/CTestTestStopTime/GetDate.cmake @@ -49,6 +49,7 @@ macro(GET_DATE) # 01/12/2006 08:55:12 # mm/dd/YYYY HH:MM:SS # + unset(ENV{SOURCE_DATE_EPOCH}) string(TIMESTAMP "${GD_PREFIX}OV" "%m/%d/%Y %H:%M:%S") if(${GD_PREFIX}VERBOSE)

1 0

commit tiff for openSUSE:Factory
by root＠hilbert.suse.de 06 Apr '17

06 Apr '17

Hello community, here is the log from the commit of package tiff for openSUSE:Factory checked in at 2017-04-06 10:59:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tiff (Old) and /work/SRC/openSUSE:Factory/.tiff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tiff" Thu Apr 6 10:59:47 2017 rev:66 rq:483282 version:4.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/tiff/tiff.changes 2017-02-08 10:44:45.411249240 +0100 +++ /work/SRC/openSUSE:Factory/.tiff.new/tiff.changes 2017-04-06 10:59:48.771404523 +0200 @@ -1,0 +2,37 @@ +Wed Mar 29 07:55:02 UTC 2017 - fstrba(a)suse.com + +- Added patches: + * tiff-CVE-2016-10266.patch + + Upstream fix for CVE-2016-10266, LibTIFF 4.0.7 allows remote + attackers to cause a denial of service (divide-by-zero error + and application crash) via a crafted TIFF image (bsc#1031263) + * tiff-CVE-2016-10267.patch + + Upstream fix for CVE-2016-10267, LibTIFF 4.0.7 allows remote + attackers to cause a denial of service (divide-by-zero error + and application crash) via a crafted TIFF image (bsc#1031262) + * tiff-CVE-2016-10268.patch + + Upstream fix for CVE-2016-10268, LibTIFF 4.0.7 allows remote + attackers to cause a denial of service (divide-by-zero error + and application crash) via a crafted TIFF image (bsc#1031255) + * tiff-CVE-2016-10269.patch + + Upstream fix for CVE-2016-10269, LibTIFF 4.0.7 allows remote + attackers to cause a denial of service (heap-based buffer + over-read) or possibly have unspecified other impact via a + crafted TIFF image (bsc#1031254) + * tiff-CVE-2016-10270.patch + + Upstream fix for CVE-2016-10270, LibTIFF 4.0.7 allows remote + attackers to cause a denial of service (heap-based buffer + over-read) or possibly have unspecified other impact via a + crafted TIFF image (bsc#1031250) + * tiff-CVE-2016-10271.patch + + Upstream fix for CVE-2016-10271, LibTIFF 4.0.7 allows remote + attackers to cause a denial of service (heap-based buffer + over-read and buffer overflow) or possibly have unspecified + other impact via a crafted TIFF image (bsc#1031249) + * tiff-CVE-2016-10272.patch + + Upstream fix for CVE-2016-10272, LibTIFF 4.0.7 allows remote + attackers to cause a denial of service (heap-based buffer + overflow) or possibly have unspecified other impact via a + crafted TIFF image (bsc#1031247) + +------------------------------------------------------------------- New: ---- tiff-CVE-2016-10266.patch tiff-CVE-2016-10267.patch tiff-CVE-2016-10268.patch tiff-CVE-2016-10269.patch tiff-CVE-2016-10270.patch tiff-CVE-2016-10271.patch tiff-CVE-2016-10272.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tiff.spec ++++++ --- /var/tmp/diff_new_pack.Y0JsFC/_old 2017-04-06 10:59:49.627283558 +0200 +++ /var/tmp/diff_new_pack.Y0JsFC/_new 2017-04-06 10:59:49.627283558 +0200 @@ -38,6 +38,14 @@ # bsc#1022103 Patch5: tiff-4.0.7-TIFFTAG_FAXRECVPARAMS.patch +Patch6: tiff-CVE-2016-10266.patch +Patch7: tiff-CVE-2016-10267.patch +Patch8: tiff-CVE-2016-10268.patch +Patch9: tiff-CVE-2016-10269.patch +Patch10: tiff-CVE-2016-10270.patch +Patch11: tiff-CVE-2016-10271.patch +Patch12: tiff-CVE-2016-10272.patch + BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: libtool @@ -103,6 +111,13 @@ %patch3 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build CFLAGS="%{optflags} -fPIE" ++++++ tiff-CVE-2016-10266.patch ++++++ --- a/libtiff/tif_read.c +++ b/libtiff/tif_read.c @@ -346,7 +346,7 @@ TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size) rowsperstrip=td->td_rowsperstrip; if (rowsperstrip>td->td_imagelength) rowsperstrip=td->td_imagelength; - stripsperplane=((td->td_imagelength+rowsperstrip-1)/rowsperstrip); + stripsperplane= TIFFhowmany_32_maxuint_compat(td->td_imagelength, rowsperstrip); stripinplane=(strip%stripsperplane); plane=(uint16)(strip/stripsperplane); rows=td->td_imagelength-stripinplane*rowsperstrip; --- a/libtiff/tiffiop.h +++ b/libtiff/tiffiop.h @@ -250,6 +250,10 @@ struct tiff { #define TIFFhowmany_32(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \ ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \ 0U) +/* Variant of TIFFhowmany_32() that doesn't return 0 if x close to MAXUINT. */ +/* Caution: TIFFhowmany_32_maxuint_compat(x,y)*y might overflow */ +#define TIFFhowmany_32_maxuint_compat(x, y) \ + (((uint32)(x) / (uint32)(y)) + ((((uint32)(x) % (uint32)(y)) != 0) ? 1 : 0)) #define TIFFhowmany8_32(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3) #define TIFFroundup_32(x, y) (TIFFhowmany_32(x,y)*(y)) #define TIFFhowmany_64(x, y) ((((uint64)(x))+(((uint64)(y))-1))/((uint64)(y))) ++++++ tiff-CVE-2016-10267.patch ++++++ --- a/libtiff/tif_ojpeg.c +++ b/libtiff/tif_ojpeg.c @@ -244,6 +244,7 @@ typedef enum { typedef struct { TIFF* tif; + int decoder_ok; #ifndef LIBJPEG_ENCAP_EXTERNAL JMP_BUF exit_jmpbuf; #endif @@ -722,6 +723,7 @@ OJPEGPreDecode(TIFF* tif, uint16 s) } sp->write_curstrile++; } + sp->decoder_ok = 1; return(1); } @@ -784,8 +786,14 @@ OJPEGPreDecodeSkipScanlines(TIFF* tif) static int OJPEGDecode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s) { + static const char module[]="OJPEGDecode"; OJPEGState* sp=(OJPEGState*)tif->tif_data; (void)s; + if( !sp->decoder_ok ) + { + TIFFErrorExt(tif->tif_clientdata,module,"Cannot decode: decoder not correctly initialized"); + return 0; + } if (sp->libjpeg_jpeg_query_style==0) { if (OJPEGDecodeRaw(tif,buf,cc)==0) ++++++ tiff-CVE-2016-10268.patch ++++++ --- a/tools/tiffcp.c +++ b/tools/tiffcp.c @@ -985,7 +985,7 @@ DECLAREcpFunc(cpDecodedStrips) tstrip_t s, ns = TIFFNumberOfStrips(in); uint32 row = 0; _TIFFmemset(buf, 0, stripsize); - for (s = 0; s < ns; s++) { + for (s = 0; s < ns && row < imagelength; s++) { tsize_t cc = (row + rowsperstrip > imagelength) ? TIFFVStripSize(in, imagelength - row) : stripsize; if (TIFFReadEncodedStrip(in, s, buf, cc) < 0 ++++++ tiff-CVE-2016-10269.patch ++++++ --- a/libtiff/tif_luv.c +++ b/libtiff/tif_luv.c @@ -158,6 +158,7 @@ typedef struct logLuvState LogLuvState; struct logLuvState { + int encoder_state; /* 1 if encoder correctly initialized */ int user_datafmt; /* user data format */ int encode_meth; /* encoding method */ int pixel_size; /* bytes per pixel */ @@ -1552,6 +1553,7 @@ LogLuvSetupEncode(TIFF* tif) td->td_photometric, "must be either LogLUV or LogL"); break; } + sp->encoder_state = 1; return (1); notsupported: TIFFErrorExt(tif->tif_clientdata, module, @@ -1563,19 +1565,27 @@ notsupported: static void LogLuvClose(TIFF* tif) { + LogLuvState* sp = (LogLuvState*) tif->tif_data; TIFFDirectory *td = &tif->tif_dir; + assert(sp != 0); /* * For consistency, we always want to write out the same * bitspersample and sampleformat for our TIFF file, * regardless of the data format being used by the application. * Since this routine is called after tags have been set but * before they have been recorded in the file, we reset them here. + * Note: this is really a nasty approach. See PixarLogClose */ - td->td_samplesperpixel = - (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; - td->td_bitspersample = 16; - td->td_sampleformat = SAMPLEFORMAT_INT; + if( sp->encoder_state ) + { + /* See PixarLogClose. Might avoid issues with tags whose size depends + * on those below, but not completely sure this is enough. */ + td->td_samplesperpixel = + (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; + td->td_bitspersample = 16; + td->td_sampleformat = SAMPLEFORMAT_INT; + } } static void --- a/libtiff/tif_pixarlog.c +++ b/libtiff/tif_pixarlog.c @@ -1233,8 +1233,10 @@ PixarLogPostEncode(TIFF* tif) static void PixarLogClose(TIFF* tif) { + PixarLogState* sp = (PixarLogState*) tif->tif_data; TIFFDirectory *td = &tif->tif_dir; + assert(sp != 0); /* In a really sneaky (and really incorrect, and untruthful, and * troublesome, and error-prone) maneuver that completely goes against * the spirit of TIFF, and breaks TIFF, on close, we covertly @@ -1243,8 +1245,19 @@ PixarLogClose(TIFF* tif) * readers that don't know about PixarLog, or how to set * the PIXARLOGDATFMT pseudo-tag. */ - td->td_bitspersample = 8; - td->td_sampleformat = SAMPLEFORMAT_UINT; + + if (sp->state&PLSTATE_INIT) { + /* We test the state to avoid an issue such as in + * http://bugzilla.maptools.org/show_bug.cgi?id=2604 + * What appends in that case is that the bitspersample is 1 and + * a TransferFunction is set. The size of the TransferFunction + * depends on 1<<bitspersample. So if we increase it, an access + * out of the buffer will happen at directory flushing. + * Another option would be to clear those targs. + */ + td->td_bitspersample = 8; + td->td_sampleformat = SAMPLEFORMAT_UINT; + } } static void ++++++ tiff-CVE-2016-10270.patch ++++++ --- a/libtiff/tif_dirread.c +++ b/libtiff/tif_dirread.c @@ -5502,8 +5502,7 @@ ChopUpSingleUncompressedStrip(TIFF* tif) uint64 rowblockbytes; uint64 stripbytes; uint32 strip; - uint64 nstrips64; - uint32 nstrips32; + uint32 nstrips; uint32 rowsperstrip; uint64* newcounts; uint64* newoffsets; @@ -5534,18 +5533,17 @@ ChopUpSingleUncompressedStrip(TIFF* tif) return; /* - * never increase the number of strips in an image + * never increase the number of rows per strip */ if (rowsperstrip >= td->td_rowsperstrip) return; - nstrips64 = TIFFhowmany_64(bytecount, stripbytes); - if ((nstrips64==0)||(nstrips64>0xFFFFFFFF)) /* something is wonky, do nothing. */ - return; - nstrips32 = (uint32)nstrips64; + nstrips = TIFFhowmany_32(td->td_imagelength, rowsperstrip); + if( nstrips == 0 ) + return; - newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), + newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), "for chopped \"StripByteCounts\" array"); - newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), + newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), "for chopped \"StripOffsets\" array"); if (newcounts == NULL || newoffsets == NULL) { /* @@ -5562,18 +5560,18 @@ ChopUpSingleUncompressedStrip(TIFF* tif) * Fill the strip information arrays with new bytecounts and offsets * that reflect the broken-up format. */ - for (strip = 0; strip < nstrips32; strip++) { + for (strip = 0; strip < nstrips; strip++) { if (stripbytes > bytecount) stripbytes = bytecount; newcounts[strip] = stripbytes; - newoffsets[strip] = offset; + newoffsets[strip] = stripbytes ? offset : 0; offset += stripbytes; bytecount -= stripbytes; } /* * Replace old single strip info with multi-strip info. */ - td->td_stripsperimage = td->td_nstrips = nstrips32; + td->td_stripsperimage = td->td_nstrips = nstrips; TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip); _TIFFfree(td->td_stripbytecount); --- a/libtiff/tif_strip.c +++ b/libtiff/tif_strip.c @@ -63,15 +63,6 @@ TIFFNumberOfStrips(TIFF* tif) TIFFDirectory *td = &tif->tif_dir; uint32 nstrips; - /* If the value was already computed and store in td_nstrips, then return it, - since ChopUpSingleUncompressedStrip might have altered and resized the - since the td_stripbytecount and td_stripoffset arrays to the new value - after the initial affectation of td_nstrips = TIFFNumberOfStrips() in - tif_dirread.c ~line 3612. - See http://bugzilla.maptools.org/show_bug.cgi?id=2587 */ - if( td->td_nstrips ) - return td->td_nstrips; - nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 : TIFFhowmany_32(td->td_imagelength, td->td_rowsperstrip)); if (td->td_planarconfig == PLANARCONFIG_SEPARATE) ++++++ tiff-CVE-2016-10271.patch ++++++ --- a/tools/tiffcrop.c +++ b/tools/tiffcrop.c @@ -3698,7 +3698,7 @@ static int readContigStripsIntoBuffer (TIFF* in, uint8* buf) (unsigned long) strip, (unsigned long)rows); return 0; } - bufp += bytes_read; + bufp += stripsize; } return 1; ++++++ tiff-CVE-2016-10272.patch ++++++ --- a/tools/tiff2pdf.c +++ b/tools/tiff2pdf.c @@ -2895,7 +2895,7 @@ tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_ return(0); } if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt) != 0) { - if (count >= 4) { + if (count > 4) { /* Ignore EOI marker of JpegTables */ _TIFFmemcpy(buffer, jpt, count - 2); bufferoffset += count - 2;

1 0

commit ImageMagick for openSUSE:Factory
by root＠hilbert.suse.de 06 Apr '17

06 Apr '17

Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2017-04-06 10:59:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ImageMagick" Thu Apr 6 10:59:42 2017 rev:137 rq:483272 version:7.0.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2017-03-24 01:52:49.644871252 +0100 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick.changes 2017-04-06 10:59:44.743973737 +0200 @@ -1,0 +2,18 @@ +Wed Mar 22 11:26:21 UTC 2017 - pgajdos(a)suse.com + +- updated to 7.0.5-4 + * new branch, see + https://www.imagemagick.org/script/porting.php +- deleted unneded patches + . ImageMagick-6.6.8.9-doc.patch + . ImageMagick-6.6.8.9-examples.patch + . ImageMagick-6.7.6.1-no-dist-lzip.patch + . ImageMagick-6.8.4.0-dont-build-in-install.patch + . ImageMagick-6.8.4.0-rpath.patch + . ImageMagick-montage.t.patch + . ImageMagick-6.8.5.7-no-XPMCompliance.patch +- renamed patches + . ImageMagick-6.8.8-1-disable-insecure-coders.patch to + ImageMagick-disable-insecure-coders.patch + +------------------------------------------------------------------- Old: ---- ImageMagick-6.6.8.9-doc.patch ImageMagick-6.6.8.9-examples.patch ImageMagick-6.7.6.1-no-dist-lzip.patch ImageMagick-6.8.4.0-dont-build-in-install.patch ImageMagick-6.8.4.0-rpath.patch ImageMagick-6.8.5.7-no-XPMCompliance.patch ImageMagick-6.8.8-1-disable-insecure-coders.patch ImageMagick-6.9.8-2.tar.xz ImageMagick-6.9.8-2.tar.xz.asc ImageMagick-montage.t.patch New: ---- ImageMagick-7.0.5-4.tar.xz ImageMagick-7.0.5-4.tar.xz.asc ImageMagick-disable-insecure-coders.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.14WeSL/_old 2017-04-06 10:59:46.043790029 +0200 +++ /var/tmp/diff_new_pack.14WeSL/_new 2017-04-06 10:59:46.047789463 +0200 @@ -19,10 +19,10 @@ Name: ImageMagick BuildRequires: autoconf >= 2.69 +BuildRequires: chrpath BuildRequires: dcraw -%if 0%{?suse_version} >= 1140 BuildRequires: dejavu-fonts -%endif +BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: fftw3-devel BuildRequires: freetype2-devel @@ -35,9 +35,7 @@ BuildRequires: libjbig-devel BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel -%if 0%{?suse_version} >= 1140 BuildRequires: liblqr-devel -%endif BuildRequires: librsvg-devel BuildRequires: libtiff-devel >= 4.0.3 BuildRequires: libtool @@ -45,71 +43,50 @@ BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: lzma-devel -%if 0%{?suse_version} >= 1310 BuildRequires: mupdf-devel-static -%endif -%if 0%{?suse_version} >= 1140 BuildRequires: openexr-devel -%endif BuildRequires: openjpeg2-devel >= 2.1.0 -%if 0%{?suse_version} >= 1140 BuildRequires: p7zip -%endif BuildRequires: pango-devel BuildRequires: pkgconfig BuildRequires: xdg-utils BuildRequires: xz BuildRequires: zip -%define maj 6 -%define mfr_version %{maj}.9.8 -%define mfr_revision 2 +%define maj 7 +%define mfr_version %{maj}.0.5 +%define mfr_revision 4 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} -%define clibver 4 -%define cxxlibver 7 -%define libspec -%{maj}_Q%{quantum_depth} +%define clibver 2 +%define cwandver 0 +%define cxxlibver 2 +%define libspec -%{maj}_Q%{quantum_depth}HDRI Version: %{mfr_version}.%{mfr_revision} Release: 0 Summary: Viewer and Converter for Images License: ImageMagick Group: Productivity/Graphics/Other Url: http://www.imagemagick.org -Source: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revisi… -# To get mtime of file -Source1: ImageMagick.changes -Source2: baselibs.conf -Source3: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revisi… -Source4: ImageMagick.keyring +Source0: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revisi… +Source1: baselibs.conf +Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revisi… +Source3: ImageMagick.keyring # suse specific patches -Patch0: ImageMagick-6.6.8.9-examples.patch -Patch1: ImageMagick-6.6.8.9-doc.patch -Patch2: ImageMagick-6.7.6.1-no-dist-lzip.patch -Patch3: ImageMagick-6.8.4.0-rpath.patch -# workaround for http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462 -# upstream insists on XPMCompliance, so leaving this for compatibility reasons -Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch -# bugs -# will ask upstream if needed, or if other solution exists -Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch -# revert https://github.com/ImageMagick/ImageMagick/commit/56d460bf2bc74bed22bed8dfe… -# as this does not fit to 6.9.8-2 -# commented in the commit -Patch12: ImageMagick-montage.t.patch -Patch20: ImageMagick-6.8.8-1-disable-insecure-coders.patch +Patch0: ImageMagick-disable-insecure-coders.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n perl-PerlMagick Requires: ImageMagick = %{version} -Requires: libMagickCore%{libspec}-%{clibver} = %{version} +Requires: libMagickCore%{libspec}%{clibver} = %{version} Requires: perl = %{perl_version} Summary: Perl interface for ImageMagick Group: Development/Libraries/Perl %package devel Requires: ImageMagick = %{version} -Requires: libMagickCore%{libspec}-%{clibver} = %{version} -Requires: libMagickWand%{libspec}-%{clibver} = %{version} +Requires: libMagickCore%{libspec}%{clibver} = %{version} +Requires: libMagickWand%{libspec}%{cwandver} = %{version} Summary: Include Files and Libraries Mandatory for Development Group: Development/Libraries/C and C++ Requires: glibc-devel @@ -118,29 +95,29 @@ %package extra Requires: ImageMagick = %{version} -Requires: libMagickCore%{libspec}-%{clibver} = %{version} +Requires: libMagickCore%{libspec}%{clibver} = %{version} Summary: Viewer and Converter for Images - extra codecs #delegates configured in delegates.xml that imagemagick can use Group: Productivity/Graphics/Other Recommends: autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf -%package -n libMagickCore%{libspec}-%{clibver} +%package -n libMagickCore%{libspec}%{clibver} Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other Suggests: ImageMagick-extra = %{version} -%package -n libMagickWand%{libspec}-%{clibver} +%package -n libMagickWand%{libspec}%{cwandver} Summary: Viewer and Converter for Images - runtime library Group: Productivity/Graphics/Other -%package -n libMagick++%{libspec}-%{cxxlibver} +%package -n libMagick++%{libspec}%{cxxlibver} Requires: ImageMagick Summary: C++ Interface for ImageMagick - runtime library Group: Development/Libraries/C and C++ %package -n libMagick++-devel Requires: ImageMagick-devel = %{version} -Requires: libMagick++%{libspec}-%{cxxlibver} = %{version} +Requires: libMagick++%{libspec}%{cxxlibver} = %{version} Requires: libstdc++-devel Summary: C++ Interface for ImageMagick - files mandatory for development Group: Development/Libraries/C and C++ @@ -148,9 +125,7 @@ %package doc Summary: Document Files for ImageMagick Library Group: Development/Libraries/C and C++ -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description ImageMagick is a robust collection of tools and libraries to read, @@ -188,7 +163,7 @@ the command line as well as through C, C++, and PERL-based programming interfaces. -%description -n libMagickCore%{libspec}-%{clibver} +%description -n libMagickCore%{libspec}%{clibver} ImageMagick is a robust collection of tools and libraries to read, write, and manipulate an image in many image formats, including popular formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, @@ -199,7 +174,7 @@ the command line as well as through C, C++, and PERL-based programming interfaces. -%description -n libMagickWand%{libspec}-%{clibver} +%description -n libMagickWand%{libspec}%{cwandver} ImageMagick is a robust collection of tools and libraries to read, write, and manipulate an image in many image formats, including popular formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick, @@ -215,7 +190,7 @@ the module to read, manipulate, or write an image or image sequence from within a Perl script. This makes it suitable for Web CGI scripts. -%description -n libMagick++%{libspec}-%{cxxlibver} +%description -n libMagick++%{libspec}%{cxxlibver} This is Magick++, the object-oriented C++ API for the ImageMagick image-processing library. @@ -250,108 +225,95 @@ %prep %setup -q -n ImageMagick-%{source_version} -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch11 -%patch12 -p1 -R -%patch20 -p1 - -# remove executeable bits from per demos -chmod -x PerlMagick/demo/*.pl +%patch0 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" -export LDFLAGS="-L%{_libdir}" -# for MODULES_DIRNAME setup purpose see bnc#866442 -export MODULES_DIRNAME="modules-%{maj}_Q%{quantum_depth}-%{clibver}" -# for SHAREARCH_DIRNAME setup purpose see bnc#866442 -export SHAREARCH_DIRNAME="config-%{maj}_Q%{quantum_depth}-%{clibver}" -# for CONFIGURE_RELATIVE_PATH setup purpose see bnc#866442 -sed -i 's:^$CONFIGURE_RELATIVE_PATH=.*$:\1_Q%{quantum_depth}-%{clibver}:' configure.ac -CHANGES=`stat --format="%y" %SOURCE1|cut --characters=1-10` -# Use mtime of .changes for build time -sed -i -e "s|^PACKAGE_RELEASE_DATE.*$|PACKAGE_RELEASE_DATE=\"$CHANGES\"|" version.sh -autoreconf --force --install -v -automake -%configure --with-pic \ +%configure \ + --with-pic \ --enable-shared \ --without-frozenpaths \ --with-magick_plus_plus \ --with-modules \ --with-threads \ --with-perl \ - --with-perl-options="INSTALLDIRS=vendor CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ + --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --disable-static \ --with-graphviz \ --with-djvu \ --with-lcms2 \ --with-jbig \ --with-openjp2 \ -%if 0%{?suse_version} >= 1140 --with-openexr \ -%endif --with-rsvg \ --with-webp \ --with-wmf \ --with-quantum-depth=%{quantum_depth} \ --without-gcc-arch \ --enable-pipes=no \ - --enable-indirect-reads=no + --enable-indirect-reads=no \ + --enable-reproducible-build=yes # don't build together, PerlMagick could be miscompiled when using parallel build[1] # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec make %{?_smp_mflags} all make -j1 perl-build +# mostly because */demo is used later with %check +# polutting dir with .libs etc. +cp -r Magick++/demo Magick++/examples +cp -r PerlMagick/demo PerlMagick/examples +# other improvements +dos2unix www/api/*.php +chmod -x PerlMagick/demo/*.pl -%if 0%{?suse_version} >= 1140 %check make check -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs export MAGICK_CONFIGURE_PATH=$PWD/config cd PerlMagick -make test +%ifarch i586 +# TODO test is failing completely (19/19), wrong +# checksums +rm t/montage.t %endif +make test +cd .. %install %{__make} install \ DESTDIR=%{buildroot} \ - pkgdocdir=%{_defaultdocdir}/%{name}/ -%perl_process_packlist -# remove unneded files from Magick++/demo for %doc, but not in place -# they are needed for make check -cp -r Magick++/demo . -%{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} -PATH='/bin:/usr/bin' find demo -type f -perm /111 -execdir %{__rm} -rf '{}' ';' -%{__mv} demo/makefile.2 demo/Makefile -### -%{__mv} -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml -PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ - -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' -%{__rm} %{buildroot}%{_libdir}/*.la - + pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/ +# symlink header file relative to /usr/include/ImageMagick-7/ +# so that inclusions like wand/*.h and magick/*.h work +ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick +ln -s ./MagickWand %{buildroot}%{_includedir}/%{name}-%{maj}/wand +# these will be included via %doc +rm -r %{buildroot}%{_datadir}/doc/%{name}-%{maj}/ +mv -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml +rm %{buildroot}%{_libdir}/*.la +# remove RPATH from perl module +perl_module=$(find %{buildroot}/usr/lib/perl5 -name '*.so') +chmod 755 $perl_module +chrpath -d $perl_module +chmod 555 $perl_module +# remove %%{buildroot} from distributed file +sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/config-Q16HDRI/configure.xml #remove duplicates -%if 0%{?suse_version} > 1020 -%fdupes -s %{buildroot}%{_defaultdocdir}/%{name} +%fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-%{maj} %fdupes -s %{buildroot}%{_includedir}/%{name}-%{maj} %fdupes -s %{buildroot}%{_libdir}/pkgconfig -%endif +%perl_process_packlist -%post -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig +%post -n libMagickCore%{libspec}%{clibver} -p /sbin/ldconfig -%postun -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig +%postun -n libMagickCore%{libspec}%{clibver} -p /sbin/ldconfig -%post -n libMagickWand%{libspec}-%{clibver} -p /sbin/ldconfig +%post -n libMagickWand%{libspec}%{cwandver} -p /sbin/ldconfig -%postun -n libMagickWand%{libspec}-%{clibver} -p /sbin/ldconfig +%postun -n libMagickWand%{libspec}%{cwandver} -p /sbin/ldconfig -%post -n libMagick++%{libspec}-%{cxxlibver} -p /sbin/ldconfig +%post -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig -%postun -n libMagick++%{libspec}-%{cxxlibver} -p /sbin/ldconfig +%postun -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -359,9 +321,9 @@ %doc %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1.gz -%files -n libMagickCore%{libspec}-%{clibver} +%files -n libMagickCore%{libspec}%{clibver} %defattr(-,root,root) -%doc LICENSE +%doc LICENSE ChangeLog NEWS.txt %dir %{_sysconfdir}/ImageMagick* %config %{_sysconfdir}/ImageMagick*/* %{_libdir}/libMagickCore*.so.%{clibver}* @@ -376,9 +338,9 @@ %{_libdir}/ImageMagick*/modules*/*/*.la %{_libdir}/ImageMagick*/config* -%files -n libMagickWand%{libspec}-%{clibver} +%files -n libMagickWand%{libspec}%{cwandver} %defattr(-,root,root) -%{_libdir}/libMagickWand*.so.%{clibver}* +%{_libdir}/libMagickWand*.so.%{cwandver}* %files extra %defattr(-,root,root) @@ -395,48 +357,43 @@ %{_libdir}/libMagickCore*.so %{_libdir}/libMagickWand*.so %dir %{_includedir}/ImageMagick* +%{_includedir}/ImageMagick*/MagickCore +%{_includedir}/ImageMagick*/MagickWand %{_includedir}/ImageMagick*/magick %{_includedir}/ImageMagick*/wand %{_bindir}/MagickCore-config %{_bindir}/MagickWand-config -%{_bindir}/Magick-config -%{_bindir}/Wand-config %{_libdir}/pkgconfig/MagickCore*.pc -%{_libdir}/pkgconfig/ImageMagick.pc -%{_libdir}/pkgconfig/ImageMagick-*.pc -%{_libdir}/pkgconfig/*Wand*.pc +%{_libdir}/pkgconfig/ImageMagick*.pc +%{_libdir}/pkgconfig/MagickWand*.pc %doc %{_mandir}/man1/*-config.1.gz %exclude %{_mandir}/man1/Magick++-config.1.gz %files -n perl-PerlMagick %defattr(-,root,root,-) %doc PerlMagick/README.txt -%doc PerlMagick/demo +%doc PerlMagick/examples %doc %{_mandir}/man3/* %{perl_vendorarch}/auto/Image %{perl_vendorarch}/Image -%if 0%{?suse_version} < 1140 -/var/adm/perl-modules/ImageMagick -%endif -%files -n libMagick++%{libspec}-%{cxxlibver} +%files -n libMagick++%{libspec}%{cxxlibver} %defattr(-,root,root) %{_libdir}/libMagick++*.so.%{cxxlibver}* %files -n libMagick++-devel %defattr(-,root,root) -%doc demo +%doc Magick++/examples %doc Magick++/NEWS Magick++/README Magick++/AUTHORS %{_libdir}/libMagick++*.so %{_includedir}/ImageMagick*/Magick++.h %{_includedir}/ImageMagick*/Magick++ %{_bindir}/Magick++-config -%{_libdir}/pkgconfig/ImageMagick++*.pc %{_libdir}/pkgconfig/Magick++*.pc %doc %{_mandir}/man1/Magick++-config.1.gz %files doc %defattr(-,root,root) -%{_defaultdocdir}/%{name} +%{_defaultdocdir}/%{name}-%{maj} %changelog ++++++ ImageMagick-6.9.8-2.tar.xz -> ImageMagick-7.0.5-4.tar.xz ++++++ /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-6.9.8-2.tar.xz /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick-7.0.5-4.tar.xz differ: char 17, line 1 ++++++ ImageMagick-disable-insecure-coders.patch ++++++ Index: ImageMagick-6.9.8-2/config/policy.xml =================================================================== --- ImageMagick-6.9.8-2.orig/config/policy.xml 2017-03-19 00:28:24.000000000 +0100 +++ ImageMagick-6.9.8-2/config/policy.xml 2017-03-20 14:05:22.979847731 +0100 @@ -81,4 +81,15 @@   <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> +  +  + <policy domain="coder" rights="none" pattern="EPHEMERAL" /> + <policy domain="coder" rights="none" pattern="URL" /> + <policy domain="coder" rights="none" pattern="HTTPS" /> + <policy domain="coder" rights="none" pattern="MVG" /> + <policy domain="coder" rights="none" pattern="MSL" /> + <policy domain="coder" rights="none" pattern="TEXT" /> + <policy domain="coder" rights="none" pattern="SHOW" /> + <policy domain="coder" rights="none" pattern="WIN" /> + <policy domain="coder" rights="none" pattern="PLT" /> </policymap> ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.14WeSL/_old 2017-04-06 10:59:46.179770810 +0200 +++ /var/tmp/diff_new_pack.14WeSL/_new 2017-04-06 10:59:46.179770810 +0200 @@ -1,11 +1,11 @@ -libMagickCore-6_Q16-4 -libMagickWand-6_Q16-4 -libMagick++-6_Q16-7 +libMagickCore-7_Q16HDRI2 +libMagickWand-7_Q16HDRI0 +libMagick++-7_Q16HDRI2 ImageMagick-devel requires -ImageMagick-<targettype> - requires "libMagickCore-6_Q16-4-<targettype> = <version>" - requires "libMagickWand-6_Q16-4-<targettype> = <version>" + requires "libMagickCore-7_Q16HDRI2-<targettype> = <version>" + requires "libMagickWand-7_Q16HDRI0-<targettype> = <version>" libMagick++-devel requires -ImageMagick-<targettype> - requires "libMagick++-6_Q16-7-<targettype> = <version>" + requires "libMagick++-7_Q16HDRI2-<targettype> = <version>"

1 0

commit sk1 for openSUSE:Factory
by root＠hilbert.suse.de 06 Apr '17

06 Apr '17

Hello community, here is the log from the commit of package sk1 for openSUSE:Factory checked in at 2017-04-06 10:59:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sk1 (Old) and /work/SRC/openSUSE:Factory/.sk1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sk1" Thu Apr 6 10:59:33 2017 rev:25 rq:483150 version:2.0~rc2 Changes: -------- --- /work/SRC/openSUSE:Factory/sk1/sk1.changes 2017-02-19 01:03:33.270321397 +0100 +++ /work/SRC/openSUSE:Factory/.sk1.new/sk1.changes 2017-04-06 10:59:34.933360313 +0200 @@ -1,0 +2,6 @@ +Mon Mar 27 14:09:43 UTC 2017 - pgajdos(a)suse.com + +- add ImageMagick7 support for us + + sk1-ImageMagick7.patch + +------------------------------------------------------------------- New: ---- sk1-ImageMagick7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sk1.spec ++++++ --- /var/tmp/diff_new_pack.KhXQ5t/_old 2017-04-06 10:59:35.865228608 +0200 +++ /var/tmp/diff_new_pack.KhXQ5t/_new 2017-04-06 10:59:35.869228043 +0200 @@ -24,6 +24,13 @@ Group: Productivity/Graphics/Vector Editors Url: http://sk1project.net/ Source: http://sk1project.net/dc3.php?version=2.0rc2&target=sk1-2.0rc2.tar.gz#/%{na… +# should go upstream, but +# (1) it is not complete. Source file +# includes wand/MagickWand.h but it should include +# MagickWand/MagickWand.h instead for ImageMagick 7 +# (2) it is ok to change *Matte* to *Alpha* in magickwand.py +# unconditionally? +Patch0: sk1-ImageMagick7.patch BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -55,6 +62,7 @@ %prep %setup -q -n %{name}-2.0rc2 +%patch0 -p1 # Use the path defined by %%py_sitedir sed -i '/install_path/s|\/.*$\/$|%{py_sitedir}\1|' setup-sk1.py ++++++ sk1-ImageMagick7.patch ++++++ Index: sk1-2.0rc2/src/uc2/libimg/_libimg.c =================================================================== --- sk1-2.0rc2.orig/src/uc2/libimg/_libimg.c 2016-10-09 12:40:45.000000000 +0200 +++ sk1-2.0rc2/src/uc2/libimg/_libimg.c 2017-03-27 16:07:18.725664504 +0200 @@ -199,15 +199,15 @@ im_NextImage(PyObject *self, PyObject *a // UndefinedType, // BilevelType, // GrayscaleType, -// GrayscaleMatteType, +// GrayscaleMatteType (GrayscaleAlphaType for ImageMagick7), // PaletteType, -// PaletteMatteType, +// PaletteMatteType (PaletteAlphaType for ImageMagick7), // TrueColorType, -// TrueColorMatteType, +// TrueColorMatteType (TrueColorAlphaType for ImageMagick7), // ColorSeparationType, -// ColorSeparationMatteType, +// ColorSeparationMatteType (ColorSeparationAlphaType for ImageMagick7), // OptimizeType, -// PaletteBilevelMatteType +// PaletteBilevelMatteType (PaletteBilevelAlphaType for ImageMagick7) static PyObject * im_GetImageType(PyObject *self, PyObject *args) { @@ -230,32 +230,52 @@ im_GetImageType(PyObject *self, PyObject else if (img_type == GrayscaleType){ return Py_BuildValue("s", "GrayscaleType"); } +#if MagickLibVersion >= 0x700 + else if (img_type == GrayscaleAlphaType){ +#else else if (img_type == GrayscaleMatteType){ - return Py_BuildValue("s", "GrayscaleMatteType"); +#endif + return Py_BuildValue("s", "GrayscaleAlphaType"); } else if (img_type == PaletteType){ return Py_BuildValue("s", "PaletteType"); } +#if MagickLibVersion >= 0x700 + else if (img_type == PaletteAlphaType){ +#else else if (img_type == PaletteMatteType){ - return Py_BuildValue("s", "PaletteMatteType"); +#endif + return Py_BuildValue("s", "PaletteAlphaType"); } else if (img_type == TrueColorType){ return Py_BuildValue("s", "TrueColorType"); } +#if MagickLibVersion >= 0x700 + else if (img_type == TrueColorAlphaType){ +#else else if (img_type == TrueColorMatteType){ - return Py_BuildValue("s", "TrueColorMatteType"); +#endif + return Py_BuildValue("s", "TrueColorAlphaType"); } else if (img_type == ColorSeparationType){ return Py_BuildValue("s", "ColorSeparationType"); } +#if MagickLibVersion >= 0x700 + else if (img_type == ColorSeparationAlphaType){ +#else else if (img_type == ColorSeparationMatteType){ - return Py_BuildValue("s", "ColorSeparationMatteType"); +#endif + return Py_BuildValue("s", "ColorSeparationAlphaType"); } else if (img_type == OptimizeType){ return Py_BuildValue("s", "OptimizeType"); } +#if MagickLibVersion >= 0x700 + else if (img_type == PaletteBilevelAlphaType){ +#else else if (img_type == PaletteBilevelMatteType){ - return Py_BuildValue("s", "PaletteBilevelMatteType"); +#endif + return Py_BuildValue("s", "PaletteBilevelAlphaType"); } else { return Py_BuildValue("s", "UndefinedType"); @@ -281,9 +301,9 @@ im_GetImageType(PyObject *self, PyObject //HSBColorspace, //HSLColorspace, //HWBColorspace, -//Rec601LumaColorspace, +//Rec601LumaColorspace (only in ImageMagick <= 6), //Rec601YCbCrColorspace, -//Rec709LumaColorspace, +//Rec709LumaColorspace (only in ImageMagick <= 6), //Rec709YCbCrColorspace, //LogColorspace, //CMYColorspace @@ -351,15 +371,19 @@ im_GetColorspace(PyObject *self, PyObjec else if (cs == HWBColorspace){ return Py_BuildValue("s", "HWBColorspace"); } +#if MagickLibVersion < 0x700 else if (cs == Rec601LumaColorspace){ return Py_BuildValue("s", "Rec601LumaColorspace"); } +#endif else if (cs == Rec601YCbCrColorspace){ return Py_BuildValue("s", "Rec601YCbCrColorspace"); } +#if MagickLibVersion < 0x700 else if (cs == Rec709LumaColorspace){ return Py_BuildValue("s", "Rec709LumaColorspace"); } +#endif else if (cs == Rec709YCbCrColorspace){ return Py_BuildValue("s", "Rec709YCbCrColorspace"); } @@ -426,25 +450,41 @@ get_image_type(char* mode) { return GrayscaleType; } else if (strcmp(mode, "GrayscaleMatteType") == 0) { +#if MagickLibVersion >= 0x700 + return GrayscaleAlphaType; +#else return GrayscaleMatteType; +#endif } else if (strcmp(mode, "PaletteType") == 0) { return PaletteType; } - else if (strcmp(mode, "PaletteMatteType") == 0) { + else if (strcmp(mode, "PaletteAlphaType") == 0) { +#if MagickLibVersion >= 0x700 + return PaletteAlphaType; +#else return PaletteMatteType; +#endif } else if (strcmp(mode, "TrueColorType") == 0) { return TrueColorType; } - else if (strcmp(mode, "TrueColorMatteType") == 0) { + else if (strcmp(mode, "TrueColorAlphaType") == 0) { +#if MagickLibVersion >= 0x700 + return TrueColorAlphaType; +#else return TrueColorMatteType; +#endif } else if (strcmp(mode, "ColorSeparationType") == 0) { return ColorSeparationType; } else if (strcmp(mode, "ColorSeparationMatteType") == 0) { +#if MagickLibVersion >= 0x700 + return ColorSeparationAlphaType; +#else return ColorSeparationMatteType; +#endif } else { return TrueColorType; Index: sk1-2.0rc2/src/uc2/libimg/magickwand.py =================================================================== --- sk1-2.0rc2.orig/src/uc2/libimg/magickwand.py 2016-10-09 12:40:45.000000000 +0200 +++ sk1-2.0rc2/src/uc2/libimg/magickwand.py 2017-03-27 16:03:39.189632867 +0200 @@ -19,13 +19,13 @@ from cStringIO import StringIO BILEVEL_TYPE = 'BilevelType' L_TYPE = 'GrayscaleType' -LA_TYPE = 'GrayscaleMatteType' +LA_TYPE = 'GrayscaleAlphaType' P_TYPE = 'PaletteType' -PA_TYPE = 'PaletteMatteType' +PA_TYPE = 'PaletteAlphaType' RGB_TYPE = 'TrueColorType' -RGBA_TYPE = 'TrueColorMatteType' +RGBA_TYPE = 'TrueColorAlphaType' CMYK_TYPE = 'ColorSeparationType' -CMYKA_TYPE = 'ColorSeparationMatteType' +CMYKA_TYPE = 'ColorSeparationAlphaType' WAND_TYPES = [BILEVEL_TYPE, L_TYPE, LA_TYPE, P_TYPE, PA_TYPE, RGB_TYPE, RGBA_TYPE, CMYK_TYPE, CMYKA_TYPE, ]

1 0

commit sysdig for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package sysdig for openSUSE:Factory checked in at 2017-04-03 11:05:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysdig (Old) and /work/SRC/openSUSE:Factory/.sysdig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysdig" Mon Apr 3 11:05:33 2017 rev:13 rq:484389 version:0.15.1 Changes: -------- --- /work/SRC/openSUSE:Factory/sysdig/sysdig.changes 2017-03-02 19:38:19.595221784 +0100 +++ /work/SRC/openSUSE:Factory/.sysdig.new/sysdig.changes 2017-04-03 11:06:09.402792352 +0200 @@ -1,0 +2,11 @@ +Sun Apr 2 07:59:03 UTC 2017 - mpluskal(a)suse.com + +- Update to version 0.15.1 (boo#1032025): + * Bug fixes: + + Fixed driver compilation issues on armv6l + + Fixes on Kubernetes support + + Regression on rkt detection #748 + + Fixed high cpu usage when sysdig was used with -M parameter, #783 + + Fixed a memory leak #772 + +------------------------------------------------------------------- Old: ---- sysdig-0.15.0.tar.gz New: ---- sysdig-0.15.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysdig.spec ++++++ --- /var/tmp/diff_new_pack.kwDHvX/_old 2017-04-03 11:06:10.014705899 +0200 +++ /var/tmp/diff_new_pack.kwDHvX/_new 2017-04-03 11:06:10.018705333 +0200 @@ -17,7 +17,7 @@ Name: sysdig -Version: 0.15.0 +Version: 0.15.1 Release: 0 Summary: System-level exploration License: GPL-2.0 @@ -29,6 +29,7 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libb64-devel +BuildRequires: libelf-devel BuildRequires: libjq-devel BuildRequires: lua51-devel BuildRequires: ncurses-devel @@ -37,9 +38,8 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kernel_module_package ExcludeArch: %{arm} aarch64 +%kernel_module_package %description Sysdig is open source, system-level exploration: capture system state and ++++++ sysdig-0.15.0.tar.gz -> sysdig-0.15.1.tar.gz ++++++ ++++ 2116 lines of diff (skipped)

1 0

commit ffmpegthumbs for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package ffmpegthumbs for openSUSE:Factory checked in at 2017-04-03 11:05:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpegthumbs (Old) and /work/SRC/openSUSE:Factory/.ffmpegthumbs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ffmpegthumbs" Mon Apr 3 11:05:32 2017 rev:22 rq:484305 version:17.03.80 Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpegthumbs/ffmpegthumbs.changes 2017-03-24 02:17:16.949181513 +0100 +++ /work/SRC/openSUSE:Factory/.ffmpegthumbs.new/ffmpegthumbs.changes 2017-04-03 11:06:08.642899713 +0200 @@ -1,0 +2,10 @@ +Sat Mar 25 23:10:10 CET 2017 - lbeltrame(a)kde.org + +- Update to 17.03.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.03.80.php +- Changes since 16.12.3: + * None + +------------------------------------------------------------------- Old: ---- ffmpegthumbs-16.12.3.tar.xz New: ---- ffmpegthumbs-17.03.80.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpegthumbs.spec ++++++ --- /var/tmp/diff_new_pack.rVMh4Q/_old 2017-04-03 11:06:09.174824560 +0200 +++ /var/tmp/diff_new_pack.rVMh4Q/_new 2017-04-03 11:06:09.178823995 +0200 @@ -17,16 +17,16 @@ Name: ffmpegthumbs -Version: 16.12.3 +Version: 17.03.80 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: FFmpeg-based thumbnail creator for video files License: LGPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Source0: %{name}-%{version}.tar.xz +Source0: http://download.kde.org/unstable/applications/%{version}/src/%{name}-%{vers… BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: kio-devel ++++++ ffmpegthumbs-16.12.3.tar.xz -> ffmpegthumbs-17.03.80.tar.xz ++++++

1 0

commit tint2 for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package tint2 for openSUSE:Factory checked in at 2017-04-03 11:05:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tint2 (Old) and /work/SRC/openSUSE:Factory/.tint2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tint2" Mon Apr 3 11:05:30 2017 rev:9 rq:484232 version:0.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/tint2/tint2.changes 2017-03-16 09:50:49.527821155 +0100 +++ /work/SRC/openSUSE:Factory/.tint2.new/tint2.changes 2017-04-03 11:06:07.559052843 +0200 @@ -1,0 +2,6 @@ +Fri Mar 31 16:51:59 UTC 2017 - mvetter(a)suse.com + +- Update to 0.14.1: + * Fixed tint2conf problem under FreeBSD (or generally any system using clang). + +------------------------------------------------------------------- Old: ---- tint2-0.13.1.tar.gz New: ---- tint2-0.14.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tint2.spec ++++++ --- /var/tmp/diff_new_pack.1hTIao/_old 2017-04-03 11:06:08.274951698 +0200 +++ /var/tmp/diff_new_pack.1hTIao/_new 2017-04-03 11:06:08.274951698 +0200 @@ -17,7 +17,7 @@ Name: tint2 -Version: 0.13.1 +Version: 0.14.1 Release: 0 Summary: A lightweight X11 desktop panel and task manager License: GPL-2.0 @@ -49,7 +49,7 @@ %lang_package %prep -%setup -q -n %{name}-v%{version}-4d12abdb4263d6875b069e7b2c214e65a7c1edac/ +%setup -q -n %{name}-v%{version}-6cde7bef1e698c924f4c7fd65b71dd69e6173909/ %build %cmake -DENABLE_EXAMPLES=ON -DDOCDIR=%{_docdir}/%{name} ++++++ tint2-0.13.1.tar.gz -> tint2-0.14.1.tar.gz ++++++ ++++ 20751 lines of diff (skipped)

1 0

commit python-cov-core for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package python-cov-core for openSUSE:Factory checked in at 2017-04-03 11:05:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cov-core (Old) and /work/SRC/openSUSE:Factory/.python-cov-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cov-core" Mon Apr 3 11:05:27 2017 rev:6 rq:484229 version:1.15.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-cov-core/python-cov-core.changes 2015-05-05 00:55:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-cov-core.new/python-cov-core.changes 2017-04-03 11:06:06.815157943 +0200 @@ -1,0 +2,6 @@ +Fri Mar 31 14:57:23 UTC 2017 - aloisio(a)gmx.com + +- Converted to single-spec +- Fixed source URL + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cov-core.spec ++++++ --- /var/tmp/diff_new_pack.M2ydZ4/_old 2017-04-03 11:06:07.399075445 +0200 +++ /var/tmp/diff_new_pack.M2ydZ4/_new 2017-04-03 11:06:07.399075445 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-cov-core # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -16,6 +16,7 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-cov-core Version: 1.15.0 Release: 0 @@ -23,17 +24,16 @@ License: MIT Group: Development/Languages/Python Url: https://github.com/schlamar/cov-core -Source: https://pypi.python.org/packages/source/c/cov-core/cov-core-%{version}.tar.… -BuildRequires: python-coverage -BuildRequires: python-devel -BuildRequires: python-setuptools +Source: https://pypi.io/packages/source/c/cov-core/cov-core-%{version}.tar.gz +BuildRequires: %{python_module coverage} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-coverage BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif +%python_subpackages %description This is a lib package for use by pytest-cov, nose-cov and nose2-cov. Unless your developing a @@ -43,14 +43,18 @@ %setup -q -n cov-core-%{version} %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%python_expand %fdupes -s %{buildroot}%{$python_sitelib} -%files +%files %{python_files} %defattr(-,root,root,-) %doc LICENSE.txt README.rst -%{python_sitelib}/* +%pycache_only %{python_sitelib}/__pycache__ +%{python_sitelib}/cov_core.py* +%{python_sitelib}/cov_core_init.py* +%{python_sitelib}/cov_core-%{version}-py%{python_version}.egg-info %changelog

1 0

commit python-process-tests for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package python-process-tests for openSUSE:Factory checked in at 2017-04-03 11:05:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-process-tests (Old) and /work/SRC/openSUSE:Factory/.python-process-tests.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-process-tests" Mon Apr 3 11:05:25 2017 rev:2 rq:484228 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-process-tests/python-process-tests.changes 2015-10-30 13:43:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-process-tests.new/python-process-tests.changes 2017-04-03 11:06:05.683317854 +0200 @@ -1,0 +2,6 @@ +Fri Mar 31 15:05:13 UTC 2017 - aloisio(a)gmx.com + +- Updated to 1.2.1 +- Converted to single-spec + +------------------------------------------------------------------- Old: ---- process-tests-1.2.0.tar.gz New: ---- process-tests-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-process-tests.spec ++++++ --- /var/tmp/diff_new_pack.z3qclM/_old 2017-04-03 11:06:06.619185631 +0200 +++ /var/tmp/diff_new_pack.z3qclM/_new 2017-04-03 11:06:06.623185066 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-process-tests # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -14,40 +14,46 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-process-tests -Version: 1.2.0 +Version: 1.2.1 Release: 0 -License: BSD-2-Clause Summary: Tools for testing processes -Url: https://github.com/ionelmc/python-process-tests +License: BSD-2-Clause Group: Development/Languages/Python -Source: https://pypi.python.org/packages/source/p/process-tests/process-tests-%{ver… -BuildRequires: python-devel -BuildRequires: python-setuptools +Url: https://github.com/ionelmc/python-process-tests +Source: https://pypi.io/packages/source/p/process-tests/process-tests-%{version}.ta… +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: dos2unix +BuildRequires: fdupes +BuildRequires: python-rpm-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif +%python_subpackages %description -Tools for testing processes. +Testcase classes and assertions for testing processes. %prep %setup -q -n process-tests-%{version} +dos2unix LICENSE src/process_tests.egg-info/dependency_links.txt %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%python_expand %fdupes -s %{buildroot}%{$python_sitelib} -%files +%files %{python_files} %defattr(-,root,root,-) %doc README.rst LICENSE -%{python_sitelib}/* +%pycache_only %{python_sitelib}/__pycache__ +%{python_sitelib}/process_tests.py* +%{python_sitelib}/process_tests-%{version}-py%{python_version}.egg-info %changelog ++++++ process-tests-1.2.0.tar.gz -> process-tests-1.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/process-tests-1.2.0/PKG-INFO new/process-tests-1.2.1/PKG-INFO --- old/process-tests-1.2.0/PKG-INFO 2015-09-27 02:35:55.000000000 +0200 +++ new/process-tests-1.2.1/PKG-INFO 2016-08-26 17:34:18.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: process-tests -Version: 1.2.0 +Version: 1.2.1 Summary: Tools for testing processes Home-page: https://github.com/ionelmc/python-process-tests Author: Ionel Cristian Mărieș diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/process-tests-1.2.0/setup.py new/process-tests-1.2.1/setup.py --- old/process-tests-1.2.0/setup.py 2015-09-27 02:34:55.000000000 +0200 +++ new/process-tests-1.2.1/setup.py 2016-08-26 17:33:52.000000000 +0200 @@ -5,7 +5,7 @@ setup( name="process-tests", - version="1.2.0", + version="1.2.1", url='https://github.com/ionelmc/python-process-tests', download_url='', license='BSD', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/process-tests-1.2.0/src/process_tests.egg-info/PKG-INFO new/process-tests-1.2.1/src/process_tests.egg-info/PKG-INFO --- old/process-tests-1.2.0/src/process_tests.egg-info/PKG-INFO 2015-09-27 02:35:55.000000000 +0200 +++ new/process-tests-1.2.1/src/process_tests.egg-info/PKG-INFO 2016-08-26 17:34:18.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: process-tests -Version: 1.2.0 +Version: 1.2.1 Summary: Tools for testing processes Home-page: https://github.com/ionelmc/python-process-tests Author: Ionel Cristian Mărieș diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/process-tests-1.2.0/src/process_tests.py new/process-tests-1.2.1/src/process_tests.py --- old/process-tests-1.2.0/src/process_tests.py 2015-09-27 02:34:18.000000000 +0200 +++ new/process-tests-1.2.1/src/process_tests.py 2016-08-26 17:32:41.000000000 +0200 @@ -166,7 +166,8 @@ raise finally: try: - self.proc.communicate() + out, _ = self.proc.communicate() + self.buff.write(out) except IOError as exc: if exc.errno != errno.EAGAIN: print('\nFailed to cleanup process:\n', file=sys.stderr)

1 0

commit criu for openSUSE:Factory
by root＠hilbert.suse.de 03 Apr '17

03 Apr '17

Hello community, here is the log from the commit of package criu for openSUSE:Factory checked in at 2017-04-03 11:05:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/criu (Old) and /work/SRC/openSUSE:Factory/.criu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "criu" Mon Apr 3 11:05:23 2017 rev:31 rq:484227 version:2.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/criu/criu.changes 2017-03-22 23:18:23.386847079 +0100 +++ /work/SRC/openSUSE:Factory/.criu.new/criu.changes 2017-04-03 11:06:03.511624680 +0200 @@ -1,0 +2,10 @@ +Fri Mar 31 14:49:05 CEST 2017 - tiwai(a)suse.de + +- update to criu 2.12.1: + Fixes: + * Content for external bind mounts was erroneously dumped, which + could lead to dump failures or huuuge images + * Unneeded collection of host mounts on restore could cause + restore to fail + +------------------------------------------------------------------- Old: ---- criu-2.12.tar.bz2 New: ---- criu-2.12.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ criu.spec ++++++ --- /var/tmp/diff_new_pack.5rvAlV/_old 2017-04-03 11:06:04.215525230 +0200 +++ /var/tmp/diff_new_pack.5rvAlV/_new 2017-04-03 11:06:04.219524665 +0200 @@ -17,7 +17,7 @@ Name: criu -Version: 2.12 +Version: 2.12.1 Release: 0 Summary: Checkpoint/Restore In Userspace Tools License: GPL-2.0 ++++++ criu-2.12.tar.bz2 -> criu-2.12.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criu-2.12/Makefile.versions new/criu-2.12.1/Makefile.versions --- old/criu-2.12/Makefile.versions 2017-03-08 19:45:51.000000000 +0100 +++ new/criu-2.12.1/Makefile.versions 2017-03-27 20:44:22.000000000 +0200 @@ -2,7 +2,7 @@ # CRIU version. CRIU_VERSION_MAJOR := 2 CRIU_VERSION_MINOR := 12 -CRIU_VERSION_SUBLEVEL := +CRIU_VERSION_SUBLEVEL := 1 CRIU_VERSION_EXTRA := CRIU_VERSION_NAME := Vulcanite Rook CRIU_VERSION := $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criu-2.12/criu/mount.c new/criu-2.12.1/criu/mount.c --- old/criu-2.12/criu/mount.c 2017-03-08 19:45:51.000000000 +0100 +++ new/criu-2.12.1/criu/mount.c 2017-03-27 20:44:22.000000000 +0200 @@ -1263,13 +1263,14 @@ if (me.fstype == FSTYPE__AUTO) me.fsname = pm->fsname; + if (!pm->external) { + if (!pm->dumped && dump_one_fs(pm)) + return -1; - if (!pm->dumped && dump_one_fs(pm)) - return -1; - - if (!fsroot_mounted(pm) && - pm->fstype->check_bindmount && pm->fstype->check_bindmount(pm)) - return -1; + if (!fsroot_mounted(pm) && + pm->fstype->check_bindmount && pm->fstype->check_bindmount(pm)) + return -1; + } if (pm->mnt_id == CRTIME_MNT_ID) { pr_info("Skip dumping cr-time mountpoint: %s\n", pm->mountpoint); @@ -2901,7 +2902,6 @@ int prepare_mnt_ns(void) { int ret = -1, rst = -1; - struct mount_info *old; struct ns_id ns = { .type = NS_CRIU, .ns_pid = PROC_SELF, .nd = &mnt_ns_desc }; struct ns_id *nsid; @@ -2910,27 +2910,30 @@ pr_info("Restoring mount namespace\n"); - old = collect_mntinfo(&ns, false); - if (old == NULL) - return -1; - if (!opts.root) { + struct mount_info *old; + if (chdir("/")) { pr_perror("chdir(\"/\") failed"); return -1; } + old = collect_mntinfo(&ns, false); + if (old == NULL) + return -1; /* * The new mount namespace is filled with the mountpoint * clones from the original one. We have to umount them * prior to recreating new ones. */ pr_info("Cleaning mount namespace\n"); - if (mnt_tree_for_each_reverse(ns.mnt.mntinfo_tree, do_umount_one)) + if (mnt_tree_for_each_reverse(ns.mnt.mntinfo_tree, do_umount_one)) { + free_mntinfo(old); return -1; - } + } - free_mntinfo(old); + free_mntinfo(old); + } ret = populate_mnt_ns(); if (ret)

1 0