From 0677f71aa3df98203244a2ed5583e62c066cf0381678e646c541a895e3eda12e Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 3 Feb 2026 12:36:31 +0100 Subject: [PATCH] version update to 1.9.23: --- htmldoc-1.9.18-source.tar.gz | 3 -- htmldoc-1.9.23-source.tar.gz | 3 ++ htmldoc-1.9.23-source.tar.gz.sig | Bin 0 -> 566 bytes htmldoc-CVE-2024-45508.patch | 13 ------- htmldoc.changes | 58 +++++++++++++++++++++++++++++++ htmldoc.keyring | 52 +++++++++++++++++++++++++++ htmldoc.spec | 35 ++++++++++--------- 7 files changed, 131 insertions(+), 33 deletions(-) delete mode 100644 htmldoc-1.9.18-source.tar.gz create mode 100644 htmldoc-1.9.23-source.tar.gz create mode 100644 htmldoc-1.9.23-source.tar.gz.sig delete mode 100644 htmldoc-CVE-2024-45508.patch create mode 100644 htmldoc.keyring diff --git a/htmldoc-1.9.18-source.tar.gz b/htmldoc-1.9.18-source.tar.gz deleted file mode 100644 index 439dfd0..0000000 --- a/htmldoc-1.9.18-source.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36492b39754ccd00c1183f8237850f09a3a807bb55cfaa9822090343c5012f09 -size 3289754 diff --git a/htmldoc-1.9.23-source.tar.gz b/htmldoc-1.9.23-source.tar.gz new file mode 100644 index 0000000..b7e35d7 --- /dev/null +++ b/htmldoc-1.9.23-source.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73bfe91dc96038f465e0bb2be66eaf91f381c42c7f9b36918d5af80edbca99be +size 3293703 diff --git a/htmldoc-1.9.23-source.tar.gz.sig b/htmldoc-1.9.23-source.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..a079d197a156702faf5638654ef17ced546186b4459e50b9b81af70feab87e2f GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+XhQrOqY(G{!`1A$7XUAU1A2LJ*0%>}HzyJyf5WZ)} zUdSIZM9%RK{T}B+V$Z-&O`vFv=UEHtbYjR!UPkmt-J@V`Q+{HYwxPa$m&KC+l}&&e zZX%*6%a{=I%uZ*w55oBU&7cuAlAG2-`c`cy+`z3^S2@Q|aKGpf1aVLmv9%+WG#Pcp z3J05|e@SbDdXg@^X)_tbld|cVYr}V$M6uNj$;O{cP-NA#(!2Z0#X+%ale#@!LgSX` zgq9x(6g+stMsTgG&TDpvNbW>ov!qr7_-6j=4q)2T*&+z{ zx7XF4`a}1vYMH}J{p`!WNpigeNp%VuF)S3_%M{k(zQ&Bcr`l`YB;mX~Ec7$=dE0(J zLQT1v>6&rEf_yw{g-JS~IwBL3B?@z^N#$n-!CF~!$D5gSX9QIPL*JKbThFUa%f5B7 zj{!dj=}LiQclvRwDS{F2(L{QrLWB+-3G5D6u|=rkke|0n(ht&;lE3|69Lz)@anNk> E|J%nHegFUf literal 0 HcmV?d00001 diff --git a/htmldoc-CVE-2024-45508.patch b/htmldoc-CVE-2024-45508.patch deleted file mode 100644 index 88b8046..0000000 --- a/htmldoc-CVE-2024-45508.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: htmldoc-1.9.18/htmldoc/ps-pdf.cxx -=================================================================== ---- htmldoc-1.9.18.orig/htmldoc/ps-pdf.cxx -+++ htmldoc-1.9.18/htmldoc/ps-pdf.cxx -@@ -5234,7 +5234,7 @@ parse_paragraph(tree_t *t, /* I - Tree t - if (temp->markup != MARKUP_A) - break; - -- if (temp != NULL && temp->markup == MARKUP_NONE && temp->data[0] == ' ') -+ if (temp != NULL && temp->markup == MARKUP_NONE && temp->data[0] == ' ' && temp->data[1]) - { - // Drop leading space... - for (dataptr = temp->data; *dataptr; dataptr ++) diff --git a/htmldoc.changes b/htmldoc.changes index c972b0f..f66d011 100644 --- a/htmldoc.changes +++ b/htmldoc.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Tue Feb 3 09:37:10 UTC 2026 - Petr Gajdos + +- version update to 1.9.23: + * Fixed a regression in list handling that caused a crash for empty list items + (Issue #553) + * Fixed a regression in the number of rendered table of contents levels in PDF + and PostScript output (Issue #554) +- version update to 1.9.22: + * Added a "--without-http" configure option to build without CUPS HTTP/HTTPS + support (Issue #547) + * Updated HTTP/HTTPS support to work with both CUPS 2.x and 3.x. + * Updated the maximum image dimension to prevent integer overflow on 32-bit + platforms (Issue #550) + * Updated the HTML parser to correctly report the line number of errors in files + with more than 2^32-1 lines (Issue #551) + * Fixed a crash bug with certain markdown files (Issue #548) + * Fixed an unrestricted recursion bug when reading and formatting HTML + (Issue #552) +- version update to 1.9.21 + * Updated HTTP/HTTPS connection error reporting to include the reason. + * Updated markdown parser. + * Updated the HTTP/HTTPS connection timeout to 5 minutes (Issue #541) + * Fixed a bug in the new PDF link code (Issue #536) + * Fixed a bug in the number-up code (Issue #539) + * Fixed a regression in leading whitespace handling (Issue #540) + * Fixed a bug in numbered heading support (Issue #543) + * Fixed a bug with setting the header on the first page (Issue #544) + * Fixed paths in the HTMLDOC snap (Issue #545) + +------------------------------------------------------------------- +Sat May 24 07:35:46 UTC 2025 - Andreas Stieger + +- update to 1.9.20: + * Fix a regression that caused spaces to disappear between some + words + * Fix resolution of relative links within a document +- includes changes from 1.9.19: + * Add support for ‘file’ method in links + * Update markdown support code to mmd + * Fix hyperlinks to subfolders + * Fix export of UTF-8 HTML + * Fix handling of whitespace-only nodes + * Fix case sensitivity of link targets +- drop security patches now included: + * htmldoc-CVE-2024-46478.patch + * htmldoc-CVE-2024-45508.patch +- add upstream signing key and validate source signature +- clean up spec file, drop some unneeded or deprecated constructs + +------------------------------------------------------------------- +Tue Nov 5 07:31:53 UTC 2024 - pgajdos@suse.com + +- security update +- added patches + fix CVE-2024-46478 [bsc#1232380], buffer overflow when handling tabs through the parse_pre function (ps-pdf.cxx) + + htmldoc-CVE-2024-46478.patch + ------------------------------------------------------------------- Mon Sep 2 12:48:22 UTC 2024 - pgajdos@suse.com diff --git a/htmldoc.keyring b/htmldoc.keyring new file mode 100644 index 0000000..a58be30 --- /dev/null +++ b/htmldoc.keyring @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +TmrmetlmpxSMcMU= +=No6h +-----END PGP PUBLIC KEY BLOCK----- diff --git a/htmldoc.spec b/htmldoc.spec index c5f18e6..85d6c15 100644 --- a/htmldoc.spec +++ b/htmldoc.spec @@ -1,7 +1,8 @@ # # spec file for package htmldoc # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC +# Copyright (c) 2025 Andreas Stieger # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,26 +18,29 @@ Name: htmldoc -Version: 1.9.18 +Version: 1.9.23 Release: 0 Summary: HTML Processor that Generates HTML, PostScript, and PDF Files License: LGPL-2.1-or-later Group: Productivity/Publishing/HTML/Tools URL: https://michaelrsweet.github.io/htmldoc/index.html Source: https://github.com/michaelrsweet/htmldoc/releases/download/v%{version}/htmldoc-%{version}-source.tar.gz -# CVE-2024-45508 [bsc#1230022], HTMLDOC before 1.9.19 has an out-of-bounds write in parse_paragraph in ps-pdf.cxx because of an attempt to strip leading whitespace from a whitespace-only node. -Patch0: htmldoc-CVE-2024-45508.patch -BuildRequires: cups-devel +Source2: https://github.com/michaelrsweet/htmldoc/releases/download/v%{version}/htmldoc-%{version}-source.tar.gz.sig +# https://www.msweet.org/pgp.html +Source3: %{name}.keyring +BuildRequires: c++_compiler BuildRequires: fltk-devel -BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: libXpm-devel -BuildRequires: libgcrypt-devel -BuildRequires: libgnutls-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: update-desktop-files -BuildRequires: zlib-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(zlib) +%if 0%{?sle_version} <= 150600 && 0%{?is_opensuse} +BuildRequires: cups-devel +%else +BuildRequires: pkgconfig(cups) +%endif %description HTMLDOC converts HTML source files into indexed HTML, PostScript, or @@ -56,10 +60,7 @@ Portable Document Format (PDF) files that can be viewed online or printed. mv -f %{buildroot}%{buildroot}/* \ %{buildroot} # Get rid of unvanted files -rm -rf %{buildroot}/home %{buildroot}%{_datadir}/doc/%{name} -# Update desktop file -%suse_update_desktop_file -r %{name} Development Documentation -%suse_update_desktop_file %{name} -G%{name} +rm -rf %{buildroot}%{_datadir}/doc/%{name} %files %license COPYING -- 2.51.1