From ad056208621f3d3472ad88aed449832824647b47 Mon Sep 17 00:00:00 2001 From: wenyuzifang Date: Thu, 7 Aug 2025 13:32:29 +0800 Subject: [PATCH] Update code from upstream --- jbigkit-covscan.patch | 30 ++++++++++++++++++++++++++++++ jbigkit.spec | 9 +++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 jbigkit-covscan.patch diff --git a/jbigkit-covscan.patch b/jbigkit-covscan.patch new file mode 100644 index 0000000..22282b9 --- /dev/null +++ b/jbigkit-covscan.patch @@ -0,0 +1,30 @@ +diff --git a/libjbig/jbig.c b/libjbig/jbig.c +index 751ceff..3c76e07 100644 +--- a/libjbig/jbig.c ++++ b/libjbig/jbig.c +@@ -889,7 +889,7 @@ void jbg_enc_options(struct jbg_enc_state *s, int order, int options, + if (order >= 0 && order <= 0x0f) s->order = order; + if (options >= 0) s->options = options; + if (l0 > 0) s->l0 = l0; +- if (mx >= 0 && my < 128) s->mx = mx; ++ if (mx >= 0 && mx < 128) s->mx = mx; + if (my >= 0 && my < 256) s->my = my; + + return; +diff --git a/pbmtools/Makefile b/pbmtools/Makefile +index 85e1783..6ae2d33 100644 +--- a/pbmtools/Makefile ++++ b/pbmtools/Makefile +@@ -56,9 +56,9 @@ test82: pbmtojbg jbgtopbm + make IMG=sandra "OPTIONSP=-o 2" OPTIONSJ= dotest2g + make IMG=multi OPTIONSP= OPTIONSJ= dotest2g + make IMG=multi OPTIONSP=-b OPTIONSJ=-b dotest2g +- make IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest1 +- make IMG=mx "OPTIONSP=-q -s 3 -m 128" dotest2b +- make IMG=mx "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b ++ make IMG=mx "OPTIONSP=-q -s 3 -m 127" dotest1 ++ make IMG=mx "OPTIONSP=-q -s 3 -m 127" dotest2b ++ make IMG=mx "OPTIONSP=-q -s 3 -m 127 -p 92" dotest2b + make IMG=mx "OPTIONSP=-q -Y -1" dotest2b + make IMG=mx "OPTIONSP=-Y -1" dotest2b + rm -f test-*.jbg test-*.pbm test-*.pgm diff --git a/jbigkit.spec b/jbigkit.spec index 26e648b..1cc32b0 100644 --- a/jbigkit.spec +++ b/jbigkit.spec @@ -1,7 +1,7 @@ -%define anolis_release 17 +%define anolis_release 18 Name: jbigkit -Version: 2.1 +Version: 2.1 Release: %{anolis_release}%{?dist} Summary: JBIG1 lossless image compression tools License: GPLv2+ @@ -12,8 +12,11 @@ Patch0: 0001-%{name}-2.1-shlib.patch Patch1: 0002-%{name}-2.0-warnings.patch Patch2: 0003-%{name}-ldflags.patch Patch3: 0004-%{name}-covscan.patch +Patch4: jbigkit-covscan.patch BuildRequires: gcc make +BuildRequires: gcc +BuildRequires: git-core Requires: %{name}-libs = %{version}-%{release} @@ -102,6 +105,8 @@ make test %doc ANNOUNCE TODO CHANGES %changelog +* Thu Aug 07 2025 wenyuzifang - 2.1-18 +- Fixes a critical bug and ensures test consistency for correct behavior. * Thu Apr 13 2023 Jing Zhang - 2.1-17 - Refact spec -- Gitee