From 7c044e6540c077cc30721e57fecbb457724d4a1c Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 22 Feb 2023 14:58:14 +0100 Subject: [PATCH 01/17] Fix possible use of an undefined value as an ARRAY reference in ParserNonXS.pm --- texinfo-7.0.2-undef-val-array-ref.patch | 11 +++++++++++ texinfo.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 texinfo-7.0.2-undef-val-array-ref.patch diff --git a/texinfo-7.0.2-undef-val-array-ref.patch b/texinfo-7.0.2-undef-val-array-ref.patch new file mode 100644 index 0000000..0710efd --- /dev/null +++ b/texinfo-7.0.2-undef-val-array-ref.patch @@ -0,0 +1,11 @@ +diff -up texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm.orig texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm +--- texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm.orig 2023-01-22 11:42:42.000000000 +0100 ++++ texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm 2023-02-22 12:22:13.711852621 +0100 +@@ -4357,6 +4357,7 @@ sub _process_remaining_on_line($$$$) + and ($current->{'parent'}->{'type'} eq 'menu_comment' + or $current->{'parent'}->{'type'} eq 'menu_entry_description') + and $asterisk ++ and $current->{'contents'} + and @{$current->{'contents'}} + and $current->{'contents'}->[-1]->{'type'} + and $current->{'contents'}->[-1]->{'type'} eq 'empty_line' diff --git a/texinfo.spec b/texinfo.spec index d5c986d..f5895bb 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -17,6 +17,8 @@ Patch1: info-6.5-sync-fix-info-dir.patch Patch2: texinfo-6.5-fix-info-dir.patch # Patch3: fixes issues detected by static analysis Patch3: texinfo-6.5-covscan-fixes.patch +# Patch4: fixes possible use of an undefined value as an ARRAY reference in ParserNonXS.pm +Patch4: texinfo-7.0.2-undef-val-array-ref.patch BuildRequires: make BuildRequires: gcc @@ -150,6 +152,11 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Wed Feb 22 2023 Vitezslav Crhonek - 7.0.2-2 +- Fix possible use of an undefined value as an ARRAY reference in ParserNonXS.pm + (causes FTBFS of a2ps) + Resolves: #2171433 + * Mon Jan 23 2023 Vitezslav Crhonek - 7.0.2-1 - Update to texinfo-7.0.2 Resolves: #2162979 From 4a42657db8a0bee4ca31af9b4f400ab39253f892 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 23 Feb 2023 11:21:09 +0100 Subject: [PATCH 02/17] Fix possible use of an undefined value as an ARRAY reference in ParserNonXS.pm --- texinfo-7.0.2-undef-val-array-ref.patch | 11 +++++++++++ texinfo.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 texinfo-7.0.2-undef-val-array-ref.patch diff --git a/texinfo-7.0.2-undef-val-array-ref.patch b/texinfo-7.0.2-undef-val-array-ref.patch new file mode 100644 index 0000000..0710efd --- /dev/null +++ b/texinfo-7.0.2-undef-val-array-ref.patch @@ -0,0 +1,11 @@ +diff -up texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm.orig texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm +--- texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm.orig 2023-01-22 11:42:42.000000000 +0100 ++++ texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm 2023-02-22 12:22:13.711852621 +0100 +@@ -4357,6 +4357,7 @@ sub _process_remaining_on_line($$$$) + and ($current->{'parent'}->{'type'} eq 'menu_comment' + or $current->{'parent'}->{'type'} eq 'menu_entry_description') + and $asterisk ++ and $current->{'contents'} + and @{$current->{'contents'}} + and $current->{'contents'}->[-1]->{'type'} + and $current->{'contents'}->[-1]->{'type'} eq 'empty_line' diff --git a/texinfo.spec b/texinfo.spec index d5c986d..f5895bb 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -17,6 +17,8 @@ Patch1: info-6.5-sync-fix-info-dir.patch Patch2: texinfo-6.5-fix-info-dir.patch # Patch3: fixes issues detected by static analysis Patch3: texinfo-6.5-covscan-fixes.patch +# Patch4: fixes possible use of an undefined value as an ARRAY reference in ParserNonXS.pm +Patch4: texinfo-7.0.2-undef-val-array-ref.patch BuildRequires: make BuildRequires: gcc @@ -150,6 +152,11 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Wed Feb 22 2023 Vitezslav Crhonek - 7.0.2-2 +- Fix possible use of an undefined value as an ARRAY reference in ParserNonXS.pm + (causes FTBFS of a2ps) + Resolves: #2171433 + * Mon Jan 23 2023 Vitezslav Crhonek - 7.0.2-1 - Update to texinfo-7.0.2 Resolves: #2162979 From 798247d0b7698895d5df4e820a489bf566c4358b Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 30 Mar 2023 09:14:23 +0200 Subject: [PATCH 03/17] Update to texinfo-7.0.3 Signed-off-by: Vitezslav Crhonek --- .gitignore | 4 ++-- sources | 4 ++-- texinfo.spec | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bacab2d..21ee2c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/texinfo-7.0.2.tar.xz -/texinfo-7.0.2.tar.xz.sig +/texinfo-7.0.3.tar.xz +/texinfo-7.0.3.tar.xz.sig diff --git a/sources b/sources index 81075c3..e40032c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-7.0.2.tar.xz) = 26dd5bb1392f2197ecde296ba157d4533f4b11fadf1238481da4cf2b3796c665ce96049df8d2f9a6d4fa22b7e9013d9978d195e525288663f0a54482bbc22b2b -SHA512 (texinfo-7.0.2.tar.xz.sig) = 93ec60133d9f05e77e2b11879069cdccbf3066fd33716b91aa7ae0878da931e80f58fed246be592a3fbcba3d17eec30cd51cef2ceab04ff3fe0b22e83c22cab2 +SHA512 (texinfo-7.0.3.tar.xz) = 7d14f7458f2b7d0ee0b740e00a5fc2a9d61d33811aa5905d649875ec518dcb4f01be46fb0c46748f7dfe36950597a852f1473ab0648d5add225bc8f35528a8ff +SHA512 (texinfo-7.0.3.tar.xz.sig) = 7d8d674d6903e146a19a99b5ee178fdc2cb6c93931f31439a3fe650c664cf308841937243b18b81f463b6fb264fdaf8134fdc81e023da46919bf93ae58ed5550 diff --git a/texinfo.spec b/texinfo.spec index f5895bb..5e0a708 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -2,8 +2,8 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 7.0.2 -Release: 2%{?dist} +Version: 7.0.3 +Release: 1%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -152,6 +152,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Thu Mar 30 2023 Vitezslav Crhonek - 7.0.3-1 +- Update to texinfo-7.0.3 + Resolves: #2181837 + * Wed Feb 22 2023 Vitezslav Crhonek - 7.0.2-2 - Fix possible use of an undefined value as an ARRAY reference in ParserNonXS.pm (causes FTBFS of a2ps) From 949e52d6f6630750c2cb6f118d9a0fde4e885757 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 31 May 2023 14:33:19 +0200 Subject: [PATCH 04/17] SPDX migration Signed-off-by: Vitezslav Crhonek --- texinfo.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/texinfo.spec b/texinfo.spec index 5e0a708..69af88c 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,8 +3,8 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.0.3 -Release: 1%{?dist} -License: GPLv3+ +Release: 2%{?dist} +License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz Source1: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz.sig @@ -152,6 +152,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Wed May 31 2023 Vitezslav Crhonek - 7.0.3-2 +- SPDX migration + * Thu Mar 30 2023 Vitezslav Crhonek - 7.0.3-1 - Update to texinfo-7.0.3 Resolves: #2181837 From 498fe42b822d423e05cde8b1456a13552dd6f620 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 03:30:35 +0000 Subject: [PATCH 05/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- texinfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texinfo.spec b/texinfo.spec index 69af88c..5335320 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.0.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -152,6 +152,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 7.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed May 31 2023 Vitezslav Crhonek - 7.0.3-2 - SPDX migration From 56707e49b65b87c22f2b2a0f8406c08039d196fc Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 24 Oct 2023 09:22:23 +0200 Subject: [PATCH 06/17] Update to texinfo-7.1 Signed-off-by: Vitezslav Crhonek --- .gitignore | 4 +- sources | 4 +- ...o-use-create-tmp-then-rename-pattern.patch | 44 ------------------- texinfo-6.5-covscan-fixes.patch | 27 ++++-------- texinfo-7.0.2-undef-val-array-ref.patch | 11 ----- texinfo.spec | 24 +++++----- 6 files changed, 24 insertions(+), 90 deletions(-) delete mode 100644 texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch delete mode 100644 texinfo-7.0.2-undef-val-array-ref.patch diff --git a/.gitignore b/.gitignore index 21ee2c2..1668fe6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/texinfo-7.0.3.tar.xz -/texinfo-7.0.3.tar.xz.sig +/texinfo-7.1.tar.xz +/texinfo-7.1.tar.xz.sig diff --git a/sources b/sources index e40032c..4af3644 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-7.0.3.tar.xz) = 7d14f7458f2b7d0ee0b740e00a5fc2a9d61d33811aa5905d649875ec518dcb4f01be46fb0c46748f7dfe36950597a852f1473ab0648d5add225bc8f35528a8ff -SHA512 (texinfo-7.0.3.tar.xz.sig) = 7d8d674d6903e146a19a99b5ee178fdc2cb6c93931f31439a3fe650c664cf308841937243b18b81f463b6fb264fdaf8134fdc81e023da46919bf93ae58ed5550 +SHA512 (texinfo-7.1.tar.xz) = ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db +SHA512 (texinfo-7.1.tar.xz.sig) = 2e2f19a783e57f425afa11871e5cdaceacb79a7bc7389eaf2c3b0e0aba0b08e8afdbdf9e939e75c773f262eb22c351b0fc745604eac76d58f484196733da5130 diff --git a/texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch b/texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch deleted file mode 100644 index ab8e072..0000000 --- a/texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up texinfo-6.1/install-info/install-info.c.orig texinfo-6.1/install-info/install-info.c ---- texinfo-6.1/install-info/install-info.c.orig 2016-06-22 09:49:38.766013018 +0200 -+++ texinfo-6.1/install-info/install-info.c 2016-06-22 14:11:58.673780736 +0200 -@@ -973,18 +973,23 @@ output_dirfile (char *dirfile, int dir_n - int n_entries_added = 0; - int i; - FILE *output; -+ char *dirfile_tmp = NULL; -+ -+ asprintf (&dirfile_tmp, "%s.tmp", dirfile); -+ if (!dirfile_tmp) -+ xalloc_die (); - - if (compression_program) - { -- char *command = concat (compression_program, ">", dirfile); -+ char *command = concat (compression_program, ">", dirfile_tmp); - output = popen (command, "w"); - } - else -- output = fopen (dirfile, "w"); -+ output = fopen (dirfile_tmp, "w"); - - if (!output) - { -- perror (dirfile); -+ perror (dirfile_tmp); - exit (EXIT_FAILURE); - } - -@@ -1095,6 +1100,13 @@ output_dirfile (char *dirfile, int dir_n - pclose (output); - else - fclose (output); -+ -+ if (rename (dirfile_tmp, dirfile) < 0) -+ { -+ perror (dirfile_tmp); -+ exit (EXIT_FAILURE); -+ } -+ free (dirfile_tmp); - } - - /* Read through the input LINES, to find the section names and the diff --git a/texinfo-6.5-covscan-fixes.patch b/texinfo-6.5-covscan-fixes.patch index 63e5167..0a44df2 100644 --- a/texinfo-6.5-covscan-fixes.patch +++ b/texinfo-6.5-covscan-fixes.patch @@ -1,7 +1,7 @@ -diff -up texinfo-6.7.90/info/infomap.c.orig texinfo-6.7.90/info/infomap.c ---- texinfo-6.7.90/info/infomap.c.orig 2019-12-01 12:26:46.000000000 +0100 -+++ texinfo-6.7.90/info/infomap.c 2021-02-24 12:56:06.865568572 +0100 -@@ -589,6 +589,7 @@ fetch_user_maps (char *init_file) +diff -up texinfo-7.0.92/info/infomap.c.orig texinfo-7.0.92/info/infomap.c +--- texinfo-7.0.92/info/infomap.c.orig 2023-09-14 13:19:30.417330487 +0200 ++++ texinfo-7.0.92/info/infomap.c 2023-09-14 13:19:55.870353408 +0200 +@@ -590,6 +590,7 @@ fetch_user_maps (char *init_file) compile (inf, filename, &sup_info, &sup_ea); free (filename); @@ -9,9 +9,9 @@ diff -up texinfo-6.7.90/info/infomap.c.orig texinfo-6.7.90/info/infomap.c return 1; } -diff -up texinfo-6.7.90/info/variables.c.orig texinfo-6.7.90/info/variables.c ---- texinfo-6.7.90/info/variables.c.orig 2021-02-24 13:00:21.056060523 +0100 -+++ texinfo-6.7.90/info/variables.c 2021-02-24 13:36:27.089318922 +0100 +diff -up texinfo-7.0.92/info/variables.c.orig texinfo-7.0.92/info/variables.c +--- texinfo-7.0.92/info/variables.c.orig 2023-09-14 13:20:14.464370153 +0200 ++++ texinfo-7.0.92/info/variables.c 2023-09-14 13:21:00.343411464 +0200 @@ -359,6 +359,7 @@ read_variable_name (char *prompt, WINDOW { char *line; @@ -31,15 +31,4 @@ diff -up texinfo-6.7.90/info/variables.c.orig texinfo-6.7.90/info/variables.c } /* Make an array of REFERENCE which actually contains the names of the -diff -up texinfo-6.7.90/install-info/install-info.c.orig texinfo-6.7.90/install-info/install-info.c ---- texinfo-6.7.90/install-info/install-info.c.orig 2021-02-24 13:36:42.839472560 +0100 -+++ texinfo-6.7.90/install-info/install-info.c 2021-02-24 13:41:36.219280631 +0100 -@@ -1717,6 +1728,8 @@ reformat_new_entries (struct spec_entry - - format_entry (name, name_len, desc, desc_len, calign, align, - maxwidth, &entry->text, &entry->text_len); -+ free (desc); -+ free (name); - } - } - +diff -up texinfo-7.0.92/install-info/install-info.c.orig texinfo-7.0.92/install-info/install-info.c diff --git a/texinfo-7.0.2-undef-val-array-ref.patch b/texinfo-7.0.2-undef-val-array-ref.patch deleted file mode 100644 index 0710efd..0000000 --- a/texinfo-7.0.2-undef-val-array-ref.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm.orig texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm ---- texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm.orig 2023-01-22 11:42:42.000000000 +0100 -+++ texinfo-7.0.2/tp/Texinfo/ParserNonXS.pm 2023-02-22 12:22:13.711852621 +0100 -@@ -4357,6 +4357,7 @@ sub _process_remaining_on_line($$$$) - and ($current->{'parent'}->{'type'} eq 'menu_comment' - or $current->{'parent'}->{'type'} eq 'menu_entry_description') - and $asterisk -+ and $current->{'contents'} - and @{$current->{'contents'}} - and $current->{'contents'}->[-1]->{'type'} - and $current->{'contents'}->[-1]->{'type'} eq 'empty_line' diff --git a/texinfo.spec b/texinfo.spec index 5335320..c49ab73 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -2,23 +2,19 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 7.0.3 -Release: 3%{?dist} +Version: 7.1 +Release: 1%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz Source1: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz.sig Source2: fix-info-dir -# Patch0: rhbz#1348671, because of OSTree -Patch0: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch -# Patch1: we need to fix template fix-info-dir generates -Patch1: info-6.5-sync-fix-info-dir.patch -# Patch2: rhbz#1592433, bug in fix-info-dir --delete -Patch2: texinfo-6.5-fix-info-dir.patch -# Patch3: fixes issues detected by static analysis -Patch3: texinfo-6.5-covscan-fixes.patch -# Patch4: fixes possible use of an undefined value as an ARRAY reference in ParserNonXS.pm -Patch4: texinfo-7.0.2-undef-val-array-ref.patch +# Patch0: we need to fix template fix-info-dir generates +Patch0: info-6.5-sync-fix-info-dir.patch +# Patch1: rhbz#1592433, bug in fix-info-dir --delete +Patch1: texinfo-6.5-fix-info-dir.patch +# Patch2: fixes issues detected by static analysis +Patch2: texinfo-6.5-covscan-fixes.patch BuildRequires: make BuildRequires: gcc @@ -152,6 +148,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Tue Oct 24 2023 Vitezslav Crhonek - 7.1-1 +- Update to texinfo-7.1 + Resolves: #2244846 + * Sat Jul 22 2023 Fedora Release Engineering - 7.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e43e3b3dd9045742ca07509e78eb8add4dafd346 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 05:55:57 +0000 Subject: [PATCH 07/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- texinfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texinfo.spec b/texinfo.spec index c49ab73..a654c16 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -148,6 +148,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Oct 24 2023 Vitezslav Crhonek - 7.1-1 - Update to texinfo-7.1 Resolves: #2244846 From a99e323a2245cecd34aefe82fcfec3411fed3adc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:19:47 +0000 Subject: [PATCH 08/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- texinfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texinfo.spec b/texinfo.spec index a654c16..2dc97b0 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -148,6 +148,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 04632db8b9f4f51d2abae246eb9b760616cd6d0f Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 9 Sep 2024 11:58:54 +0200 Subject: [PATCH 09/17] Update to texinfo-7.1.1 Signed-off-by: Vitezslav Crhonek --- .gitignore | 4 ++-- sources | 4 ++-- texinfo.spec | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1668fe6..5cc4abd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/texinfo-7.1.tar.xz -/texinfo-7.1.tar.xz.sig +/texinfo-7.1.1.tar.xz +/texinfo-7.1.1.tar.xz.sig diff --git a/sources b/sources index 4af3644..c5d417c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-7.1.tar.xz) = ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db -SHA512 (texinfo-7.1.tar.xz.sig) = 2e2f19a783e57f425afa11871e5cdaceacb79a7bc7389eaf2c3b0e0aba0b08e8afdbdf9e939e75c773f262eb22c351b0fc745604eac76d58f484196733da5130 +SHA512 (texinfo-7.1.1.tar.xz) = 05d605fba810f2939cab16ed5ddb341e22d397370648e6e0271c807fa573267e933c75ed7ae682c3c9cfecb568311a8df7abeb8c0556a94ef7169737d5b9c52a +SHA512 (texinfo-7.1.1.tar.xz.sig) = f2ab2c7bf8e9eb4fb98208c5e2bca916d4ae153e0c3fa57f0198eda156fe68ed382785761e7842decb39ffc0796b3711a9ea06face218e41c6905d45169263f7 diff --git a/texinfo.spec b/texinfo.spec index 2dc97b0..447b912 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -2,8 +2,8 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 7.1 -Release: 3%{?dist} +Version: 7.1.1 +Release: 1%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -148,6 +148,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Mon Sep 09 2024 Vitezslav Crhonek - 7.1.1-1 +- Update to texinfo-7.1.1 + Resolves: #2310652 + * Sat Jul 20 2024 Fedora Release Engineering - 7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 2e1f29c4328a5d3014c213872d0d0daef8961b76 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 15 Oct 2024 09:22:51 +0200 Subject: [PATCH 10/17] Fix issues detected by static analysis Signed-off-by: Vitezslav Crhonek --- texinfo-7.1-make-tainted-data-safe.patch | 12 ++ texinfo-7.1-various-sast-fixes.patch | 150 +++++++++++++++++++++++ texinfo.spec | 9 +- 3 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 texinfo-7.1-make-tainted-data-safe.patch create mode 100644 texinfo-7.1-various-sast-fixes.patch diff --git a/texinfo-7.1-make-tainted-data-safe.patch b/texinfo-7.1-make-tainted-data-safe.patch new file mode 100644 index 0000000..aafae60 --- /dev/null +++ b/texinfo-7.1-make-tainted-data-safe.patch @@ -0,0 +1,12 @@ +diff -up texinfo-7.1/info/makedoc.c.orig texinfo-7.1/info/makedoc.c +--- texinfo-7.1/info/makedoc.c.orig 2023-08-14 20:53:20.000000000 +0200 ++++ texinfo-7.1/info/makedoc.c 2024-10-09 10:13:13.476369921 +0200 +@@ -296,7 +296,7 @@ process_one_file (char *filename, FILE * + char *func, *doc; + char *func_name; + +- for (; offset < (file_size - decl_len); offset++) ++ for (; offset < (file_size - decl_len) && offset < (LONG_MAX - decl_len); offset++) + { + if (buffer[offset] == '\n') + { diff --git a/texinfo-7.1-various-sast-fixes.patch b/texinfo-7.1-various-sast-fixes.patch new file mode 100644 index 0000000..fb393ac --- /dev/null +++ b/texinfo-7.1-various-sast-fixes.patch @@ -0,0 +1,150 @@ +diff -up texinfo-7.1/info/filesys.c.orig texinfo-7.1/info/filesys.c +diff -up texinfo-7.1/info/infokey.c.orig texinfo-7.1/info/infokey.c +--- texinfo-7.1/info/infokey.c.orig 2023-08-14 20:53:20.000000000 +0200 ++++ texinfo-7.1/info/infokey.c 2024-08-07 12:12:04.651748655 +0200 +@@ -208,7 +208,7 @@ compile (FILE *fp, const char *filename, + char oval = 0; + char comment[10]; + unsigned int clen = 0; +- int seq[20]; ++ int seq[20] = { 0 }; + unsigned int slen = 0; + char act[80]; + unsigned int alen = 0; +diff -up texinfo-7.1/info/session.c.orig texinfo-7.1/info/session.c +--- texinfo-7.1/info/session.c.orig 2023-08-15 14:52:09.000000000 +0200 ++++ texinfo-7.1/info/session.c 2024-08-08 13:14:28.320463664 +0200 +@@ -2335,7 +2335,7 @@ info_menu_or_ref_item (WINDOW *window, i + if (defentry) + { + prompt = xmalloc (strlen (defentry->label) +- + strlen (_("Menu item (%s): "))); ++ + strlen (_("Menu item (%s): ")) + 1); + sprintf (prompt, _("Menu item (%s): "), defentry->label); + } + else +@@ -2346,7 +2346,7 @@ info_menu_or_ref_item (WINDOW *window, i + if (defentry) + { + prompt = xmalloc (strlen (defentry->label) +- + strlen (_("Follow xref (%s): "))); ++ + strlen (_("Follow xref (%s): ")) + 1); + sprintf (prompt, _("Follow xref (%s): "), defentry->label); + } + else +@@ -2923,7 +2923,7 @@ DECLARE_INFO_COMMAND (info_menu_sequence + static int + info_handle_pointer (char *label, WINDOW *window) + { +- char *description; ++ char *description = NULL; + NODE *node; + + if (!strcmp (label, "Up")) +@@ -3480,7 +3480,7 @@ info_intuit_options_node (NODE *node, ch + { + char *nodename; + +- nodename = xmalloc (strlen (program) + strlen (*try_node)); ++ nodename = xmalloc (strlen (program) + strlen (*try_node) + 1); + sprintf (nodename, *try_node, program); + /* The last resort "%s" is dangerous, so we restrict it + to exact matches here. */ +@@ -3556,7 +3556,7 @@ DECLARE_INFO_COMMAND (info_goto_invocati + default_program_name = program_name_from_file_name (file_name); + + prompt = xmalloc (strlen (default_program_name) + +- strlen (invocation_prompt)); ++ strlen (invocation_prompt) + 1); + sprintf (prompt, invocation_prompt, default_program_name); + line = info_read_in_echo_area (prompt); + free (prompt); +diff -up texinfo-7.1/info/util.c.orig texinfo-7.1/info/util.c +--- texinfo-7.1/info/util.c.orig 2023-08-14 20:53:20.000000000 +0200 ++++ texinfo-7.1/info/util.c 2024-08-07 12:12:04.656748661 +0200 +@@ -34,9 +34,12 @@ xvasprintf (char **ptr, const char *temp + int + xasprintf (char **ptr, const char *template, ...) + { ++ int ret; + va_list v; + va_start (v, template); +- return xvasprintf (ptr, template, v); ++ ret = xvasprintf (ptr, template, v); ++ va_end (v); ++ return ret; + } + + /* Return the file buffer which belongs to WINDOW's node. */ +diff -up texinfo-7.1/install-info/install-info.c.orig texinfo-7.1/install-info/install-info.c +--- texinfo-7.1/install-info/install-info.c.orig 2023-10-08 17:57:24.000000000 +0200 ++++ texinfo-7.1/install-info/install-info.c 2024-08-07 12:12:04.657748663 +0200 +@@ -752,11 +752,15 @@ open_possibly_compressed_file (char *fil + return 0; + nread = fread (data, sizeof (data), 1, f); + if (nread == 0) +- return 0; ++ { ++ fclose (f); ++ return 0; ++ } + goto determine_file_type; /* success */ + } + } + errno = 0; ++ fclose (f); + return 0; /* unknown error */ + } + +@@ -829,10 +833,16 @@ determine_file_type: + FILE *f2; + + if (fclose (f) < 0) +- return 0; ++ { ++ free (command); ++ return 0; ++ } + f2 = freopen (*opened_filename, FOPEN_RBIN, stdin); + if (!f) +- return 0; ++ { ++ fclose (f2); ++ return 0; ++ } + f = popen (command, "r"); + fclose (f2); + if (!f) +@@ -854,7 +864,10 @@ determine_file_type: + #else + /* Seek back over the magic bytes. */ + if (fseek (f, 0, 0) < 0) +- return 0; ++ { ++ fclose (f); ++ return 0; ++ } + #endif + } + +@@ -885,7 +898,10 @@ readfile (char *filename, int *sizep, + compression_program); + + if (!f) +- return 0; ++ { ++ free (data); ++ return 0; ++ } + + for (;;) + { +@@ -1836,7 +1852,7 @@ munge_old_style_debian_options (int argc + int *new_argc, char ***new_argv) + { + char *opt = NULL; +- int i, err; ++ int i, err = 0; + char *argz = NULL; + size_t argz_len = 0; + const char *regex, *title; diff --git a/texinfo.spec b/texinfo.spec index 447b912..e0cd174 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -15,6 +15,10 @@ Patch0: info-6.5-sync-fix-info-dir.patch Patch1: texinfo-6.5-fix-info-dir.patch # Patch2: fixes issues detected by static analysis Patch2: texinfo-6.5-covscan-fixes.patch +# Patch3: fixes issues detected by static analysis +Patch3: texinfo-7.1-various-sast-fixes.patch +# Patch4: fixes issues detected by static analysis +Patch4: texinfo-7.1-make-tainted-data-safe.patch BuildRequires: make BuildRequires: gcc @@ -148,6 +152,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Tue Oct 15 2024 Vitezslav Crhonek - 7.1.1-2 +- Another batch of fixes for issues detected by static analysis + * Mon Sep 09 2024 Vitezslav Crhonek - 7.1.1-1 - Update to texinfo-7.1.1 Resolves: #2310652 From 55682634ce5cdebfbcbc7bcf8bdfba52806eaa53 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 13 Jan 2025 09:36:02 +0100 Subject: [PATCH 11/17] Update to texinfo-7.2 Signed-off-by: Vitezslav Crhonek --- .gitignore | 2 + sources | 4 +- texinfo-6.5-covscan-fixes.patch | 34 ------- texinfo-7.1-various-sast-fixes.patch | 146 ++------------------------- texinfo.spec | 11 +- 5 files changed, 22 insertions(+), 175 deletions(-) delete mode 100644 texinfo-6.5-covscan-fixes.patch diff --git a/.gitignore b/.gitignore index 5cc4abd..b40ef00 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /texinfo-7.1.1.tar.xz /texinfo-7.1.1.tar.xz.sig +/texinfo-7.2.tar.xz +/texinfo-7.2.tar.xz.sig diff --git a/sources b/sources index c5d417c..aa3d69e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-7.1.1.tar.xz) = 05d605fba810f2939cab16ed5ddb341e22d397370648e6e0271c807fa573267e933c75ed7ae682c3c9cfecb568311a8df7abeb8c0556a94ef7169737d5b9c52a -SHA512 (texinfo-7.1.1.tar.xz.sig) = f2ab2c7bf8e9eb4fb98208c5e2bca916d4ae153e0c3fa57f0198eda156fe68ed382785761e7842decb39ffc0796b3711a9ea06face218e41c6905d45169263f7 +SHA512 (texinfo-7.2.tar.xz) = 8e67337ae12a552fc620c43725507a4978710ea6630e98b0f5e98eb3f79a90e191dde5225699aa6217c26f171d277461f76150f0459cd07b40c3234d2f3d89bf +SHA512 (texinfo-7.2.tar.xz.sig) = fcb5bcf655e16f8994b33242516cff7f5dc6684555c889fee4a4e5b01cbc9c8163d6ea5c77722b2bb8d6f65120650de4daff027bee135d1c29f82316211d8fb4 diff --git a/texinfo-6.5-covscan-fixes.patch b/texinfo-6.5-covscan-fixes.patch deleted file mode 100644 index 0a44df2..0000000 --- a/texinfo-6.5-covscan-fixes.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up texinfo-7.0.92/info/infomap.c.orig texinfo-7.0.92/info/infomap.c ---- texinfo-7.0.92/info/infomap.c.orig 2023-09-14 13:19:30.417330487 +0200 -+++ texinfo-7.0.92/info/infomap.c 2023-09-14 13:19:55.870353408 +0200 -@@ -590,6 +590,7 @@ fetch_user_maps (char *init_file) - compile (inf, filename, &sup_info, &sup_ea); - - free (filename); -+ fclose (inf); - return 1; - } - -diff -up texinfo-7.0.92/info/variables.c.orig texinfo-7.0.92/info/variables.c ---- texinfo-7.0.92/info/variables.c.orig 2023-09-14 13:20:14.464370153 +0200 -+++ texinfo-7.0.92/info/variables.c 2023-09-14 13:21:00.343411464 +0200 -@@ -359,6 +359,7 @@ read_variable_name (char *prompt, WINDOW - { - char *line; - REFERENCE **variables; -+ VARIABLE_ALIST *alist; - - /* Get the completion array of variable names. */ - variables = make_variable_completions_array (); -@@ -382,7 +383,9 @@ read_variable_name (char *prompt, WINDOW - return NULL; - } - -- return variable_by_name (line); -+ alist = variable_by_name (line); -+ free (line); -+ return alist; - } - - /* Make an array of REFERENCE which actually contains the names of the -diff -up texinfo-7.0.92/install-info/install-info.c.orig texinfo-7.0.92/install-info/install-info.c diff --git a/texinfo-7.1-various-sast-fixes.patch b/texinfo-7.1-various-sast-fixes.patch index fb393ac..77c912b 100644 --- a/texinfo-7.1-various-sast-fixes.patch +++ b/texinfo-7.1-various-sast-fixes.patch @@ -1,9 +1,8 @@ -diff -up texinfo-7.1/info/filesys.c.orig texinfo-7.1/info/filesys.c -diff -up texinfo-7.1/info/infokey.c.orig texinfo-7.1/info/infokey.c ---- texinfo-7.1/info/infokey.c.orig 2023-08-14 20:53:20.000000000 +0200 -+++ texinfo-7.1/info/infokey.c 2024-08-07 12:12:04.651748655 +0200 +diff -up texinfo-7.1.90/info/infokey.c.orig texinfo-7.1.90/info/infokey.c +--- texinfo-7.1.90/info/infokey.c.orig 2024-10-21 14:26:11.000000000 +0200 ++++ texinfo-7.1.90/info/infokey.c 2024-11-07 12:55:41.197343929 +0100 @@ -208,7 +208,7 @@ compile (FILE *fp, const char *filename, - char oval = 0; + int oval = 0; char comment[10]; unsigned int clen = 0; - int seq[20]; @@ -11,140 +10,17 @@ diff -up texinfo-7.1/info/infokey.c.orig texinfo-7.1/info/infokey.c unsigned int slen = 0; char act[80]; unsigned int alen = 0; -diff -up texinfo-7.1/info/session.c.orig texinfo-7.1/info/session.c ---- texinfo-7.1/info/session.c.orig 2023-08-15 14:52:09.000000000 +0200 -+++ texinfo-7.1/info/session.c 2024-08-08 13:14:28.320463664 +0200 -@@ -2335,7 +2335,7 @@ info_menu_or_ref_item (WINDOW *window, i - if (defentry) - { - prompt = xmalloc (strlen (defentry->label) -- + strlen (_("Menu item (%s): "))); -+ + strlen (_("Menu item (%s): ")) + 1); - sprintf (prompt, _("Menu item (%s): "), defentry->label); - } - else -@@ -2346,7 +2346,7 @@ info_menu_or_ref_item (WINDOW *window, i - if (defentry) - { - prompt = xmalloc (strlen (defentry->label) -- + strlen (_("Follow xref (%s): "))); -+ + strlen (_("Follow xref (%s): ")) + 1); - sprintf (prompt, _("Follow xref (%s): "), defentry->label); - } - else -@@ -2923,7 +2923,7 @@ DECLARE_INFO_COMMAND (info_menu_sequence +diff -up texinfo-7.1.90/info/session.c.orig texinfo-7.1.90/info/session.c +--- texinfo-7.1.90/info/session.c.orig 2024-10-21 14:26:11.000000000 +0200 ++++ texinfo-7.1.90/info/session.c 2024-11-07 12:59:30.401861317 +0100 +@@ -2941,7 +2941,7 @@ DECLARE_INFO_COMMAND (info_menu_sequence static int - info_handle_pointer (char *label, WINDOW *window) + info_handle_pointer (const char *label, WINDOW *window) { - char *description; + char *description = NULL; NODE *node; if (!strcmp (label, "Up")) -@@ -3480,7 +3480,7 @@ info_intuit_options_node (NODE *node, ch - { - char *nodename; - -- nodename = xmalloc (strlen (program) + strlen (*try_node)); -+ nodename = xmalloc (strlen (program) + strlen (*try_node) + 1); - sprintf (nodename, *try_node, program); - /* The last resort "%s" is dangerous, so we restrict it - to exact matches here. */ -@@ -3556,7 +3556,7 @@ DECLARE_INFO_COMMAND (info_goto_invocati - default_program_name = program_name_from_file_name (file_name); - - prompt = xmalloc (strlen (default_program_name) + -- strlen (invocation_prompt)); -+ strlen (invocation_prompt) + 1); - sprintf (prompt, invocation_prompt, default_program_name); - line = info_read_in_echo_area (prompt); - free (prompt); -diff -up texinfo-7.1/info/util.c.orig texinfo-7.1/info/util.c ---- texinfo-7.1/info/util.c.orig 2023-08-14 20:53:20.000000000 +0200 -+++ texinfo-7.1/info/util.c 2024-08-07 12:12:04.656748661 +0200 -@@ -34,9 +34,12 @@ xvasprintf (char **ptr, const char *temp - int - xasprintf (char **ptr, const char *template, ...) - { -+ int ret; - va_list v; - va_start (v, template); -- return xvasprintf (ptr, template, v); -+ ret = xvasprintf (ptr, template, v); -+ va_end (v); -+ return ret; - } - - /* Return the file buffer which belongs to WINDOW's node. */ -diff -up texinfo-7.1/install-info/install-info.c.orig texinfo-7.1/install-info/install-info.c ---- texinfo-7.1/install-info/install-info.c.orig 2023-10-08 17:57:24.000000000 +0200 -+++ texinfo-7.1/install-info/install-info.c 2024-08-07 12:12:04.657748663 +0200 -@@ -752,11 +752,15 @@ open_possibly_compressed_file (char *fil - return 0; - nread = fread (data, sizeof (data), 1, f); - if (nread == 0) -- return 0; -+ { -+ fclose (f); -+ return 0; -+ } - goto determine_file_type; /* success */ - } - } - errno = 0; -+ fclose (f); - return 0; /* unknown error */ - } - -@@ -829,10 +833,16 @@ determine_file_type: - FILE *f2; - - if (fclose (f) < 0) -- return 0; -+ { -+ free (command); -+ return 0; -+ } - f2 = freopen (*opened_filename, FOPEN_RBIN, stdin); - if (!f) -- return 0; -+ { -+ fclose (f2); -+ return 0; -+ } - f = popen (command, "r"); - fclose (f2); - if (!f) -@@ -854,7 +864,10 @@ determine_file_type: - #else - /* Seek back over the magic bytes. */ - if (fseek (f, 0, 0) < 0) -- return 0; -+ { -+ fclose (f); -+ return 0; -+ } - #endif - } - -@@ -885,7 +898,10 @@ readfile (char *filename, int *sizep, - compression_program); - - if (!f) -- return 0; -+ { -+ free (data); -+ return 0; -+ } - - for (;;) - { -@@ -1836,7 +1852,7 @@ munge_old_style_debian_options (int argc - int *new_argc, char ***new_argv) - { - char *opt = NULL; -- int i, err; -+ int i, err = 0; - char *argz = NULL; - size_t argz_len = 0; - const char *regex, *title; +diff -up texinfo-7.1.90/info/util.c.orig texinfo-7.1.90/info/util.c +diff -up texinfo-7.1.90/install-info/install-info.c.orig texinfo-7.1.90/install-info/install-info.c diff --git a/texinfo.spec b/texinfo.spec index e0cd174..5ae5595 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -2,8 +2,8 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 7.1.1 -Release: 2%{?dist} +Version: 7.2 +Release: 1%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -13,8 +13,6 @@ Source2: fix-info-dir Patch0: info-6.5-sync-fix-info-dir.patch # Patch1: rhbz#1592433, bug in fix-info-dir --delete Patch1: texinfo-6.5-fix-info-dir.patch -# Patch2: fixes issues detected by static analysis -Patch2: texinfo-6.5-covscan-fixes.patch # Patch3: fixes issues detected by static analysis Patch3: texinfo-7.1-various-sast-fixes.patch # Patch4: fixes issues detected by static analysis @@ -120,6 +118,7 @@ export ALL_TESTS=yes %{_bindir}/texi2any %{_bindir}/pod2texi %{_datadir}/texinfo +%{_datadir}/texi2any %{_infodir}/texinfo* %{_infodir}/texi2any_api.info* %{_infodir}/texi2any_internals.info* @@ -152,6 +151,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Mon Jan 13 2025 Vitezslav Crhonek - 7.2-1 +- Update to texinfo-7.2 + Resolves: #2333829 + * Tue Oct 15 2024 Vitezslav Crhonek - 7.1.1-2 - Another batch of fixes for issues detected by static analysis From dffc9f353a5252017463e8667184064b022a59b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:40:20 +0000 Subject: [PATCH 12/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- texinfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texinfo.spec b/texinfo.spec index 5ae5595..43a0314 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -151,6 +151,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jan 13 2025 Vitezslav Crhonek - 7.2-1 - Update to texinfo-7.2 Resolves: #2333829 From e1f18ab48369359a68239a94bccd0f809270c6d6 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 21 Jan 2025 14:29:06 +0100 Subject: [PATCH 13/17] Changes related to bin and sbin unify --- texinfo.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/texinfo.spec b/texinfo.spec index 43a0314..514facc 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -79,15 +79,10 @@ install -Dpm0755 -t contrib %{SOURCE2} %make_build %install -mkdir -p ${RPM_BUILD_ROOT}/sbin - %make_install -mkdir -p $RPM_BUILD_ROOT%{tex_texinfo} -install -p -m644 doc/texinfo.tex doc/txi-??.tex $RPM_BUILD_ROOT%{tex_texinfo} - -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT%{_sbindir} +mkdir -p %{buildroot}%{tex_texinfo} +install -p -m644 doc/texinfo.tex doc/txi-??.tex %{buildroot}%{tex_texinfo} install -Dpm0755 -t %{buildroot}%{_sbindir} contrib/fix-info-dir @@ -151,6 +146,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Tue Jan 21 2025 Vitezslav Crhonek - 7.2-3 +- Changes related to bin and sbin unify + * Sun Jan 19 2025 Fedora Release Engineering - 7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 508f1432798166fe58d8ae85efdd688e06f79296 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 25 Jun 2025 10:47:47 +0200 Subject: [PATCH 14/17] Fix texi2dvi missing dependencies --- texinfo.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/texinfo.spec b/texinfo.spec index 514facc..58ffb72 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -51,6 +51,8 @@ browser program for viewing texinfo files. Summary: Tools for formatting Texinfo documentation files using TeX Requires: texinfo = %{version}-%{release} Requires: tex(tex) tex(epsf.tex) +Requires: /usr/bin/cmp +Requires: /usr/bin/diff Requires(post): %{_bindir}/texconfig-sys Requires(postun): %{_bindir}/texconfig-sys Provides: tex-texinfo @@ -146,6 +148,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Wed Jun 25 2025 Vitezslav Crhonek - 7.2-4 +- Fix texi2dvi missing dependencies + Resolves: #2374602 + * Tue Jan 21 2025 Vitezslav Crhonek - 7.2-3 - Changes related to bin and sbin unify From 2b9718590d76190a2978a77f7ca03ef81d275246 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:13:48 +0000 Subject: [PATCH 15/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- texinfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texinfo.spec b/texinfo.spec index 58ffb72..9cc7d97 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -148,6 +148,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 7.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jun 25 2025 Vitezslav Crhonek - 7.2-4 - Fix texi2dvi missing dependencies Resolves: #2374602 From 1e6c5556863fbe408a56dd0e60dff245b977bdc9 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Fri, 1 Aug 2025 10:54:28 +0200 Subject: [PATCH 16/17] Fix FTBFS --- ...nfo-7.2-fix-perl-precedence-warnings.patch | 24 +++++++++++++++++++ texinfo.spec | 8 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 texinfo-7.2-fix-perl-precedence-warnings.patch diff --git a/texinfo-7.2-fix-perl-precedence-warnings.patch b/texinfo-7.2-fix-perl-precedence-warnings.patch new file mode 100644 index 0000000..e2a29cb --- /dev/null +++ b/texinfo-7.2-fix-perl-precedence-warnings.patch @@ -0,0 +1,24 @@ +diff -up texinfo-7.2/tp/Texinfo/Convert/Converter.pm.orig texinfo-7.2/tp/Texinfo/Convert/Converter.pm +--- texinfo-7.2/tp/Texinfo/Convert/Converter.pm.orig 2024-12-19 19:31:42.000000000 +0100 ++++ texinfo-7.2/tp/Texinfo/Convert/Converter.pm 2025-08-01 10:31:55.845929864 +0200 +@@ -386,7 +386,7 @@ sub output_tree($$) + + my $fh; + my $encoded_output_file; +- if (! $output_file eq '') { ++ if ($output_file ne '') { + my $path_encoding; + ($encoded_output_file, $path_encoding) + = $self->encoded_output_file_name($output_file); +diff -up texinfo-7.2/tp/Texinfo/Convert/LaTeX.pm.orig texinfo-7.2/tp/Texinfo/Convert/LaTeX.pm +--- texinfo-7.2/tp/Texinfo/Convert/LaTeX.pm.orig 2024-12-19 19:31:42.000000000 +0100 ++++ texinfo-7.2/tp/Texinfo/Convert/LaTeX.pm 2025-08-01 10:32:57.790836873 +0200 +@@ -1085,7 +1085,7 @@ sub output($$) + + my $fh; + my $encoded_output_file; +- if (! $output_file eq '') { ++ if ($output_file ne '') { + my $path_encoding; + ($encoded_output_file, $path_encoding) + = $self->encoded_output_file_name($output_file); diff --git a/texinfo.spec b/texinfo.spec index 9cc7d97..c562655 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -17,6 +17,8 @@ Patch1: texinfo-6.5-fix-info-dir.patch Patch3: texinfo-7.1-various-sast-fixes.patch # Patch4: fixes issues detected by static analysis Patch4: texinfo-7.1-make-tainted-data-safe.patch +# Patch5: fixes Perl precedence warnings (already upstream) +Patch5: texinfo-7.2-fix-perl-precedence-warnings.patch BuildRequires: make BuildRequires: gcc @@ -148,6 +150,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Fri Aug 01 2025 Vitezslav Crhonek - 7.2-6 +- Fix FTBFS (Perl precedence warnings) + Resolves: #2385687 + * Fri Jul 25 2025 Fedora Release Engineering - 7.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2c26ac87e6179d5f03ce2dfdd68beb306e00df92 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 29 Nov 2025 00:39:21 -0500 Subject: [PATCH 17/17] Add patch to support zstd compressed info pages --- texinfo-6.7-zstd-compression.patch | 69 ++++++++++++++++++++++++++++++ texinfo.spec | 7 ++- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 texinfo-6.7-zstd-compression.patch diff --git a/texinfo-6.7-zstd-compression.patch b/texinfo-6.7-zstd-compression.patch new file mode 100644 index 0000000..a08a454 --- /dev/null +++ b/texinfo-6.7-zstd-compression.patch @@ -0,0 +1,69 @@ +diff -up texinfo-6.7/info/filesys.c.omv~ texinfo-6.7/info/filesys.c +--- texinfo-6.7/info/filesys.c.omv~ 2020-01-05 02:24:32.094858726 +0100 ++++ texinfo-6.7/info/filesys.c 2020-01-05 02:25:59.789854472 +0100 +@@ -58,9 +58,11 @@ static COMPRESSION_ALIST compress_suffix + #if STRIP_DOT_EXE + { ".gz", "gunzip" }, + { ".lz", "lunzip" }, ++ { ".zst", "unzstd" }, + #else + { ".gz", "gzip -d" }, + { ".lz", "lzip -d" }, ++ { ".zst", "zstd -d" }, + #endif + { ".xz", "unxz" }, + { ".bz2", "bunzip2" }, +diff -up texinfo-6.7/install-info/install-info.c.omv~ texinfo-6.7/install-info/install-info.c +--- texinfo-6.7/install-info/install-info.c.omv~ 2020-01-05 02:20:38.837870043 +0100 ++++ texinfo-6.7/install-info/install-info.c 2020-01-05 02:24:03.029860136 +0100 +@@ -451,6 +451,16 @@ strip_info_suffix (char *fname) + len -= 4; + ret[len] = 0; + } ++ else if (len > 4 && FILENAME_CMP (ret + len - 4, ".zst") == 0) ++ { ++ len -= 4; ++ ret[len] = 0; ++ } ++ else if (len > 5 && FILENAME_CMP (ret + len - 5, ".zstd") == 0) ++ { ++ len -= 5; ++ ret[len] = 0; ++ } + #ifdef __MSDOS__ + else if (len > 4 && (FILENAME_CMP (ret + len - 4, ".inz") == 0 + || FILENAME_CMP (ret + len - 4, ".igz") == 0)) +@@ -727,6 +737,18 @@ open_possibly_compressed_file (char *fil + *opened_filename = concat (filename, ".lzma", ""); + f = fopen (*opened_filename, FOPEN_RBIN); + } ++ if (!f) ++ { ++ free (*opened_filename); ++ *opened_filename = concat (filename, ".zst", ""); ++ f = fopen (*opened_filename, FOPEN_RBIN); ++ } ++ if (!f) ++ { ++ free (*opened_filename); ++ *opened_filename = concat (filename, ".zstd", ""); ++ f = fopen (*opened_filename, FOPEN_RBIN); ++ } + #ifdef __MSDOS__ + if (!f) + { +@@ -850,6 +872,14 @@ determine_file_type: + *compression_program = "lzma"; + #endif + ++ else if (data[0] == 0x28 && data[1] == 0xb5 && data[2] == 0x2f ++ && data[3] == 0xfd) ++#ifndef STRIP_DOT_EXE ++ *compression_program = "zstd.exe"; ++#else ++ *compression_program = "zstd"; ++#endif ++ + else + *compression_program = NULL; + diff --git a/texinfo.spec b/texinfo.spec index c562655..719db85 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 7.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-3.0-or-later Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -19,6 +19,8 @@ Patch3: texinfo-7.1-various-sast-fixes.patch Patch4: texinfo-7.1-make-tainted-data-safe.patch # Patch5: fixes Perl precedence warnings (already upstream) Patch5: texinfo-7.2-fix-perl-precedence-warnings.patch +# Patch6: add support for zstd compression +Patch6: texinfo-6.7-zstd-compression.patch BuildRequires: make BuildRequires: gcc @@ -150,6 +152,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sat Nov 29 2025 Neal Gompa - 7.2-7 +- Add patch to support zstd compressed info pages + * Fri Aug 01 2025 Vitezslav Crhonek - 7.2-6 - Fix FTBFS (Perl precedence warnings) Resolves: #2385687