pool/netpbm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- version update to 10.93.0

Browse Source 
* lot of bug fixes and features, see HISTORY
- modified patches
  % netpbm-disable-jasper.patch (refreshed)
  % netpbm-make.patch (refreshed)
  % netpbm-security-code.patch (refreshed)
  % netpbm-security-scripts.patch (refreshed)
  % netpbm-tmpfile.patch (refreshed)
  % signed-char.patch (refreshed)
- deleted patches
  - netpbm-pbmtonokia-cmdline-txt-null.patch (upstreamed)

OBS-URL: https://build.opensuse.org/package/show/graphics/netpbm?expand=0&rev=122
This commit is contained in:
Petr Gajdos 2020-12-29 11:51:30 +00:00 committed by Git OBS Bridge
parent c477254487
commit 3859e03247
13 changed files with 361 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netpbm-10.88.1-documentation.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3ed42c8c0a89df291385dd20345ae4b8167eb4d1b91fac4fd4dedd509615c03f
size 11760136

3
netpbm-10.88.1-nohpcdtoppm-noppmtompeg.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b8e819ec825deeb55a7baf6083909f7497a29493c624ceb6eea608af611d210f
size 1920716

3
netpbm-10.93.0-documentation.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3967e5b68391a84df081234431e9b80d00cc1005f09f6317b86175c90c216616
size 380106

3
netpbm-10.93.0-nohpcdtoppm-noppmtompeg.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb6c2efb0f613fbc63dcc43e9315a346eb2e7be17554de7e676d4afbdc713ae6
size 1959688

6
netpbm-disable-jasper.patch
View File

@ -1,7 +1,7 @@
Index: netpbm-10.86.3/config.mk.in Index: netpbm-10.93.0/config.mk.in
=================================================================== ===================================================================
--- netpbm-10.86.3.orig/config.mk.in --- netpbm-10.93.0.orig/config.mk.in 2020-12-29 10:52:17.176428400 +0100
+++ netpbm-10.86.3/config.mk.in +++ netpbm-10.93.0/config.mk.in 2020-12-29 10:52:17.328429333 +0100
@@ -482,7 +482,7 @@ JBIGLIB = $(INTERNAL_JBIGLIB) @@ -482,7 +482,7 @@ JBIGLIB = $(INTERNAL_JBIGLIB)
JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR) JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR)

18
netpbm-make.patch
View File

@ -1,8 +1,8 @@
Index: config.mk.in Index: netpbm-10.93.0/config.mk.in
=================================================================== ===================================================================
--- config.mk.in.orig 2014-09-08 09:55:59.652026877 +0200 --- netpbm-10.93.0.orig/config.mk.in 2020-12-29 11:04:16.164846967 +0100
+++ config.mk.in 2014-09-08 10:00:54.684021821 +0200 +++ netpbm-10.93.0/config.mk.in 2020-12-29 11:04:21.900882283 +0100
@@ -120,7 +120,7 @@ @@ -124,7 +124,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s
#OSF1: #OSF1:
#INSTALL = $(SRCDIR)/buildtools/installosf #INSTALL = $(SRCDIR)/buildtools/installosf
#Red Hat Linux: #Red Hat Linux:
@ -11,7 +11,7 @@ Index: config.mk.in
# STRIPFLAG is the option you pass to the above install program to make it # STRIPFLAG is the option you pass to the above install program to make it
# strip unnecessary information out of binaries. # strip unnecessary information out of binaries.
@@ -306,7 +306,7 @@ @@ -316,7 +316,7 @@ LDRELOC = NONE
CFLAGS_SHLIB = CFLAGS_SHLIB =
# Gcc: # Gcc:
#CFLAGS_SHLIB = -fpic #CFLAGS_SHLIB = -fpic
@ -20,7 +20,7 @@ Index: config.mk.in
# Sun compiler: # Sun compiler:
#CFLAGS_SHLIB = -Kpic #CFLAGS_SHLIB = -Kpic
#CFLAGS_SHLIB = -KPIC #CFLAGS_SHLIB = -KPIC
@@ -373,7 +373,7 @@ @@ -383,7 +383,7 @@ NETPBMLIB_RUNTIME_PATH =
# The TIFF library. See above. If you want to build the tiff # The TIFF library. See above. If you want to build the tiff
# converters, you must have the tiff library already installed. # converters, you must have the tiff library already installed.
@ -29,7 +29,7 @@ Index: config.mk.in
TIFFHDR_DIR = TIFFHDR_DIR =
#TIFFLIB = libtiff.so #TIFFLIB = libtiff.so
@@ -404,7 +404,7 @@ @@ -414,7 +414,7 @@ TIFFLIB_NEEDS_Z = Y
# JPEG stuff statically linked in, in which case you won't need # JPEG stuff statically linked in, in which case you won't need
# JPEGLIB in order to build the Tiff converters. # JPEGLIB in order to build the Tiff converters.
@ -38,7 +38,7 @@ Index: config.mk.in
JPEGHDR_DIR = JPEGHDR_DIR =
#JPEGLIB = libjpeg.so #JPEGLIB = libjpeg.so
#JPEGHDR_DIR = /usr/include/jpeg #JPEGHDR_DIR = /usr/include/jpeg
@@ -462,7 +462,7 @@ @@ -472,7 +472,7 @@ PNGVER =
# #
# If you have 'libpng-config' (see above), these are irrelevant. # If you have 'libpng-config' (see above), these are irrelevant.
@ -47,7 +47,7 @@ Index: config.mk.in
ZHDR_DIR = ZHDR_DIR =
#ZLIB = libz.so #ZLIB = libz.so
@@ -472,8 +472,8 @@ @@ -482,8 +482,8 @@ JBIGLIB = $(INTERNAL_JBIGLIB)
JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR) JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR)
# The Jasper JPEG-2000 image compression library (aka JasPer): # The Jasper JPEG-2000 image compression library (aka JasPer):

14
netpbm-pbmtonokia-cmdline-txt-null.patch
View File

@ -1,14 +0,0 @@
Index: netpbm-10.88.1/converter/pbm/pbmtonokia.c
===================================================================
--- netpbm-10.88.1.orig/converter/pbm/pbmtonokia.c 2019-12-20 11:44:12.938955573 +0100
+++ netpbm-10.88.1/converter/pbm/pbmtonokia.c 2020-05-04 14:28:15.636966434 +0200
@@ -412,7 +412,8 @@ convertToNpm(bit ** const image,
header[ 3] = 0;
header[ 4] = len;
header[ 5] = 0;
- memcpy(&header[5], text, len);
+ if (text)
+ memcpy(&header[5], text, len);
header[ 6 + len] = cols;
header[ 7 + len] = rows;
header[ 8 + len] = 1;

617
netpbm-security-code.patch
View File

File diff suppressed because it is too large Load Diff

14
netpbm-security-scripts.patch
View File

@ -1,7 +1,7 @@
Index: netpbm-10.75.1/editor/ppmfade Index: netpbm-10.93.0/editor/ppmfade
=================================================================== ===================================================================
--- netpbm-10.75.1.orig/editor/ppmfade 2016-08-22 11:03:30.561767005 +0200 --- netpbm-10.93.0.orig/editor/ppmfade 2020-12-29 11:04:15.768844529 +0100
+++ netpbm-10.75.1/editor/ppmfade 2016-08-22 16:44:34.091984993 +0200 +++ netpbm-10.93.0/editor/ppmfade 2020-12-29 11:06:05.909522666 +0100
@@ -40,6 +40,7 @@ exec perl -w -x -S -- "$0" "$@" @@ -40,6 +40,7 @@ exec perl -w -x -S -- "$0" "$@"
# #
############################################################################## ##############################################################################
@ -265,11 +265,11 @@ Index: netpbm-10.75.1/editor/ppmfade
+system("rm $tmpdir/junk*$$.ppm"); +system("rm $tmpdir/junk*$$.ppm");
exit(0); exit(0);
Index: netpbm-10.75.1/editor/ppmshadow Index: netpbm-10.93.0/editor/ppmshadow
=================================================================== ===================================================================
--- netpbm-10.75.1.orig/editor/ppmshadow 2016-08-22 16:44:34.091984993 +0200 --- netpbm-10.93.0.orig/editor/ppmshadow 2020-12-29 11:04:15.768844529 +0100
+++ netpbm-10.75.1/editor/ppmshadow 2016-08-22 16:45:25.404862701 +0200 +++ netpbm-10.93.0/editor/ppmshadow 2020-12-29 11:06:05.909522666 +0100
@@ -170,9 +170,10 @@ my $tmpdir = $ENV{TMPDIR} || "/tmp"; @@ -194,9 +194,10 @@ my $tmpdir = $ENV{TMPDIR} || "/tmp";
my $ourtmp; my $ourtmp;
if ($keeptemp) { if ($keeptemp) {

7
netpbm-tmpfile.patch
View File

@ -1,7 +1,7 @@
Index: editor/pnmindex.csh Index: netpbm-10.93.0/editor/pnmindex.csh
=================================================================== ===================================================================
--- editor/pnmindex.csh.orig --- netpbm-10.93.0.orig/editor/pnmindex.csh 2020-12-29 11:08:57.854581338 +0100
+++ editor/pnmindex.csh +++ netpbm-10.93.0/editor/pnmindex.csh 2020-12-29 11:09:01.634604611 +0100
@@ -85,7 +85,7 @@ if ( $#argv == 0 ) then @@ -85,7 +85,7 @@ if ( $#argv == 0 ) then
goto usage goto usage
endif endif
@ -11,4 +11,3 @@ Index: editor/pnmindex.csh
rm -f $tmpfile rm -f $tmpfile
set maxformat=PBM set maxformat=PBM

15
netpbm.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Dec 29 11:49:55 UTC 2020 - pgajdos@suse.com
- version update to 10.93.0
* lot of bug fixes and features, see HISTORY
- modified patches
% netpbm-disable-jasper.patch (refreshed)
% netpbm-make.patch (refreshed)
% netpbm-security-code.patch (refreshed)
% netpbm-security-scripts.patch (refreshed)
% netpbm-tmpfile.patch (refreshed)
% signed-char.patch (refreshed)
- deleted patches
- netpbm-pbmtonokia-cmdline-txt-null.patch (upstreamed)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 4 12:42:15 UTC 2020 - pgajdos@suse.com Mon May 4 12:42:15 UTC 2020 - pgajdos@suse.com

45
netpbm.spec
View File

@ -20,10 +20,10 @@
%define asan_build 0 %define asan_build 0
%define ubsan_build 0 %define ubsan_build 0
%define libmaj 11 %define libmaj 11
%define libmin 88 %define libmin 93
%define libver %{libmaj}.%{libmin} %define libver %{libmaj}.%{libmin}
Name: netpbm Name: netpbm
Version: 10.88.1 Version: 10.93.0
Release: 0 Release: 0
Summary: A Graphics Conversion Package Summary: A Graphics Conversion Package
License: BSD-3-Clause AND GPL-2.0-or-later AND IJG AND MIT AND SUSE-Public-Domain License: BSD-3-Clause AND GPL-2.0-or-later AND IJG AND MIT AND SUSE-Public-Domain
@ -36,19 +36,17 @@ Source3: prepare-src-tarball.sh
# SUSE specific # SUSE specific
Patch0: %{name}-make.patch Patch0: %{name}-make.patch
# neccessary for running with ASAN # neccessary for running with ASAN
Patch3: %{name}-tmpfile.patch Patch1: %{name}-tmpfile.patch
Patch4: %{name}-security-code.patch Patch2: %{name}-security-code.patch
Patch5: %{name}-security-scripts.patch Patch3: %{name}-security-scripts.patch
Patch6: %{name}-gcc-warnings.patch Patch4: %{name}-gcc-warnings.patch
Patch7: makeman-py3.patch Patch5: makeman-py3.patch
# PATCH-FIX-UPSTREAM fix bad use of plain char # PATCH-FIX-UPSTREAM fix bad use of plain char
Patch8: signed-char.patch Patch6: signed-char.patch
# PATCH-FIX-UPSTREAM fix dependency on byte order # PATCH-FIX-UPSTREAM fix dependency on byte order
Patch9: big-endian.patch Patch7: big-endian.patch
# bsc#1144255 disable jpeg2k support due to removal of jasper # bsc#1144255 disable jpeg2k support due to removal of jasper
Patch10: netpbm-disable-jasper.patch Patch8: netpbm-disable-jasper.patch
# bsc#1170831 -- sent to bryanh@giraffe-data.com on 2020-05-04
Patch11: netpbm-pbmtonokia-cmdline-txt-null.patch
BuildRequires: flex BuildRequires: flex
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
@ -95,16 +93,7 @@ source package.
%prep %prep
%setup -q -D -a 1 %setup -q -D -a 1
%patch0 %autopatch -p1
%patch3
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
mkdir pnmtopalm # for %%doc pnmtopalm mkdir pnmtopalm # for %%doc pnmtopalm
cp -p converter/other/pnmtopalm/{LICENSE,README} pnmtopalm cp -p converter/other/pnmtopalm/{LICENSE,README} pnmtopalm
@ -117,7 +106,7 @@ sed -i "s:STATICLIB_TOO = y:STATICLIB_TOO = n:" config.mk
echo 'install.manweb:' >> converter/ppm/hpcdtoppm/Makefile echo 'install.manweb:' >> converter/ppm/hpcdtoppm/Makefile
# dtto for ppmtompeg # dtto for ppmtompeg
echo 'install.manweb:' >> converter/ppm/ppmtompeg/Makefile echo 'install.manweb:' >> converter/ppm/ppmtompeg/Makefile
export CFLAGS="%{optflags} -flax-vector-conversions" export CFLAGS="%{optflags} -flax-vector-conversions -Wno-return-type"
%if %{debug_build} %if %{debug_build}
export CFLAGS="$CFLAGS -O0" export CFLAGS="$CFLAGS -O0"
%endif %endif
@ -172,11 +161,11 @@ sed -i '/legacy-names/d' test/Test-Order
sed -i '/pict-roundtrip/d' test/Test-Order sed -i '/pict-roundtrip/d' test/Test-Order
# pstopnm is not shipped # pstopnm is not shipped
sed -i '/^l\?ps.*\.test/d' test/Test-Order sed -i '/^l\?ps.*\.test/d' test/Test-Order
# pnmquant.test seems to be broken?: I do not get "Expected failure 7" and "Expected failure 8": # new winicon-roundtrip2.test failure reported to bryanh@giraffe-data.com on 2020-12-29
# pnmquant -spreadbrightness -spreadluminosity 16 testimg.ppm # $ LD_LIBRARY_PATH=lib PATH=package/bin pamtowinicon -pngthreshold=1 package-test-tmp/testimg1.pam
# pnmquant -floyd -nofloyd 16 testimg.ppm # pamtowinicon: bad magic number 0xf0f - not a PAM, PPM, PGM, or PBM file
# both succedes ($? == 0) # $
sed -i '/pnmquant.test/d' test/Test-Order sed -i '/winicon-roundtrip2.test/d' test/Test-Order
mkdir package-test-{tmp,results} mkdir package-test-{tmp,results}
make pkgdir=`pwd`/package tmpdir=`pwd`/package-test-tmp RESULTDIR=`pwd`/package-test-results check-package make pkgdir=`pwd`/package tmpdir=`pwd`/package-test-tmp RESULTDIR=`pwd`/package-test-results check-package

10
signed-char.patch
View File

@ -1,8 +1,8 @@
Index: netpbm-10.86.3/converter/other/pnmtopalm/palmtopnm.c Index: netpbm-10.93.0/converter/other/pnmtopalm/palmtopnm.c
=================================================================== ===================================================================
--- netpbm-10.86.3.orig/converter/other/pnmtopalm/palmtopnm.c --- netpbm-10.93.0.orig/converter/other/pnmtopalm/palmtopnm.c 2020-12-29 11:04:15.564843272 +0100
+++ netpbm-10.86.3/converter/other/pnmtopalm/palmtopnm.c +++ netpbm-10.93.0/converter/other/pnmtopalm/palmtopnm.c 2020-12-29 11:06:16.809589774 +0100
@@ -823,7 +823,7 @@ readPackBitsRow16(FILE * const @@ -825,7 +825,7 @@ readPackBitsRow16(FILE * const
unsigned int j; unsigned int j;
for (j = 0; j < bytesPerRow; ) { for (j = 0; j < bytesPerRow; ) {
@ -11,7 +11,7 @@ Index: netpbm-10.86.3/converter/other/pnmtopalm/palmtopnm.c
pm_readchar(ifP, &incount); pm_readchar(ifP, &incount);
if (incount < 0) { if (incount < 0) {
/* How do we handle incount == -128 ? */ /* How do we handle incount == -128 ? */
@@ -865,7 +865,7 @@ readPackBitsRow(FILE * const if @@ -868,7 +868,7 @@ readPackBitsRow(FILE * const if
unsigned int j; unsigned int j;
for (j = 0; j < bytesPerRow; ) { for (j = 0; j < bytesPerRow; ) {