Hello community, here is the log from the commit of package netpbm for openSUSE:Factory checked in at 2020-05-07 17:49:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netpbm (Old) and /work/SRC/openSUSE:Factory/.netpbm.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netpbm" Thu May 7 17:49:28 2020 rev:72 rq:800053 version:10.88.1 Changes: -------- --- /work/SRC/openSUSE:Factory/netpbm/netpbm.changes 2020-01-01 14:58:01.949922769 +0100 +++ /work/SRC/openSUSE:Factory/.netpbm.new.2738/netpbm.changes 2020-05-07 17:49:35.993155367 +0200 @@ -1,0 +2,12 @@ +Mon May 4 12:42:15 UTC 2020 - [email protected] + +- added patches + fix bsc#1170831 -- sent to [email protected] on 2020-05-04 + + netpbm-pbmtonokia-cmdline-txt-null.patch + +------------------------------------------------------------------- +Thu Apr 30 14:14:22 UTC 2020 - Martin Liška <[email protected]> + +- Add ubsan_build and remove not needed patch netpbm-asan.patch. + +------------------------------------------------------------------- Old: ---- netpbm-asan.patch New: ---- netpbm-pbmtonokia-cmdline-txt-null.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netpbm.spec ++++++ --- /var/tmp/diff_new_pack.tU2s5B/_old 2020-05-07 17:49:36.981157458 +0200 +++ /var/tmp/diff_new_pack.tU2s5B/_new 2020-05-07 17:49:36.985157466 +0200 @@ -1,7 +1,7 @@ # # spec file for package netpbm # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,6 +18,7 @@ %define debug_build 0 %define asan_build 0 +%define ubsan_build 0 %define libmaj 11 %define libmin 88 %define libver %{libmaj}.%{libmin} @@ -35,7 +36,6 @@ # SUSE specific Patch0: %{name}-make.patch # neccessary for running with ASAN -Patch1: %{name}-asan.patch Patch3: %{name}-tmpfile.patch Patch4: %{name}-security-code.patch Patch5: %{name}-security-scripts.patch @@ -47,6 +47,8 @@ Patch9: big-endian.patch # bsc#1144255 disable jpeg2k support due to removal of jasper Patch10: netpbm-disable-jasper.patch +# bsc#1170831 -- sent to [email protected] on 2020-05-04 +Patch11: netpbm-pbmtonokia-cmdline-txt-null.patch BuildRequires: flex BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -102,6 +104,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 mkdir pnmtopalm # for %%doc pnmtopalm cp -p converter/other/pnmtopalm/{LICENSE,README} pnmtopalm @@ -119,8 +122,12 @@ export CFLAGS="$CFLAGS -O0" %endif %if %{asan_build} -export CFLAGS="$CFLAGS -fsanitize=address" -patch -p1 < %{PATCH1} +export CFLAGS="$CFLAGS -fsanitize=address -fno-sanitize-recover=all" +export LDFLAGS="$LDFLAGS -fsanitize=address" +%endif +%if %{ubsan_build} +export CFLAGS="$CFLAGS -fsanitize=undefined -fno-sanitize-recover=all" +export LDFLAGS="$LDFLAGS -fsanitize=undefined" %endif make %{?_smp_mflags} CFLAGS="$CFLAGS" rm doc/INSTALL @@ -152,6 +159,12 @@ %postun -n libnetpbm%{libmaj} -p /sbin/ldconfig %check +%if %{asan_build} +export LSAN_OPTIONS="detect_leaks=0" +%endif +%if %{ubsan_build} +export UBSAN_OPTIONS="print_stacktrace=1" +%endif # do not run unneccesary tests sed -i '/all-in-place/d' test/Test-Order sed -i '/legacy-names/d' test/Test-Order ++++++ netpbm-pbmtonokia-cmdline-txt-null.patch ++++++ 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;
