Hello community, here is the log from the commit of package netpbm for openSUSE:Factory checked in at 2016-08-26 23:13:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netpbm (Old) and /work/SRC/openSUSE:Factory/.netpbm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netpbm" Changes: -------- --- /work/SRC/openSUSE:Factory/netpbm/netpbm.changes 2015-12-27 01:57:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.netpbm.new/netpbm.changes 2016-08-26 23:13:45.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Aug 22 15:39:46 UTC 2016 - [email protected] + +- updated to 10.75.1 + * see HISTORY for upstream changelog + * refreshed, reduced, extended patches: + netpbm-security-code.patch + netpbm-security-scripts.patch + netpbm-gcc-warnings.patch + +------------------------------------------------------------------- Old: ---- netpbm-10.72.4-documentation.tar.bz2 netpbm-10.72.4-nohpcdtoppm-noppmtompeg.tar.bz2 New: ---- netpbm-10.75.1-documentation.tar.bz2 netpbm-10.75.1-nohpcdtoppm-noppmtompeg.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netpbm.spec ++++++ --- /var/tmp/diff_new_pack.EOQmAg/_old 2016-08-26 23:13:46.000000000 +0200 +++ /var/tmp/diff_new_pack.EOQmAg/_new 2016-08-26 23:13:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package netpbm # -# 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,11 +17,11 @@ %define libmaj 11 -%define libmin 72 +%define libmin 75 %define libver %{libmaj}.%{libmin} Name: netpbm -Version: 10.72.4 +Version: 10.75.1 Release: 0 Summary: A Powerful Graphics Conversion Package License: BSD-3-Clause and GPL-2.0+ and IJG and MIT and SUSE-Public-Domain @@ -111,9 +111,9 @@ %patch1 %patch2 %patch3 -%patch4 -%patch5 -%patch6 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 mkdir pnmtopalm # for %%doc pnmtopalm cp -p converter/other/pnmtopalm/{LICENSE,README} pnmtopalm ++++++ netpbm-10.72.4-documentation.tar.bz2 -> netpbm-10.75.1-documentation.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/netpbm/netpbm-10.72.4-documentation.tar.bz2 /work/SRC/openSUSE:Factory/.netpbm.new/netpbm-10.75.1-documentation.tar.bz2 differ: char 11, line 1 ++++++ netpbm-10.72.4-nohpcdtoppm-noppmtompeg.tar.bz2 -> netpbm-10.75.1-nohpcdtoppm-noppmtompeg.tar.bz2 ++++++ ++++ 17918 lines of diff (skipped) ++++++ netpbm-gcc-warnings.patch ++++++ --- /var/tmp/diff_new_pack.EOQmAg/_old 2016-08-26 23:13:48.000000000 +0200 +++ /var/tmp/diff_new_pack.EOQmAg/_new 2016-08-26 23:13:48.000000000 +0200 @@ -1,8 +1,8 @@ -Index: converter/other/pngx.c +Index: netpbm-10.75.1/converter/other/pngx.c =================================================================== ---- converter/other/pngx.c.orig 2015-12-16 17:11:26.246357467 +0100 -+++ converter/other/pngx.c 2015-12-17 12:16:50.793565778 +0100 -@@ -342,6 +342,7 @@ +--- netpbm-10.75.1.orig/converter/other/pngx.c 2016-08-22 11:03:31.641785020 +0200 ++++ netpbm-10.75.1/converter/other/pngx.c 2016-08-22 17:36:34.165268951 +0200 +@@ -342,6 +342,7 @@ pngx_srgbIntentDesc(pngx_srgbIntent cons case PNGX_ABSOLUTE_COLORIMETRIC: return "ABSOLUTE_COLORIMETRIC"; } assert(false); @@ -10,7 +10,7 @@ } -@@ -357,6 +358,7 @@ +@@ -357,6 +358,7 @@ const libpngSrgbIntentCode(pngx_srgbInte } assert(false); /* All cases above return */ @@ -18,3 +18,17 @@ } +Index: netpbm-10.75.1/editor/pbmreduce.c +=================================================================== +--- netpbm-10.75.1.orig/editor/pbmreduce.c 2016-08-22 17:36:34.141268538 +0200 ++++ netpbm-10.75.1/editor/pbmreduce.c 2016-08-22 17:37:35.838325686 +0200 +@@ -202,6 +202,9 @@ oppositeDir(enum Direction const arg) { + case RIGHT_TO_LEFT: return LEFT_TO_RIGHT; + } + assert(false); /* All cases handled above */ ++ ++ /* make gcc happy */ ++ return RIGHT_TO_LEFT; + } + + ++++++ netpbm-security-code.patch ++++++ ++++ 1650 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/netpbm/netpbm-security-code.patch ++++ and /work/SRC/openSUSE:Factory/.netpbm.new/netpbm-security-code.patch ++++++ netpbm-security-scripts.patch ++++++ --- /var/tmp/diff_new_pack.EOQmAg/_old 2016-08-26 23:13:48.000000000 +0200 +++ /var/tmp/diff_new_pack.EOQmAg/_new 2016-08-26 23:13:48.000000000 +0200 @@ -1,108 +1,16 @@ -Index: converter/other/anytopnm +Index: netpbm-10.75.1/editor/ppmfade =================================================================== ---- converter/other/anytopnm.orig 2014-04-01 11:09:00.723372866 +0200 -+++ converter/other/anytopnm 2014-04-01 11:19:32.032102323 +0200 -@@ -511,10 +511,7 @@ - inputFile="-" - fi - --tempdir="${TMPDIR-/tmp}/anytopnm.$$" --mkdir -m 0700 $tempdir || \ -- { echo "Could not create temporary file. Exiting."; exit 1;} --trap 'rm -rf $tempdir' 0 -+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1 - - # Take out all spaces - # Find the filename extension for last-ditch efforts later -@@ -540,9 +537,17 @@ - echo "$progname: unknown file type. " \ - "'file' says mime type is '$mimeType', " 1>&2 - echo "type description is '$typeDescription'" 1>&2 -+ if [ -d "$tempdir" ] ; then -+ rm -rf "$tempdir" -+ fi -+ - exit 1 - fi - - convertIt $file $filetype - -+if [ -d "$tempdir" ] ; then -+ rm -rf "$tempdir" -+fi -+ - exit 0 -Index: editor/pamstretch-gen -=================================================================== ---- editor/pamstretch-gen.orig 2014-04-01 11:08:58.068340316 +0200 -+++ editor/pamstretch-gen 2014-04-01 11:19:32.033102335 +0200 -@@ -31,13 +31,9 @@ - exit 1 - fi - --tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$" --mkdir -m 0700 $tempdir || \ -- { echo "Could not create temporary file. Exiting."; exit 1;} -+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1 - trap 'rm -rf $tempdir' 0 1 3 15 - --tempfile=$tempdir/pnmig -- - if ! cat $2 >$tempfile 2>/dev/null; then - echo 'pamstretch-gen: error reading file' 1>&2 - exit 1 -Index: editor/pnmmargin -=================================================================== ---- editor/pnmmargin.orig 2014-04-01 11:08:58.058340193 +0200 -+++ editor/pnmmargin 2014-04-01 11:20:28.990798746 +0200 -@@ -11,15 +11,11 @@ - # documentation. This software is provided "as is" without express or - # implied warranty. - --tempdir="${TMPDIR-/tmp}/pnmmargin.$$" --mkdir -m 0700 $tempdir || \ -- { echo "Could not create temporary file. Exiting." 1>&2; exit 1;} --trap 'rm -rf $tempdir' 0 1 3 15 -- --tmp1=$tempdir/pnmm1 --tmp2=$tempdir/pnmm2 --tmp3=$tempdir/pnmm3 --tmp4=$tempdir/pnmm4 -+tmpdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1 -+tmp1="$tmpdir/tmp1" -+tmp2="$tmpdir/tmp2" -+tmp3="$tmpdir/tmp3" -+tmp4="$tmpdir/tmp4" - - color="-gofigure" - plainopt="" -@@ -90,6 +86,7 @@ - -white | -black ) - pnmpad $plainopt $color \ - -left=$size -right=$size -top=$size -bottom=$size $tmp1 -+ rm -rf "$tmpdir" - exit - ;; - * ) -@@ -103,4 +100,4 @@ - pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3 - fi - -- -+rm -rf "$tmpdir -Index: editor/ppmfade -=================================================================== ---- editor/ppmfade.orig 2014-04-01 11:08:58.218342155 +0200 -+++ editor/ppmfade 2014-04-01 11:19:32.033102335 +0200 -@@ -40,6 +40,7 @@ +--- netpbm-10.75.1.orig/editor/ppmfade 2016-08-22 11:03:30.561767005 +0200 ++++ netpbm-10.75.1/editor/ppmfade 2016-08-22 16:44:34.091984993 +0200 +@@ -40,6 +40,7 @@ exec perl -w -x -S -- "$0" "$@" # ############################################################################## use strict; +use File::Temp "tempdir"; - my $SPREAD = 1; - my $SHIFT = 2; -@@ -137,20 +138,26 @@ + sub doVersionHack($) { + my ($argvR) = @_; +@@ -149,20 +150,26 @@ if ($first_file ne "undefined") { print("Frames are " . $width . "W x " . $height . "H\n"); @@ -133,7 +41,7 @@ } # -@@ -158,14 +165,14 @@ +@@ -170,14 +177,14 @@ if ($last_file eq "undefined") { # # Here's what our temporary files are: @@ -156,7 +64,7 @@ my $i; # Frame number for ($i = 1; $i <= $nframes; $i++) { -@@ -173,147 +180,147 @@ +@@ -185,147 +192,147 @@ for ($i = 1; $i <= $nframes; $i++) { if ($mode eq $SPREAD) { if ($i <= 10) { my $n = $spline20[$i] * 100; @@ -357,21 +265,21 @@ +system("rm $tmpdir/junk*$$.ppm"); exit(0); -Index: editor/ppmshadow +Index: netpbm-10.75.1/editor/ppmshadow =================================================================== ---- editor/ppmshadow.orig 2014-04-01 11:08:58.066340291 +0200 -+++ editor/ppmshadow 2014-04-01 11:19:32.034102347 +0200 -@@ -97,9 +97,10 @@ - - - my $tmpdir = $ENV{TMPDIR} || "/tmp"; --my $ourtmp = "$tmpdir/ppmshadow$$"; --mkdir($ourtmp, 0777) or -- die("Unable to create directory for temporary files '$ourtmp"); -+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`); -+if ($? >> 8) { +--- netpbm-10.75.1.orig/editor/ppmshadow 2016-08-22 16:44:34.091984993 +0200 ++++ netpbm-10.75.1/editor/ppmshadow 2016-08-22 16:45:25.404862701 +0200 +@@ -170,9 +170,10 @@ my $tmpdir = $ENV{TMPDIR} || "/tmp"; + my $ourtmp; + + if ($keeptemp) { +- $ourtmp = "$tmpdir/ppmshadow$$"; +- mkdir($ourtmp, 0777) or +- die("Unable to create directory for temporary files '$ourtmp"); ++ chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`); ++ if ($? >> 8) { + die "Can't create directory for temporary files"; -+} - - # Process command line options - ++ } + } else { + $ourtmp = File::Temp::tempdir("$tmpdir/ppmshadowXXXX", UNLINK=>1); + } ++++++ netpbm-tmpfile.patch ++++++ --- /var/tmp/diff_new_pack.EOQmAg/_old 2016-08-26 23:13:48.000000000 +0200 +++ /var/tmp/diff_new_pack.EOQmAg/_new 2016-08-26 23:13:48.000000000 +0200 @@ -11,53 +11,4 @@ rm -f $tmpfile set maxformat=PBM -Index: generator/ppmrainbow -=================================================================== ---- generator/ppmrainbow.orig -+++ generator/ppmrainbow -@@ -25,6 +25,7 @@ exec perl -w -x -S -- "$0" "$@" - #!/usr/bin/perl - use strict; - use Getopt::Long; -+use File::Temp qw{tempfile tempdir}; - - my ($FALSE, $TRUE) = (0,1); - -@@ -71,31 +72,25 @@ if (!$norepeat) { - push @colorlist, $ARGV[0]; - } - --my $ourtmp = "$tmpdir/ppmrainbow$$"; --mkdir($ourtmp, 0777) or -- die("Unable to create directory for temporary files '$ourtmp"); -- -- -+my $ourtmp = tempdir("ppmrainbow.XXXX", DIR => $tmpdir, CLEANUP => 1); - my $widthRemaining; --my $n; - my @outlist; - --$n = 0; - $widthRemaining = $Twid; - @outlist = (); - - while (@colorlist >= 2) { -- my $outfile = sprintf("%s/file.%03u.ppm", $ourtmp, $n); -+ (my $tmpfh, my $outfile) = tempfile("file.XXXXXXXX", DIR => "$ourtmp", SUFFIX => '.ppm'); - push(@outlist, $outfile); - - my $w = int(($widthRemaining-1)/(@colorlist-1))+1; -- my $rc = system("$verboseCommand pgmramp -lr $w $Thgt | " . -- "pgmtoppm \"$colorlist[0]-$colorlist[1]\" >$outfile"); -- if ($rc != 0) { -+ my $content = qx{$verboseCommand pgmramp -lr $w $Thgt | -+ pgmtoppm "$colorlist[0]-$colorlist[1]"}; -+ if (! "$content") { - fatal("pgmramp|pgmtoppm failed."); - } -+ print $tmpfh $content; - $widthRemaining -= $w; -- $n++; - shift @colorlist; - } - +
