From 24c2d521837994bdbc611f74a496e2f4d3c8af0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Mon, 3 Jan 2022 17:07:00 +0100 Subject: [PATCH] Resolves: #2035806 - update to the new upstream release 10.97.00 --- .gitignore | 1 + netpbm-manfix.patch | 73 +++++++++++++++++++------------------- netpbm-security-code.patch | 29 +++++++-------- netpbm.spec | 5 ++- sources | 2 +- 5 files changed, 57 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index 189c5d3..3b1a710 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /netpbm-10.94.05.tar.xz /netpbm-10.95.00.tar.xz /netpbm-10.96.00.tar.xz +/netpbm-10.97.00.tar.xz diff --git a/netpbm-manfix.patch b/netpbm-manfix.patch index 8696c1d..10f635d 100644 --- a/netpbm-manfix.patch +++ b/netpbm-manfix.patch @@ -1,6 +1,6 @@ diff -urNp a/userguide/avstopam.html b/userguide/avstopam.html ---- a/userguide/avstopam.html 2021-06-02 12:56:59.584286425 +0200 -+++ b/userguide/avstopam.html 2021-06-02 15:00:33.799300026 +0200 +--- a/userguide/avstopam.html 2022-01-03 16:56:37.731614243 +0100 ++++ b/userguide/avstopam.html 2022-01-03 16:58:29.889416006 +0100 @@ -2,12 +2,13 @@ Avstopam User Manual @@ -72,8 +72,8 @@ diff -urNp a/userguide/avstopam.html b/userguide/avstopam.html diff -urNp a/userguide/faxformat.html b/userguide/faxformat.html ---- a/userguide/faxformat.html 2021-06-02 12:56:59.576286351 +0200 -+++ b/userguide/faxformat.html 2021-06-02 15:02:58.710711998 +0200 +--- a/userguide/faxformat.html 2022-01-03 16:56:37.731614243 +0100 ++++ b/userguide/faxformat.html 2022-01-03 16:58:29.890416013 +0100 @@ -5,10 +5,11 @@ Updated: 03 December 2008
@@ -88,8 +88,8 @@ diff -urNp a/userguide/faxformat.html b/userguide/faxformat.html (the idea is to provide a way to be sure that a fax machine is able to receive a fax sent by another). These standards incidentally specify graphics file diff -urNp a/userguide/libnetpbm_ug.html b/userguide/libnetpbm_ug.html ---- a/userguide/libnetpbm_ug.html 2021-06-02 12:56:59.584286425 +0200 -+++ b/userguide/libnetpbm_ug.html 2021-06-02 14:36:35.392293125 +0200 +--- a/userguide/libnetpbm_ug.html 2022-01-03 16:56:37.732614250 +0100 ++++ b/userguide/libnetpbm_ug.html 2022-01-03 16:58:29.891416020 +0100 @@ -374,7 +374,7 @@ plain format.

Reference

@@ -100,8 +100,8 @@ diff -urNp a/userguide/libnetpbm_ug.html b/userguide/libnetpbm_ug.html

The Libnetpbm Utility Manual diff -urNp a/userguide/pamfunc.html b/userguide/pamfunc.html ---- a/userguide/pamfunc.html 2021-06-02 12:56:59.585286434 +0200 -+++ b/userguide/pamfunc.html 2021-06-02 14:40:09.474375441 +0200 +--- a/userguide/pamfunc.html 2022-01-03 16:56:37.730614236 +0100 ++++ b/userguide/pamfunc.html 2022-01-03 16:58:29.892416027 +0100 @@ -60,7 +60,7 @@ output image. and bit string (such as and with 01001000). For the arithmetic functions, the function arguments and results are the fraction that a sample is of the @@ -112,8 +112,8 @@ diff -urNp a/userguide/pamfunc.html b/userguide/pamfunc.html

Arithmetic functions

diff -urNp a/userguide/pammixmulti.html b/userguide/pammixmulti.html ---- a/userguide/pammixmulti.html 2021-06-02 12:56:59.586286443 +0200 -+++ b/userguide/pammixmulti.html 2021-06-02 14:28:03.105311615 +0200 +--- a/userguide/pammixmulti.html 2022-01-03 16:56:37.731614243 +0100 ++++ b/userguide/pammixmulti.html 2022-01-03 16:58:29.893416034 +0100 @@ -7,8 +7,8 @@ Updated: 18 November 2018 Table Of Contents @@ -278,17 +278,10 @@ diff -urNp a/userguide/pammixmulti.html b/userguide/pammixmulti.html diff -urNp a/userguide/pampaintspill.html b/userguide/pampaintspill.html ---- a/userguide/pampaintspill.html 2021-06-02 12:56:59.575286342 +0200 -+++ b/userguide/pampaintspill.html 2021-06-02 15:06:31.354767352 +0200 -@@ -2,12 +2,12 @@ - Pampaintspill User Manual - -

pampaintspill

--Updated: 06 March 2021 -+

Updated: 06 March 2021 -
--Table Of Contents -+Table Of Contents

+--- a/userguide/pampaintspill.html 2022-01-03 16:56:37.730614236 +0100 ++++ b/userguide/pampaintspill.html 2022-01-03 17:05:08.124277395 +0100 +@@ -7,7 +7,7 @@ Updated: 02 November 2021 + Table Of Contents

NAME

-pampaintspill - smoothly spill colors into the background @@ -296,9 +289,9 @@ diff -urNp a/userguide/pampaintspill.html b/userguide/pampaintspill.html

SYNOPSIS

-@@ -17,17 +17,17 @@ pampaintspill - smoothly spill colors in - [--wrap] [--all] +@@ -19,17 +19,17 @@ pampaintspill - smoothly spill colors in [--downsample=number] + [--near=number] [--power=number] [filename] -[-randomseed=integer] +[-randomseed=integer]

@@ -317,7 +310,7 @@ diff -urNp a/userguide/pampaintspill.html b/userguide/pampaintspill.html

pampaintspill produces a smooth color gradient from all of the non-background-colored pixels in an input image, effectively "spilling -@@ -38,27 +38,27 @@ paint" onto the background. pampaint +@@ -40,27 +40,27 @@ paint" onto the background. pampaint

  • pampaintspill accepts any number of paint sources (non-background-colored pixels), which can lie anywhere on the canvas. pamgradient accepts exactly @@ -350,14 +343,20 @@ diff -urNp a/userguide/pampaintspill.html b/userguide/pampaintspill.html
    --bgcolor=color
    -@@ -107,42 +107,42 @@ command line options: -
    This is the seed for the random number generator that generates the - pixels. - +@@ -116,46 +116,46 @@ command line options: + 2.0) make the paint sources stand out in the output image by pushing the + gradients away from them.
    + +-
    -randomseed=integer ++
    -randomseed=integer
    +
    This is the seed for the random number generator that generates the +- pixels. ++ pixels.
    + -

    Use this to ensure you get the same image on separate invocations. +

    Use this to ensure you get the same image on separate invocations.

    - --

    This option was new in Netpbm 10.94 (March 2021). + +-

    This option was new in Netpbm 10.94 (March 2021). +

    This option was new in Netpbm 10.94 (March 2021).

    @@ -387,7 +386,7 @@ diff -urNp a/userguide/pampaintspill.html b/userguide/pampaintspill.html -

    Copyright © 2010 Scott Pakin, +

    Copyright © 2010–2021 Scott Pakin, -scott+pbm@pakin.org. +scott+pbm@pakin.org.

    @@ -410,8 +409,8 @@ diff -urNp a/userguide/pampaintspill.html b/userguide/pampaintspill.html diff -urNp a/userguide/pamrecolor.html b/userguide/pamrecolor.html ---- a/userguide/pamrecolor.html 2021-06-02 12:56:59.574286333 +0200 -+++ b/userguide/pamrecolor.html 2021-06-02 15:09:53.837724488 +0200 +--- a/userguide/pamrecolor.html 2022-01-03 16:56:37.731614243 +0100 ++++ b/userguide/pamrecolor.html 2022-01-03 16:58:29.894416041 +0100 @@ -2,9 +2,9 @@ Pamrecolor User Manual @@ -495,8 +494,8 @@ diff -urNp a/userguide/pamrecolor.html b/userguide/pamrecolor.html

    The luminance values pamrecolor uses for each of the above come from Bruce Lindbloom's diff -urNp a/userguide/pbmtog3.html b/userguide/pbmtog3.html ---- a/userguide/pbmtog3.html 2021-06-02 12:56:59.585286434 +0200 -+++ b/userguide/pbmtog3.html 2021-06-02 14:44:07.715692749 +0200 +--- a/userguide/pbmtog3.html 2022-01-03 16:56:37.732614250 +0100 ++++ b/userguide/pbmtog3.html 2022-01-03 16:58:29.894416041 +0100 @@ -36,7 +36,7 @@ use those encodings.

    In addition to the options common to all programs based on libnetpbm (most notably -quiet, see @@ -516,8 +515,8 @@ diff -urNp a/userguide/pbmtog3.html b/userguide/pbmtog3.html and then modified extensively by others. diff -urNp a/userguide/ppmtogif.html b/userguide/ppmtogif.html ---- a/userguide/ppmtogif.html 2021-06-02 12:56:59.574286333 +0200 -+++ b/userguide/ppmtogif.html 2021-06-02 15:48:19.167930575 +0200 +--- a/userguide/ppmtogif.html 2022-01-03 16:56:37.733614257 +0100 ++++ b/userguide/ppmtogif.html 2022-01-03 16:58:29.895416049 +0100 @@ -5,17 +5,17 @@

    NAME

    diff --git a/netpbm-security-code.patch b/netpbm-security-code.patch index 4ff5c52..84deed0 100644 --- a/netpbm-security-code.patch +++ b/netpbm-security-code.patch @@ -216,17 +216,17 @@ diff -ruNp a/converter/pbm/mdatopbm.c b/converter/pbm/mdatopbm.c data = pbm_allocarray(nOutCols, nOutRows); diff -ruNp a/converter/pbm/mgrtopbm.c b/converter/pbm/mgrtopbm.c ---- a/converter/pbm/mgrtopbm.c 2021-06-02 15:53:59.828205592 +0200 -+++ b/converter/pbm/mgrtopbm.c 2021-06-02 20:23:21.808634248 +0200 -@@ -65,6 +65,8 @@ readMgrHeader(FILE * const ifP, - if (head.h_high < ' ' || head.l_high < ' ') - pm_error("Invalid width field in MGR header"); - +--- a/converter/pbm/mgrtopbm.c 2022-01-03 16:41:24.856969944 +0100 ++++ b/converter/pbm/mgrtopbm.c 2022-01-03 16:43:27.023842152 +0100 +@@ -105,6 +105,8 @@ readMgrHeader(FILE * const ifP, + interpHdrWidth (head, colsP); + interpHdrHeight(head, rowsP); + + overflow_add(*colsP, pad); + - *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' '); - *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' '); - *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP; + *padrightP = ((*colsP + pad - 1) / pad) * pad - *colsP; + } + diff -ruNp a/converter/pbm/pbmtogem.c b/converter/pbm/pbmtogem.c --- a/converter/pbm/pbmtogem.c 2021-06-02 15:53:59.828205592 +0200 +++ b/converter/pbm/pbmtogem.c 2021-06-02 20:23:21.809634256 +0200 @@ -652,12 +652,13 @@ diff -ruNp a/converter/pbm/thinkjettopbm.l b/converter/pbm/thinkjettopbm.l packed_bitrow = malloc(maxRowLength); diff -ruNp a/converter/pbm/ybmtopbm.c b/converter/pbm/ybmtopbm.c ---- a/converter/pbm/ybmtopbm.c 2021-06-02 15:53:59.827205582 +0200 -+++ b/converter/pbm/ybmtopbm.c 2021-06-02 20:23:21.814634300 +0200 -@@ -43,6 +43,7 @@ getinit(FILE * const ifP, - pm_error("EOF / read error"); - +--- a/converter/pbm/ybmtopbm.c 2022-01-03 16:41:24.857969951 +0100 ++++ b/converter/pbm/ybmtopbm.c 2022-01-03 16:42:59.671646876 +0100 +@@ -49,6 +49,8 @@ getinit(FILE * const ifP, + *colsP = (unsigned int) cols; + *rowsP = (unsigned int) rows; *depthP = 1; ++ + overflow_add(*colsP, 15); } diff --git a/netpbm.spec b/netpbm.spec index 668a9f0..e70dc75 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -1,6 +1,6 @@ Summary: A library for handling different graphics file formats Name: netpbm -Version: 10.96.00 +Version: 10.97.00 Release: 1%{?dist} # See copyright_summary for details License: BSD and GPLv2 and IJG and MIT and Public Domain @@ -228,6 +228,9 @@ popd %doc userguide/* %changelog +* Mon Jan 03 2022 Josef Ridky - 10.97.00-1 +- New upstream release 10.97.00 (#2035806) + * Mon Oct 04 2021 Josef Ridky - 10.96.00-1 - New upstream release 10.96.00 (#2007871) diff --git a/sources b/sources index 3470dc3..279df91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (netpbm-10.96.00.tar.xz) = 665567a9cca1badb0fcd595cbabe934f9edd1b443a148894266ee50eead3846a859fe71c4d4c18231c15258f9ab73a249ec409863b02ad03dff5e9c9018ddd87 +SHA512 (netpbm-10.97.00.tar.xz) = 798158ce3e7ac6c8154944989f98653d6e4db09abf6e573366996041edd44871d8f56ab1611ca7e580d352c2b61cf0c270233bd59f7d95283eb8feafb0eaed0e