From d892e1533aae9e971f84236c7a211434a944c1eb36a796d1af701485bbaf4090 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 20 Nov 2012 09:34:47 +0000 Subject: [PATCH 1/2] - add url tag OBS-URL: https://build.opensuse.org/package/show/graphics/netpbm?expand=0&rev=41 --- netpbm.changes | 5 +++++ netpbm.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/netpbm.changes b/netpbm.changes index d636c00..332b4e3 100644 --- a/netpbm.changes +++ b/netpbm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 20 09:34:37 UTC 2012 - pgajdos@suse.com + +- add url tag + ------------------------------------------------------------------- Thu Sep 6 15:16:56 UTC 2012 - pgajdos@suse.com diff --git a/netpbm.spec b/netpbm.spec index f0d308e..75adbfc 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -36,6 +36,7 @@ Release: 0 Summary: A Powerful Graphics Conversion Package License: BSD-3-Clause and GPL-2.0+ and SUSE-IJG and MIT and SUSE-Public-Domain Group: Productivity/Graphics/Convertors +Url: http://http://netpbm.sourceforge.net/ Source: netpbm-%{version}-nohpcdtoppm-noppmtompeg.tar.bz2 Source1: netpbm-%{version}-documentation.tar.bz2 Source2: baselibs.conf From d69d1da134f0e7c7a4c2efa517e447fe2acf61fc2fb9b23ca91c376a598a7170 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 21 Nov 2012 08:28:10 +0000 Subject: [PATCH 2/2] - updated to 10.60.03: * Xbmtopbm: fix incorrect output, memory leak. Thanks Prophet of the Way . * Pamtojpeg2k: default to no compression ratio constraint and allow compression ratios less than 1. Because of compression metadata, small images do require loss of quality in order to get down to a compression ratio of 1. * Sunicontopnm: Fix incorrect output for depth 8. Always broken (depth = 8 capability was added in Netpbm 10.53 (December 2010). pamgauss: Fix bug: erroneously says -maxval is too big on 64 bit system. Always broken (Pamgauss was added in 10.23 (July 2004). * xpmtoppm: major speedup for 3-character-per pixel files, memory reduction for all files: use hash table instead of linear search or direct index, go row by row. * xpmtoppm: fix bogus "color number too large" failure. Broken in 10.49 (December 2009). * pnm_hashtuple: slight performance improvement from new hash function. Thanks Prophet of the Way . * ppmtospu: wild memory accesses. Always broken (program added in 10.58 (March 2012). * pamtosrf: fix storage corruption. Always broken (program added in 10.55 (June 2011). OBS-URL: https://build.opensuse.org/package/show/graphics/netpbm?expand=0&rev=42 --- netpbm-10.59.2-documentation.tar.bz2 | 3 --- ...bm-10.59.2-nohpcdtoppm-noppmtompeg.tar.bz2 | 3 --- netpbm-10.60.3-documentation.tar.bz2 | 3 +++ ...bm-10.60.3-nohpcdtoppm-noppmtompeg.tar.bz2 | 3 +++ netpbm-security-code.patch | 11 -------- netpbm.changes | 27 +++++++++++++++++++ netpbm.spec | 2 +- 7 files changed, 34 insertions(+), 18 deletions(-) delete mode 100644 netpbm-10.59.2-documentation.tar.bz2 delete mode 100644 netpbm-10.59.2-nohpcdtoppm-noppmtompeg.tar.bz2 create mode 100644 netpbm-10.60.3-documentation.tar.bz2 create mode 100644 netpbm-10.60.3-nohpcdtoppm-noppmtompeg.tar.bz2 diff --git a/netpbm-10.59.2-documentation.tar.bz2 b/netpbm-10.59.2-documentation.tar.bz2 deleted file mode 100644 index e823b84..0000000 --- a/netpbm-10.59.2-documentation.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05430821e11c51ec6bf7b1b4ef5be564db51cecd45c6b669ad655d6fefd5f8e2 -size 573489 diff --git a/netpbm-10.59.2-nohpcdtoppm-noppmtompeg.tar.bz2 b/netpbm-10.59.2-nohpcdtoppm-noppmtompeg.tar.bz2 deleted file mode 100644 index 619804d..0000000 --- a/netpbm-10.59.2-nohpcdtoppm-noppmtompeg.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5db40b9b72218330e226b20076d5120b5f19c621e71c82c240bc43f2332c7003 -size 1705720 diff --git a/netpbm-10.60.3-documentation.tar.bz2 b/netpbm-10.60.3-documentation.tar.bz2 new file mode 100644 index 0000000..52d221c --- /dev/null +++ b/netpbm-10.60.3-documentation.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c605aeedb8bf73da2956f38dedf7feab964464e6084dc6f4a08d80a48584bd14 +size 586893 diff --git a/netpbm-10.60.3-nohpcdtoppm-noppmtompeg.tar.bz2 b/netpbm-10.60.3-nohpcdtoppm-noppmtompeg.tar.bz2 new file mode 100644 index 0000000..ae01166 --- /dev/null +++ b/netpbm-10.60.3-nohpcdtoppm-noppmtompeg.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1dc9090d35704433c2e8656fe98c3b127bb6e5117b5000ac1a42e923831905a9 +size 1724079 diff --git a/netpbm-security-code.patch b/netpbm-security-code.patch index 9889ea5..381ca10 100644 --- a/netpbm-security-code.patch +++ b/netpbm-security-code.patch @@ -988,17 +988,6 @@ diff -up netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code netpbm-10.58.01/ header->colors = (Color *)calloc((unsigned int)header->ncolors, sizeof(Color)); if (header->colors == NULL) { -diff -up netpbm-10.58.01/converter/ppm/xpmtoppm.c.security-code netpbm-10.58.01/converter/ppm/xpmtoppm.c ---- netpbm-10.58.01/converter/ppm/xpmtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ netpbm-10.58.01/converter/ppm/xpmtoppm.c 2012-04-09 15:41:54.193232227 +0200 -@@ -851,6 +851,7 @@ readXpmFile(FILE * const ifP - &nColors, colorsP, &ptab); - transparentP->none = true; /* No transparency in version 1 */ - } -+ overflow2(*widthP, *heightP); - totalpixels = width * height; - MALLOCARRAY(data, totalpixels); - if (!data) diff -up netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code netpbm-10.58.01/converter/ppm/yuvtoppm.c --- netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 +++ netpbm-10.58.01/converter/ppm/yuvtoppm.c 2012-04-09 15:40:03.218619602 +0200 diff --git a/netpbm.changes b/netpbm.changes index 332b4e3..261d05e 100644 --- a/netpbm.changes +++ b/netpbm.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed Nov 21 08:25:24 UTC 2012 - pgajdos@suse.com + +- updated to 10.60.03: + * Xbmtopbm: fix incorrect output, memory leak. Thanks Prophet of + the Way . + * Pamtojpeg2k: default to no compression ratio constraint and + allow compression ratios less than 1. Because of compression + metadata, small images do require loss of quality in order to + get down to a compression ratio of 1. + * Sunicontopnm: Fix incorrect output for depth 8. Always broken + (depth = 8 capability was added in Netpbm 10.53 (December 2010). + + pamgauss: Fix bug: erroneously says -maxval is too big on 64 bit + system. Always broken (Pamgauss was added in 10.23 (July 2004). + * xpmtoppm: major speedup for 3-character-per pixel files, + memory reduction for all files: use hash table instead of + linear search or direct index, go row by row. + * xpmtoppm: fix bogus "color number too large" failure. Broken + in 10.49 (December 2009). + * pnm_hashtuple: slight performance improvement from new hash + function. Thanks Prophet of the Way . + * ppmtospu: wild memory accesses. Always broken (program added in + 10.58 (March 2012). + * pamtosrf: fix storage corruption. Always broken (program added + in 10.55 (June 2011). + ------------------------------------------------------------------- Tue Nov 20 09:34:37 UTC 2012 - pgajdos@suse.com diff --git a/netpbm.spec b/netpbm.spec index 75adbfc..8116d5b 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -31,7 +31,7 @@ Obsoletes: netpbm-64bit %define libmaj 11 %define libmin 59 %define libver %{libmaj}.%{libmin} -Version: 10.59.2 +Version: 10.60.3 Release: 0 Summary: A Powerful Graphics Conversion Package License: BSD-3-Clause and GPL-2.0+ and SUSE-IJG and MIT and SUSE-Public-Domain