From c419aa4dff082194cbb90b27e55604f5072625cc Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 30 Mar 2018 21:14:09 -0400 Subject: [PATCH 01/48] update texinfo.tex --- texinfo-20180310-texinfo.tex.patch | 311 +++++++++++++++++++++++++++++ texinfo.spec | 7 +- 2 files changed, 317 insertions(+), 1 deletion(-) create mode 100644 texinfo-20180310-texinfo.tex.patch diff --git a/texinfo-20180310-texinfo.tex.patch b/texinfo-20180310-texinfo.tex.patch new file mode 100644 index 0000000..526fd22 --- /dev/null +++ b/texinfo-20180310-texinfo.tex.patch @@ -0,0 +1,311 @@ +diff -up texinfo-6.5/doc/texinfo.tex.old texinfo-6.5/doc/texinfo.tex +--- texinfo-6.5/doc/texinfo.tex.old 2017-08-27 05:21:32.000000000 -0400 ++++ texinfo-6.5/doc/texinfo.tex 2018-03-10 08:40:29.000000000 -0500 +@@ -3,11 +3,11 @@ + % Load plain if necessary, i.e., if running under initex. + \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi + % +-\def\texinfoversion{2017-08-23.19} ++\def\texinfoversion{2018-03-10.14} + % + % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, + % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +-% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 ++% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 + % Free Software Foundation, Inc. + % + % This texinfo.tex file is free software: you can redistribute it and/or +@@ -21,7 +21,7 @@ + % General Public License for more details. + % + % You should have received a copy of the GNU General Public License +-% along with this program. If not, see . ++% along with this program. If not, see . + % + % As a special exception, when this file is read by TeX when processing + % a Texinfo source document, you may use the result without +@@ -30,9 +30,9 @@ + % + % Please try the latest version of texinfo.tex before submitting bug + % reports; you can get the latest version from: +-% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or +-% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or +-% http://www.gnu.org/software/texinfo/ (the Texinfo home page) ++% https://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or ++% https://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or ++% https://www.gnu.org/software/texinfo/ (the Texinfo home page) + % The texinfo.tex in any given distribution could well be out + % of date, so if that's what you're using, please check. + % +@@ -56,7 +56,7 @@ + % extent. You can get the existing language-specific files from the + % full Texinfo distribution. + % +-% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. ++% The GNU Texinfo home page is https://www.gnu.org/software/texinfo. + + + \message{Loading texinfo [version \texinfoversion]:} +@@ -2235,6 +2235,20 @@ end + \font\smallersy=cmsy8 + \def\smallerecsize{0800} + ++% Fonts for math mode superscripts (7pt). ++\def\sevennominalsize{7pt} ++\setfont\sevenrm\rmshape{7}{1000}{OT1} ++\setfont\seventt\ttshape{10}{700}{OT1TT} ++\setfont\sevenbf\bfshape{10}{700}{OT1} ++\setfont\sevenit\itshape{7}{1000}{OT1IT} ++\setfont\sevensl\slshape{10}{700}{OT1} ++\setfont\sevensf\sfshape{10}{700}{OT1} ++\setfont\sevensc\scshape{10}{700}{OT1} ++\setfont\seventtsl\ttslshape{10}{700}{OT1TT} ++\font\seveni=cmmi7 ++\font\sevensy=cmsy7 ++\def\sevenecsize{0700} ++ + % Fonts for title page (20.4pt): + \def\titlenominalsize{20pt} + \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} +@@ -2369,6 +2383,20 @@ end + \font\smallersy=cmsy8 + \def\smallerecsize{0800} + ++% Fonts for math mode superscripts (7pt). ++\def\sevennominalsize{7pt} ++\setfont\sevenrm\rmshape{7}{1000}{OT1} ++\setfont\seventt\ttshape{10}{700}{OT1TT} ++\setfont\sevenbf\bfshape{10}{700}{OT1} ++\setfont\sevenit\itshape{7}{1000}{OT1IT} ++\setfont\sevensl\slshape{10}{700}{OT1} ++\setfont\sevensf\sfshape{10}{700}{OT1} ++\setfont\sevensc\scshape{10}{700}{OT1} ++\setfont\seventtsl\ttslshape{10}{700}{OT1TT} ++\font\seveni=cmmi7 ++\font\sevensy=cmsy7 ++\def\sevenecsize{0700} ++ + % Fonts for title page (20.4pt): + \def\titlenominalsize{20pt} + \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} +@@ -2503,13 +2531,20 @@ end + + + % In order for the font changes to affect most math symbols and letters, +-% we have to define the \textfont of the standard families. We don't +-% bother to reset \scriptfont and \scriptscriptfont; awaiting user need. ++% we have to define the \textfont of the standard families. ++% We don't bother to reset \scriptscriptfont; awaiting user need. + % + \def\resetmathfonts{% + \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont + \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont + \textfont\ttfam=\ttfont \textfont\sffam=\sffont ++ % ++ % Fonts for superscript. Note that the 7pt fonts are used regardless ++ % of the current font size. ++ \scriptfont0=\sevenrm \scriptfont1=\seveni \scriptfont2=\sevensy ++ \scriptfont\itfam=\sevenit \scriptfont\slfam=\sevensl ++ \scriptfont\bffam=\sevenbf \scriptfont\ttfam=\seventt ++ \scriptfont\sffam=\sevensf + } + + % +@@ -2519,6 +2554,9 @@ end + % to also set the current \fam for math mode. Our \STYLE (e.g., \rm) + % commands hardwire \STYLEfont to set the current font. + % ++% The fonts used for \ifont are for "math italics" (\itfont is for italics ++% in regular text). \syfont is also used in math mode only. ++% + % Each font-changing command also sets the names \lsize (one size lower) + % and \lllsize (three sizes lower). These relative commands are used + % in, e.g., the LaTeX logo and acronyms. +@@ -2619,26 +2657,11 @@ end + % Markup style infrastructure. \defmarkupstylesetup\INITMACRO will + % define and register \INITMACRO to be called on markup style changes. + % \INITMACRO can check \currentmarkupstyle for the innermost +-% style and the set of \ifmarkupSTYLE switches for all styles +-% currently in effect. +-\newif\ifmarkupvar +-\newif\ifmarkupsamp +-\newif\ifmarkupkey +-%\newif\ifmarkupfile % @file == @samp. +-%\newif\ifmarkupoption % @option == @samp. +-\newif\ifmarkupcode +-\newif\ifmarkupkbd +-%\newif\ifmarkupenv % @env == @code. +-%\newif\ifmarkupcommand % @command == @code. +-\newif\ifmarkuptex % @tex (and part of @math, for now). +-\newif\ifmarkupexample +-\newif\ifmarkupverb +-\newif\ifmarkupverbatim ++% style. + + \let\currentmarkupstyle\empty + + \def\setupmarkupstyle#1{% +- \csname markup#1true\endcsname + \def\currentmarkupstyle{#1}% + \markupstylesetup + } +@@ -2700,11 +2723,15 @@ end + % lilypond developers report. xpdf does work with the regular 0x27. + % + \def\codequoteright{% +- \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax +- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax +- '% ++ \ifmonospace ++ \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax ++ \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax ++ '% ++ \else \char'15 \fi + \else \char'15 \fi +- \else \char'15 \fi ++ \else ++ '% ++ \fi + } + % + % and a similar option for the left quote char vs. a grave accent. +@@ -2712,13 +2739,17 @@ end + % the code environments to do likewise. + % + \def\codequoteleft{% +- \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax +- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax +- % [Knuth] pp. 380,381,391 +- % \relax disables Spanish ligatures ?` and !` of \tt font. +- \relax`% ++ \ifmonospace ++ \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax ++ \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax ++ % [Knuth] pp. 380,381,391 ++ % \relax disables Spanish ligatures ?` and !` of \tt font. ++ \relax`% ++ \else \char'22 \fi + \else \char'22 \fi +- \else \char'22 \fi ++ \else ++ \relax`% ++ \fi + } + + % Commands to set the quote options. +@@ -5969,24 +6000,30 @@ end + % Split the last of the double-column material. + \savemarks + \balancecolumns +- % ++ }% ++ \eject % call the \output just set ++ \ifdim\pagetotal=0pt + % Having called \balancecolumns once, we do not + % want to call it again. Therefore, reset \output to its normal + % definition right away. + \global\output = {\onepageout{\pagecontents\PAGE}}% +- }% +- \eject +- \endgroup % started in \begindoublecolumns +- \restoremarks +- % Leave the double-column material on the current page, no automatic +- % page break. +- \box\balancedcolumns +- % +- % \pagegoal was set to the doubled \vsize above, since we restarted +- % the current page. We're now back to normal single-column +- % typesetting, so reset \pagegoal to the normal \vsize. +- \global\vsize = \txipageheight % +- \pagegoal = \txipageheight % ++ % ++ \endgroup % started in \begindoublecolumns ++ \restoremarks ++ % Leave the double-column material on the current page, no automatic ++ % page break. ++ \box\balancedcolumns ++ % ++ % \pagegoal was set to the doubled \vsize above, since we restarted ++ % the current page. We're now back to normal single-column ++ % typesetting, so reset \pagegoal to the normal \vsize. ++ \global\vsize = \txipageheight % ++ \pagegoal = \txipageheight % ++ \else ++ % We had some left-over material. This might happen when \doublecolumnout ++ % is called in \balancecolumns. Try again. ++ \expandafter\enddoublecolumns ++ \fi + } + \newbox\balancedcolumns + \setbox\balancedcolumns=\vbox{shouldnt see this}% +@@ -6001,6 +6038,7 @@ end + \ifdim\dimen@<5\baselineskip + % Don't split a short final column in two. + \setbox2=\vbox{}% ++ \global\setbox\balancedcolumns=\vbox{\pagesofar}% + \else + \divide\dimen@ by 2 % target to split to + \dimen@ii = \dimen@ +@@ -6016,15 +6054,15 @@ end + \repeat + }% + % Now the left column is in box 1, and the right column in box 3. ++ % + % Check whether the left column has come out higher than the page itself. + % (Note that we have doubled \vsize for the double columns, so + % the actual height of the page is 0.5\vsize). + \ifdim2\ht1>\vsize +- % Just split the last of the double column material roughly in half. +- \setbox2=\box0 +- \setbox0 = \vsplit2 to \dimen@ii +- \setbox0=\vbox to \dimen@ii {\unvbox0\vfill}% +- \setbox2=\vbox to \dimen@ii {\unvbox2\vfill}% ++ % It appears that we have been called upon to balance too much material. ++ % Output some of it with \doublecolumnout, leaving the rest on the page. ++ \setbox\PAGE=\box0 ++ \doublecolumnout + \else + % Compare the heights of the two columns. + \ifdim4\ht1>5\ht3 +@@ -6037,10 +6075,10 @@ end + \setbox2=\vbox to\ht1{\unvbox3\unskip}% + \setbox0=\vbox to\ht1{\unvbox1\unskip}% + \fi ++ \global\setbox\balancedcolumns=\vbox{\pagesofar}% + \fi + \fi + % +- \global\setbox\balancedcolumns=\vbox{\pagesofar}% + } + \catcode`\@ = \other + +@@ -9446,7 +9484,7 @@ end + \newif\ifwarnednoepsf + \newhelp\noepsfhelp{epsf.tex must be installed for images to + work. It is also included in the Texinfo distribution, or you can get +- it from ftp://tug.org/tex/epsf.tex.} ++ it from https://ctan.org/texarchive/macros/texinfo/texinfo/doc/epsf.tex.} + % + \def\image#1{% + \ifx\epsfbox\thisisundefined +@@ -11425,9 +11463,11 @@ directory should work if nowhere else do + % + \dimen0 = #1\relax + \advance\dimen0 by \voffset ++ \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page + % + \dimen2 = \hsize + \advance\dimen2 by \normaloffset ++ \advance\dimen2 by 1in % reference point is 1 inch from left edge of page + % + \internalpagesizes{#1}{\hsize}% + {\voffset}{\normaloffset}% +@@ -11675,7 +11715,7 @@ directory should work if nowhere else do + @markupsetuprqdefault + + @c Local variables: +-@c eval: (add-hook 'write-file-hooks 'time-stamp) ++@c eval: (add-hook 'before-save-hook 'time-stamp) + @c page-delimiter: "^\\\\message\\|emacs-page" + @c time-stamp-start: "def\\\\texinfoversion{" + @c time-stamp-format: "%:y-%02m-%02d.%02H" diff --git a/texinfo.spec b/texinfo.spec index a066921..103ff7c 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.5 -Release: 3%{?dist} +Release: 4%{?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: texinfo-6.0-disable-failing-info-test.patch Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch # Patch3: we need to fix template fix-info-dir generates Patch3: info-6.5-sync-fix-info-dir.patch +# Update to 2018-03-10 texinfo.tex +Patch4: texinfo-20180310-texinfo.tex.patch BuildRequires: gcc BuildRequires: perl-generators BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper) @@ -142,6 +144,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Fri Mar 30 2018 Tom Callaway - 6.5-4 +- update texinfo.tex + * Tue Feb 13 2018 Igor Gnatenko - 6.5-3 - Implement transaction filetriggers for crating info/dir From 1225667fb6fc0796839058d31af9edd7140518e9 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 19 Jun 2018 19:04:39 -0500 Subject: [PATCH 02/48] Fix bug in fix-info-dir. --- texinfo-6.5-fix-info-dir.patch | 13 +++++++++++++ texinfo.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 texinfo-6.5-fix-info-dir.patch diff --git a/texinfo-6.5-fix-info-dir.patch b/texinfo-6.5-fix-info-dir.patch new file mode 100644 index 0000000..80eec4c --- /dev/null +++ b/texinfo-6.5-fix-info-dir.patch @@ -0,0 +1,13 @@ +diff --git a/contrib/fix-info-dir b/contrib/fix-info-dir +index 4439ada..c054787 100755 +--- a/contrib/fix-info-dir ++++ b/contrib/fix-info-dir +@@ -294,7 +294,7 @@ else + DONE_MSG="total invalid menu item(s) were removed from `pwd`/$DIR_FILE" + for Info_Name in `comm -23 $TMP_FILE1 $TMP_FILE2`; do + Changed="y" +- if install-info --remove $Info_Name $DIR_FILE; then ++ if install-info --remove --remove-exactly $Info_Name $DIR_FILE; then + Total=`expr "$Total" + "1"` + fi + done diff --git a/texinfo.spec b/texinfo.spec index 103ff7c..b081f00 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -19,6 +19,9 @@ Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch Patch3: info-6.5-sync-fix-info-dir.patch # Update to 2018-03-10 texinfo.tex Patch4: texinfo-20180310-texinfo.tex.patch +# rhbz#1592433, bug in fix-info-dir --delete +Patch5: texinfo-6.5-fix-info-dir.patch + BuildRequires: gcc BuildRequires: perl-generators BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper) @@ -144,6 +147,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Tue Jun 19 2018 Jason L Tibbitts III - 6.5-5 +- Fix bug in fix-info-dir which prevented the transfiletriggerpostun script + from working properly. + * Fri Mar 30 2018 Tom Callaway - 6.5-4 - update texinfo.tex From c1f52b11ddd3844675aba697ea4d0ff7fef11d4c Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 21 Jun 2018 14:11:08 +0200 Subject: [PATCH 03/48] Fix fail of test because of unescaped left brace with Perl 5.28 --- texinfo-6.5-fix-for-perl-5.28.patch | 17 +++++++++++++++++ texinfo.spec | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 texinfo-6.5-fix-for-perl-5.28.patch diff --git a/texinfo-6.5-fix-for-perl-5.28.patch b/texinfo-6.5-fix-for-perl-5.28.patch new file mode 100644 index 0000000..77346a8 --- /dev/null +++ b/texinfo-6.5-fix-for-perl-5.28.patch @@ -0,0 +1,17 @@ +diff -up texinfo-6.5/tp/Texinfo/Parser.pm.orig texinfo-6.5/tp/Texinfo/Parser.pm +--- texinfo-6.5/tp/Texinfo/Parser.pm.orig 2018-06-12 13:40:29.356030136 +0200 ++++ texinfo-6.5/tp/Texinfo/Parser.pm 2018-06-12 13:41:28.357725639 +0200 +@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$) + } + } elsif ($command eq 'clickstyle') { + # REMACRO +- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { ++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*/) { + $args = ['@'.$1]; + $self->{'clickstyle'} = $1; + $remaining = $line; +- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; ++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*(\@(c|comment)((\@|\s+).*)?)?//; + $has_comment = 1 if (defined($4)); + } else { + $self->line_error (sprintf($self->__( diff --git a/texinfo.spec b/texinfo.spec index b081f00..dd0ceaa 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -21,6 +21,8 @@ Patch3: info-6.5-sync-fix-info-dir.patch Patch4: texinfo-20180310-texinfo.tex.patch # rhbz#1592433, bug in fix-info-dir --delete Patch5: texinfo-6.5-fix-info-dir.patch +# Patch6: rhbz#1590308, fixes test fail with unescaped left brace +Patch6: texinfo-6.5-fix-for-perl-5.28.patch BuildRequires: gcc BuildRequires: perl-generators @@ -147,6 +149,11 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Thu Jun 21 2018 Vitezslav Crhonek - 6.5-6 +- Fix fail of test because of unescaped left brace with Perl 5.28 + (patch by Jitka Plesnikova) + Resolves: #1590308 + * Tue Jun 19 2018 Jason L Tibbitts III - 6.5-5 - Fix bug in fix-info-dir which prevented the transfiletriggerpostun script from working properly. From 1a7b22c0300ab6c82a149524243f08fe5431bdfb Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 29 Jun 2018 11:07:21 +0200 Subject: [PATCH 04/48] Perl 5.28 rebuild --- texinfo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/texinfo.spec b/texinfo.spec index dd0ceaa..7016b00 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -149,6 +149,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Fri Jun 29 2018 Jitka Plesnikova - 6.5-7 +- Perl 5.28 rebuild + * Thu Jun 21 2018 Vitezslav Crhonek - 6.5-6 - Fix fail of test because of unescaped left brace with Perl 5.28 (patch by Jitka Plesnikova) From dc4942b60cc7bc734424ec637525f3258c1c9805 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 07:28:43 +0000 Subject: [PATCH 05/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 7016b00..2daafaf 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.5 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -149,6 +149,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 6.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 29 2018 Jitka Plesnikova - 6.5-7 - Perl 5.28 rebuild From 1585d1f6eb3af8944e1e7ffea865185951b6d0d3 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 8 Aug 2018 11:51:34 +0200 Subject: [PATCH 06/48] Fix issues detected by static analysis --- texinfo-6.5-covscan-fixes.patch | 190 ++++++++++++++++++++++++++++++++ texinfo.spec | 7 +- 2 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 texinfo-6.5-covscan-fixes.patch diff --git a/texinfo-6.5-covscan-fixes.patch b/texinfo-6.5-covscan-fixes.patch new file mode 100644 index 0000000..892685a --- /dev/null +++ b/texinfo-6.5-covscan-fixes.patch @@ -0,0 +1,190 @@ +unchanged: +--- texinfo-6.4/contrib/fix-info-dir.orig 2014-04-22 03:56:56.000000000 +0200 ++++ texinfo-6.4/contrib/fix-info-dir 2018-08-08 10:40:42.585496361 +0200 +@@ -28,7 +28,6 @@ if test -z "$LINENO"; then + fi + + MENU_BEGIN='^\*\([ ]\)\{1,\}Menu:' +-MENU_ITEM='^\* ([^ ]).*:([ ])+\(' + MENU_FILTER1='s/^\*\([ ]\)\{1,\}/* /' + MENU_FILTER2='s/\([ ]\)\{1,\}$//g' + +unchanged: +--- texinfo-6.4/info/echo-area.c.orig 2018-07-25 12:42:38.806784712 +0200 ++++ texinfo-6.4/info/echo-area.c 2018-07-25 12:43:15.452815108 +0200 +@@ -979,6 +979,7 @@ info_read_completing_internal (const cha + inform_in_echo_area (_("No completions")); + else + inform_in_echo_area (_("Not complete")); ++ free (line); + continue; + } + } +unchanged: +--- texinfo-6.4/info/info.c.orig 2018-07-25 14:12:18.086188150 +0200 ++++ texinfo-6.4/info/info.c 2018-07-25 14:13:00.915223083 +0200 +@@ -295,6 +295,7 @@ get_initial_file (int *argc, char ***arg + ref_index, ref_list, ref_slots, 2); + + initial_file = MANPAGE_FILE_BUFFER_NAME; ++ free (man_node); + return; + } + } +unchanged: +--- texinfo-6.4/info/infomap.c.orig 2017-05-15 18:35:24.000000000 +0200 ++++ texinfo-6.4/info/infomap.c 2018-07-30 09:40:58.517674645 +0200 +@@ -603,6 +603,7 @@ fetch_user_maps (char *init_file) + compile (inf, filename, &sup_info, &sup_ea); + + free (filename); ++ fclose (inf); + return 1; + } + +unchanged: +--- texinfo-6.4/info/m-x.c.orig 2017-05-14 12:55:17.000000000 +0200 ++++ texinfo-6.4/info/m-x.c 2018-07-30 10:11:23.799858816 +0200 +@@ -81,7 +81,10 @@ DECLARE_INFO_COMMAND (describe_command, + InfoCommand *cmd = named_function (line); + + if (!cmd) +- return; ++ { ++ free (line); ++ return; ++ } + + window_message_in_echo_area ("%s: %s.", + line, function_documentation (cmd)); +unchanged: +--- texinfo-6.4/info/makedoc.c.orig 2014-11-07 11:58:55.000000000 +0100 ++++ texinfo-6.4/info/makedoc.c 2018-07-30 10:23:55.128644559 +0200 +@@ -427,7 +427,11 @@ process_one_file (char *filename, FILE * + + offset++; + if (offset >= file_size) +- break; ++ { ++ free (func_name); ++ free (func); ++ break; ++ } + + doc = xmalloc (1 + (offset - point)); + strncpy (doc, buffer + point, offset - point); +unchanged: +--- texinfo-6.4/info/nodes.c 2018-07-30 10:59:25.515087533 +0200 ++++ texinfo-6.4/info/nodes.c 2018-07-30 11:10:47.547853493 +0200 +@@ -305,7 +305,10 @@ + for (p = 0; nodedef[p] && nodedef[p] != INFO_TAGSEP; p++) + ; + if (nodedef[p] != INFO_TAGSEP) +- continue; ++ { ++ free (entry); ++ continue; ++ } + + entry->nodename = xmalloc (p + 1); + strncpy (entry->nodename, nodedef, p); +@@ -479,6 +482,7 @@ + } + file_buffer->subfiles = NULL; + free_file_buffer_tags (file_buffer); ++ free (subfiles); + return; + } + +unchanged: +--- texinfo-6.4/info/session.c.orig 2018-07-30 11:11:33.997905448 +0200 ++++ texinfo-6.4/info/session.c 2018-07-30 11:38:27.135721289 +0200 +@@ -3554,6 +3554,7 @@ DECLARE_INFO_COMMAND (info_goto_invocati + if (!line) + { + info_abort_key (window, 0); ++ free (default_program_name); + return; + } + if (*line) +unchanged: +--- texinfo-6.4/info/variables.c.def24 2017-05-03 21:48:19.000000000 +0200 ++++ texinfo-6.4/info/variables.c 2018-07-30 12:53:06.692694120 +0200 +@@ -361,6 +361,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 (); +@@ -384,7 +385,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 -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install-info.c +--- texinfo-6.4/install-info/install-info.c 2018-07-30 13:47:00.265812976 +0200 ++++ texinfo-6.4/install-info/install-info.c 2018-07-30 13:53:50.427431251 +0200 +@@ -867,10 +867,16 @@ + char *command = concat (*compression_program, " -d", ""); + + if (gzclose (f) < 0) +- return 0; ++ { ++ free (command); ++ return 0; ++ } + p = freopen (*opened_filename, FOPEN_RBIN, stdin); + if (!p) +- return 0; ++ { ++ free (command); ++ return 0; ++ } + p = popen (command, "r"); + if (!p) + { +@@ -880,6 +886,7 @@ + } + else + *is_pipe = 1; ++ free (command); + return p; + } + else +@@ -923,7 +930,10 @@ + &pipe_p); + + if (!f) +- return 0; ++ { ++ free (data); ++ return 0; ++ } + + for (;;) + { +@@ -983,6 +993,7 @@ + { + char *command = concat (compression_program, ">", dirfile_tmp); + output = popen (command, "w"); ++ free (command); + } + else + output = fopen (dirfile_tmp, "w"); +@@ -1724,6 +1735,8 @@ + + format_entry (name, name_len, desc, desc_len, calign, align, + maxwidth, &entry->text, &entry->text_len); ++ free (desc); ++ free (name); + } + } + diff --git a/texinfo.spec b/texinfo.spec index 2daafaf..da53181 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.5 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -23,6 +23,8 @@ Patch4: texinfo-20180310-texinfo.tex.patch Patch5: texinfo-6.5-fix-info-dir.patch # Patch6: rhbz#1590308, fixes test fail with unescaped left brace Patch6: texinfo-6.5-fix-for-perl-5.28.patch +# Patch7: fixes issues detected by static analysis +Patch7: texinfo-6.5-covscan-fixes.patch BuildRequires: gcc BuildRequires: perl-generators @@ -149,6 +151,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Wed Aug 08 2018 Vitezslav Crhonek - 6.5-9 +- Fix issues detected by static analysis + * Sat Jul 14 2018 Fedora Release Engineering - 6.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 2dc8474fcafd0a243d64010b79f6900ca2e966be Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 9 Aug 2018 19:15:35 +0200 Subject: [PATCH 07/48] Drop macros.info They are wrong. And nobody uses that anyway. Signed-off-by: Igor Gnatenko --- texinfo.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/texinfo.spec b/texinfo.spec index da53181..ebc58d1 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,13 +3,11 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.5 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3+ 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 -# Source5: macro definitions -Source5: macros.info Patch0: texinfo-4.12-zlib.patch # Patch1: this is needed just for koji/mock, all tests pass fine in local build Patch1: texinfo-6.0-disable-failing-info-test.patch @@ -90,9 +88,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin install -Dpm0755 -t %{buildroot}%{_sbindir} contrib/fix-info-dir -mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d -cp %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d - %find_lang %{name} %find_lang %{name}_document @@ -135,7 +130,6 @@ export ALL_TESTS=yes %{_mandir}/man1/info.1* %{_mandir}/man1/install-info.1* %{_mandir}/man5/info.5* -%{_rpmconfigdir}/macros.d/macros.info %ghost %{_infodir}/dir %ghost %{_infodir}/dir.old @@ -151,6 +145,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Thu Aug 09 2018 Igor Gnatenko - 6.5-10 +- Drop macros.info + * Wed Aug 08 2018 Vitezslav Crhonek - 6.5-9 - Fix issues detected by static analysis From 3ac1f4efbeebc2e55f04a2addebe2ee53e3339ec Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 4 Oct 2018 15:17:45 -0500 Subject: [PATCH 08/48] Fix potential infloop in fix-info-dir. This modifies the existing patch to fix-info-dir to also fix an odd infinite loop that can occur when /dev/null is not a device and stderr is redirected there. https://bugzilla.redhat.com/show_bug.cgi?id=1614162 --- texinfo-6.5-fix-info-dir.patch | 32 ++++++++++++++++++++++++++++++-- texinfo.spec | 7 ++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/texinfo-6.5-fix-info-dir.patch b/texinfo-6.5-fix-info-dir.patch index 80eec4c..cdb26f2 100644 --- a/texinfo-6.5-fix-info-dir.patch +++ b/texinfo-6.5-fix-info-dir.patch @@ -1,8 +1,36 @@ +This fixes two issues: + +https://bugzilla.redhat.com/show_bug.cgi?id=1592433 +This is a bug in fix-info-dir --delete +(Hunk 3) + +https://bugzilla.redhat.com/show_bug.cgi?id=1614162 +This is a weird infinite loop that happens when fix-info-dir is run with stderr +redirected to /dev/null while /dev/null doesn't exist (or isn't a device) +(Hunks 1 and 2) + diff --git a/contrib/fix-info-dir b/contrib/fix-info-dir -index 4439ada..c054787 100755 +index 4439ada..9240060 100755 --- a/contrib/fix-info-dir +++ b/contrib/fix-info-dir -@@ -294,7 +294,7 @@ else +@@ -124,6 +124,7 @@ if test "$CREATE_NODE"; then + fi + shift + else ++ SKIP_READ=yes + SKELETON=/dev/null + + fi +@@ -188,7 +189,7 @@ DIR_FILE_END_OF_FILE + + # Read one line from the file. This is so that we can echo lines with + # whitespace and quoted characters in them. +- while read fileline; do ++ while test -z "$SKIP_READ" && read fileline; do + # flag fancy features + if test ! -z "$echoline"; then # echo line + echo "$fileline" +@@ -294,7 +295,7 @@ else DONE_MSG="total invalid menu item(s) were removed from `pwd`/$DIR_FILE" for Info_Name in `comm -23 $TMP_FILE1 $TMP_FILE2`; do Changed="y" diff --git a/texinfo.spec b/texinfo.spec index ebc58d1..4918145 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -145,6 +145,11 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Thu Oct 04 2018 Jason L Tibbitts III - 6.5-11 +- Fix another issue in fix-info-dir which could lead to an infinite loop in odd + circumstances. + Resolves: #1614162 + * Thu Aug 09 2018 Igor Gnatenko - 6.5-10 - Drop macros.info From 1cea6c8d4fa63055310c7fabc07611a1d4acbd86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 09:42:19 +0000 Subject: [PATCH 09/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 4918145..a04e5a1 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.5 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -145,6 +145,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 6.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Oct 04 2018 Jason L Tibbitts III - 6.5-11 - Fix another issue in fix-info-dir which could lead to an infinite loop in odd circumstances. From bc2165c8b2d16b46846fbbf61edad9341a69f0b1 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 18 Feb 2019 11:24:58 +0100 Subject: [PATCH 10/48] Update to texinfo-6.6 --- .gitignore | 6 +- sources | 4 +- texinfo-20180310-texinfo.tex.patch | 311 -------------------- texinfo-4.12-zlib.patch | 34 +-- texinfo-6.0-disable-failing-info-test.patch | 62 ++-- texinfo-6.5-covscan-fixes.patch | 118 +++----- texinfo-6.5-fix-for-perl-5.28.patch | 17 -- texinfo.spec | 20 +- 8 files changed, 98 insertions(+), 474 deletions(-) delete mode 100644 texinfo-20180310-texinfo.tex.patch delete mode 100644 texinfo-6.5-fix-for-perl-5.28.patch diff --git a/.gitignore b/.gitignore index 601df86..d3b8ba7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/texinfo-6.4.tar.xz -/texinfo-6.4.tar.xz.sig -/texinfo-6.5.tar.xz -/texinfo-6.5.tar.xz.sig +/texinfo-6.6.tar.xz +/texinfo-6.6.tar.xz.sig diff --git a/sources b/sources index ea238ff..b522b9d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-6.5.tar.xz) = 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc -SHA512 (texinfo-6.5.tar.xz.sig) = d1b3e0bdaf80316410bb10edd25edfbf83afd6ac9a34881487722a9aafeab381272c946acd649b745f1bd9a55f279d05ac638ef610c09f4347f5e3e893b47c4f +SHA512 (texinfo-6.6.tar.xz) = 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0 +SHA512 (texinfo-6.6.tar.xz.sig) = b4af1d28e4cc20b6e86255b907542122aa1da423652ea962b885b2f2d1cc135747d12c4eb78a24c25320b981e2448ce87f66bf9ac264527f989dc7439cefd03b diff --git a/texinfo-20180310-texinfo.tex.patch b/texinfo-20180310-texinfo.tex.patch deleted file mode 100644 index 526fd22..0000000 --- a/texinfo-20180310-texinfo.tex.patch +++ /dev/null @@ -1,311 +0,0 @@ -diff -up texinfo-6.5/doc/texinfo.tex.old texinfo-6.5/doc/texinfo.tex ---- texinfo-6.5/doc/texinfo.tex.old 2017-08-27 05:21:32.000000000 -0400 -+++ texinfo-6.5/doc/texinfo.tex 2018-03-10 08:40:29.000000000 -0500 -@@ -3,11 +3,11 @@ - % Load plain if necessary, i.e., if running under initex. - \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi - % --\def\texinfoversion{2017-08-23.19} -+\def\texinfoversion{2018-03-10.14} - % - % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, - % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, --% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 -+% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - % Free Software Foundation, Inc. - % - % This texinfo.tex file is free software: you can redistribute it and/or -@@ -21,7 +21,7 @@ - % General Public License for more details. - % - % You should have received a copy of the GNU General Public License --% along with this program. If not, see . -+% along with this program. If not, see . - % - % As a special exception, when this file is read by TeX when processing - % a Texinfo source document, you may use the result without -@@ -30,9 +30,9 @@ - % - % Please try the latest version of texinfo.tex before submitting bug - % reports; you can get the latest version from: --% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or --% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or --% http://www.gnu.org/software/texinfo/ (the Texinfo home page) -+% https://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or -+% https://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or -+% https://www.gnu.org/software/texinfo/ (the Texinfo home page) - % The texinfo.tex in any given distribution could well be out - % of date, so if that's what you're using, please check. - % -@@ -56,7 +56,7 @@ - % extent. You can get the existing language-specific files from the - % full Texinfo distribution. - % --% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. -+% The GNU Texinfo home page is https://www.gnu.org/software/texinfo. - - - \message{Loading texinfo [version \texinfoversion]:} -@@ -2235,6 +2235,20 @@ end - \font\smallersy=cmsy8 - \def\smallerecsize{0800} - -+% Fonts for math mode superscripts (7pt). -+\def\sevennominalsize{7pt} -+\setfont\sevenrm\rmshape{7}{1000}{OT1} -+\setfont\seventt\ttshape{10}{700}{OT1TT} -+\setfont\sevenbf\bfshape{10}{700}{OT1} -+\setfont\sevenit\itshape{7}{1000}{OT1IT} -+\setfont\sevensl\slshape{10}{700}{OT1} -+\setfont\sevensf\sfshape{10}{700}{OT1} -+\setfont\sevensc\scshape{10}{700}{OT1} -+\setfont\seventtsl\ttslshape{10}{700}{OT1TT} -+\font\seveni=cmmi7 -+\font\sevensy=cmsy7 -+\def\sevenecsize{0700} -+ - % Fonts for title page (20.4pt): - \def\titlenominalsize{20pt} - \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -@@ -2369,6 +2383,20 @@ end - \font\smallersy=cmsy8 - \def\smallerecsize{0800} - -+% Fonts for math mode superscripts (7pt). -+\def\sevennominalsize{7pt} -+\setfont\sevenrm\rmshape{7}{1000}{OT1} -+\setfont\seventt\ttshape{10}{700}{OT1TT} -+\setfont\sevenbf\bfshape{10}{700}{OT1} -+\setfont\sevenit\itshape{7}{1000}{OT1IT} -+\setfont\sevensl\slshape{10}{700}{OT1} -+\setfont\sevensf\sfshape{10}{700}{OT1} -+\setfont\sevensc\scshape{10}{700}{OT1} -+\setfont\seventtsl\ttslshape{10}{700}{OT1TT} -+\font\seveni=cmmi7 -+\font\sevensy=cmsy7 -+\def\sevenecsize{0700} -+ - % Fonts for title page (20.4pt): - \def\titlenominalsize{20pt} - \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -@@ -2503,13 +2531,20 @@ end - - - % In order for the font changes to affect most math symbols and letters, --% we have to define the \textfont of the standard families. We don't --% bother to reset \scriptfont and \scriptscriptfont; awaiting user need. -+% we have to define the \textfont of the standard families. -+% We don't bother to reset \scriptscriptfont; awaiting user need. - % - \def\resetmathfonts{% - \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont - \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont - \textfont\ttfam=\ttfont \textfont\sffam=\sffont -+ % -+ % Fonts for superscript. Note that the 7pt fonts are used regardless -+ % of the current font size. -+ \scriptfont0=\sevenrm \scriptfont1=\seveni \scriptfont2=\sevensy -+ \scriptfont\itfam=\sevenit \scriptfont\slfam=\sevensl -+ \scriptfont\bffam=\sevenbf \scriptfont\ttfam=\seventt -+ \scriptfont\sffam=\sevensf - } - - % -@@ -2519,6 +2554,9 @@ end - % to also set the current \fam for math mode. Our \STYLE (e.g., \rm) - % commands hardwire \STYLEfont to set the current font. - % -+% The fonts used for \ifont are for "math italics" (\itfont is for italics -+% in regular text). \syfont is also used in math mode only. -+% - % Each font-changing command also sets the names \lsize (one size lower) - % and \lllsize (three sizes lower). These relative commands are used - % in, e.g., the LaTeX logo and acronyms. -@@ -2619,26 +2657,11 @@ end - % Markup style infrastructure. \defmarkupstylesetup\INITMACRO will - % define and register \INITMACRO to be called on markup style changes. - % \INITMACRO can check \currentmarkupstyle for the innermost --% style and the set of \ifmarkupSTYLE switches for all styles --% currently in effect. --\newif\ifmarkupvar --\newif\ifmarkupsamp --\newif\ifmarkupkey --%\newif\ifmarkupfile % @file == @samp. --%\newif\ifmarkupoption % @option == @samp. --\newif\ifmarkupcode --\newif\ifmarkupkbd --%\newif\ifmarkupenv % @env == @code. --%\newif\ifmarkupcommand % @command == @code. --\newif\ifmarkuptex % @tex (and part of @math, for now). --\newif\ifmarkupexample --\newif\ifmarkupverb --\newif\ifmarkupverbatim -+% style. - - \let\currentmarkupstyle\empty - - \def\setupmarkupstyle#1{% -- \csname markup#1true\endcsname - \def\currentmarkupstyle{#1}% - \markupstylesetup - } -@@ -2700,11 +2723,15 @@ end - % lilypond developers report. xpdf does work with the regular 0x27. - % - \def\codequoteright{% -- \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax -- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax -- '% -+ \ifmonospace -+ \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax -+ \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax -+ '% -+ \else \char'15 \fi - \else \char'15 \fi -- \else \char'15 \fi -+ \else -+ '% -+ \fi - } - % - % and a similar option for the left quote char vs. a grave accent. -@@ -2712,13 +2739,17 @@ end - % the code environments to do likewise. - % - \def\codequoteleft{% -- \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax -- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax -- % [Knuth] pp. 380,381,391 -- % \relax disables Spanish ligatures ?` and !` of \tt font. -- \relax`% -+ \ifmonospace -+ \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax -+ \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax -+ % [Knuth] pp. 380,381,391 -+ % \relax disables Spanish ligatures ?` and !` of \tt font. -+ \relax`% -+ \else \char'22 \fi - \else \char'22 \fi -- \else \char'22 \fi -+ \else -+ \relax`% -+ \fi - } - - % Commands to set the quote options. -@@ -5969,24 +6000,30 @@ end - % Split the last of the double-column material. - \savemarks - \balancecolumns -- % -+ }% -+ \eject % call the \output just set -+ \ifdim\pagetotal=0pt - % Having called \balancecolumns once, we do not - % want to call it again. Therefore, reset \output to its normal - % definition right away. - \global\output = {\onepageout{\pagecontents\PAGE}}% -- }% -- \eject -- \endgroup % started in \begindoublecolumns -- \restoremarks -- % Leave the double-column material on the current page, no automatic -- % page break. -- \box\balancedcolumns -- % -- % \pagegoal was set to the doubled \vsize above, since we restarted -- % the current page. We're now back to normal single-column -- % typesetting, so reset \pagegoal to the normal \vsize. -- \global\vsize = \txipageheight % -- \pagegoal = \txipageheight % -+ % -+ \endgroup % started in \begindoublecolumns -+ \restoremarks -+ % Leave the double-column material on the current page, no automatic -+ % page break. -+ \box\balancedcolumns -+ % -+ % \pagegoal was set to the doubled \vsize above, since we restarted -+ % the current page. We're now back to normal single-column -+ % typesetting, so reset \pagegoal to the normal \vsize. -+ \global\vsize = \txipageheight % -+ \pagegoal = \txipageheight % -+ \else -+ % We had some left-over material. This might happen when \doublecolumnout -+ % is called in \balancecolumns. Try again. -+ \expandafter\enddoublecolumns -+ \fi - } - \newbox\balancedcolumns - \setbox\balancedcolumns=\vbox{shouldnt see this}% -@@ -6001,6 +6038,7 @@ end - \ifdim\dimen@<5\baselineskip - % Don't split a short final column in two. - \setbox2=\vbox{}% -+ \global\setbox\balancedcolumns=\vbox{\pagesofar}% - \else - \divide\dimen@ by 2 % target to split to - \dimen@ii = \dimen@ -@@ -6016,15 +6054,15 @@ end - \repeat - }% - % Now the left column is in box 1, and the right column in box 3. -+ % - % Check whether the left column has come out higher than the page itself. - % (Note that we have doubled \vsize for the double columns, so - % the actual height of the page is 0.5\vsize). - \ifdim2\ht1>\vsize -- % Just split the last of the double column material roughly in half. -- \setbox2=\box0 -- \setbox0 = \vsplit2 to \dimen@ii -- \setbox0=\vbox to \dimen@ii {\unvbox0\vfill}% -- \setbox2=\vbox to \dimen@ii {\unvbox2\vfill}% -+ % It appears that we have been called upon to balance too much material. -+ % Output some of it with \doublecolumnout, leaving the rest on the page. -+ \setbox\PAGE=\box0 -+ \doublecolumnout - \else - % Compare the heights of the two columns. - \ifdim4\ht1>5\ht3 -@@ -6037,10 +6075,10 @@ end - \setbox2=\vbox to\ht1{\unvbox3\unskip}% - \setbox0=\vbox to\ht1{\unvbox1\unskip}% - \fi -+ \global\setbox\balancedcolumns=\vbox{\pagesofar}% - \fi - \fi - % -- \global\setbox\balancedcolumns=\vbox{\pagesofar}% - } - \catcode`\@ = \other - -@@ -9446,7 +9484,7 @@ end - \newif\ifwarnednoepsf - \newhelp\noepsfhelp{epsf.tex must be installed for images to - work. It is also included in the Texinfo distribution, or you can get -- it from ftp://tug.org/tex/epsf.tex.} -+ it from https://ctan.org/texarchive/macros/texinfo/texinfo/doc/epsf.tex.} - % - \def\image#1{% - \ifx\epsfbox\thisisundefined -@@ -11425,9 +11463,11 @@ directory should work if nowhere else do - % - \dimen0 = #1\relax - \advance\dimen0 by \voffset -+ \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page - % - \dimen2 = \hsize - \advance\dimen2 by \normaloffset -+ \advance\dimen2 by 1in % reference point is 1 inch from left edge of page - % - \internalpagesizes{#1}{\hsize}% - {\voffset}{\normaloffset}% -@@ -11675,7 +11715,7 @@ directory should work if nowhere else do - @markupsetuprqdefault - - @c Local variables: --@c eval: (add-hook 'write-file-hooks 'time-stamp) -+@c eval: (add-hook 'before-save-hook 'time-stamp) - @c page-delimiter: "^\\\\message\\|emacs-page" - @c time-stamp-start: "def\\\\texinfoversion{" - @c time-stamp-format: "%:y-%02m-%02d.%02H" diff --git a/texinfo-4.12-zlib.patch b/texinfo-4.12-zlib.patch index 0fc5bb4..78ef437 100644 --- a/texinfo-4.12-zlib.patch +++ b/texinfo-4.12-zlib.patch @@ -1,7 +1,7 @@ -diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/install-info.c ---- texinfo-6.4/install-info/install-info.c.orig 2016-03-04 18:52:26.000000000 +0100 -+++ texinfo-6.4/install-info/install-info.c 2017-06-27 15:14:20.167998983 +0200 -@@ -22,6 +22,7 @@ +diff -up texinfo-6.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-info/install-info.c +--- texinfo-6.5.91/install-info/install-info.c.orig 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/install-info/install-info.c 2019-01-14 09:31:45.322849494 +0100 +@@ -19,6 +19,7 @@ #include #include #include @@ -9,7 +9,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i #define TAB_WIDTH 8 -@@ -684,15 +685,15 @@ The first time you invoke Info you start +@@ -681,15 +682,15 @@ The first time you invoke Info you start Return either stdin reading the file, or a non-stdin pipe reading the output of the compression program. */ @@ -28,7 +28,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i /* We let them pass NULL if they don't want this info, but it's easier to always determine it. */ -@@ -700,48 +701,48 @@ open_possibly_compressed_file (char *fil +@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *fil opened_filename = &local_opened_filename; *opened_filename = filename; @@ -85,7 +85,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i } #endif /* __MSDOS__ */ if (!f) -@@ -757,7 +758,7 @@ open_possibly_compressed_file (char *fil +@@ -754,7 +755,7 @@ open_possibly_compressed_file (char *fil (*create_callback) (filename); /* And try opening it again. */ @@ -94,7 +94,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i if (!f) return 0; } -@@ -767,26 +768,26 @@ open_possibly_compressed_file (char *fil +@@ -764,26 +765,26 @@ open_possibly_compressed_file (char *fil /* Read first few bytes of file rather than relying on the filename. If the file is shorter than this it can't be usable anyway. */ @@ -129,7 +129,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i return 0; goto determine_file_type; /* success */ } -@@ -857,35 +858,40 @@ determine_file_type: +@@ -854,35 +855,40 @@ determine_file_type: *compression_program = NULL; /* Seek back over the magic bytes. */ @@ -177,7 +177,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i } return f; -@@ -904,7 +910,8 @@ readfile (char *filename, int *sizep, +@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, void (*create_callback) (char *), char **opened_filename, char **compression_program) { @@ -187,7 +187,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i int filled = 0; int data_size = 8192; char *data = xmalloc (data_size); -@@ -912,14 +919,20 @@ readfile (char *filename, int *sizep, +@@ -909,14 +916,20 @@ readfile (char *filename, int *sizep, /* If they passed the space for the file name to return, use it. */ f = open_possibly_compressed_file (filename, create_callback, opened_filename, @@ -210,7 +210,7 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i if (nread < 0) return 0; if (nread == 0) -@@ -938,8 +951,10 @@ readfile (char *filename, int *sizep, +@@ -935,8 +948,10 @@ readfile (char *filename, int *sizep, /* We need to close the stream, since on some systems the pipe created by popen is simulated by a temporary file which only gets removed inside pclose. */ @@ -222,10 +222,10 @@ diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/install-info/i *sizep = filled; return data; -diff -up texinfo-6.4/install-info/Makefile.in.orig texinfo-6.4/install-info/Makefile.in ---- texinfo-6.4/install-info/Makefile.in.orig 2017-06-23 08:04:39.000000000 +0200 -+++ texinfo-6.4/install-info/Makefile.in 2017-06-27 15:14:20.167998983 +0200 -@@ -221,7 +221,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" +diff -up texinfo-6.5.91/install-info/Makefile.in.orig texinfo-6.5.91/install-info/Makefile.in +--- texinfo-6.5.91/install-info/Makefile.in.orig 2019-01-14 09:32:31.729895052 +0100 ++++ texinfo-6.5.91/install-info/Makefile.in 2019-01-14 09:32:52.574914503 +0100 +@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_ginstall_info_OBJECTS = install-info.$(OBJEXT) ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) @@ -233,4 +233,4 @@ diff -up texinfo-6.4/install-info/Makefile.in.orig texinfo-6.4/install-info/Make +ginstall_info_LDADD = $(LDADD) -lz am__DEPENDENCIES_1 = ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) diff --git a/texinfo-6.0-disable-failing-info-test.patch b/texinfo-6.0-disable-failing-info-test.patch index 813cc4b..5a8b72a 100644 --- a/texinfo-6.0-disable-failing-info-test.patch +++ b/texinfo-6.0-disable-failing-info-test.patch @@ -1,49 +1,25 @@ -diff -up texinfo-6.4.90/info/Makefile.in.orig texinfo-6.4.90/info/Makefile.in ---- texinfo-6.4.90/info/Makefile.in.orig 2017-07-10 21:06:01.000000000 +0200 -+++ texinfo-6.4.90/info/Makefile.in 2017-07-11 09:58:06.501153160 +0200 -@@ -1367,7 +1367,6 @@ TESTS = \ - t/end-of-line.sh \ - t/goal-column.sh \ - t/star-note-non-whitespace.sh \ -- t/c-u-m-x-scroll-forward.sh \ - t/last-no-history.sh \ - t/split-footnotes.sh \ - t/window-split-dir.sh \ -@@ -1392,10 +1391,6 @@ TESTS = \ - t/search-skip-screen.sh \ - t/search-empty.sh \ - t/close-window-after-search.sh \ -- t/inc-sea-forward.sh \ -- t/inc-sea-forward-nonregex.sh \ -- t/inc-sea-insensitive.sh \ -- t/inc-sea-history.sh \ - t/inc-sea-bs.sh \ - t/gc-split.sh \ - t/anchor-positions.sh \ -diff -up texinfo-6.4.90/tp/tests/Makefile.in.orig texinfo-6.4.90/tp/tests/Makefile.in ---- texinfo-6.4.90/tp/tests/Makefile.in.orig 2017-07-10 20:52:24.000000000 +0200 -+++ texinfo-6.4.90/tp/tests/Makefile.in 2017-07-11 09:59:30.838233561 +0200 -@@ -1308,7 +1308,6 @@ one_test_files_generated_list = \ - test_scripts/formatting_simplest_test_prefix_info.sh \ - test_scripts/formatting_simplest_test_css.sh \ - test_scripts/formatting_simplest_test_date_in_header.sh \ -- test_scripts/formatting_documentlanguage_set_option.sh \ - test_scripts/formatting_documentlanguage_set_unknown.sh \ - test_scripts/formatting_documentlanguage_set_option_info.sh \ - test_scripts/formatting_float_copying.sh \ -@@ -1348,7 +1347,6 @@ one_test_files_generated_list = \ - test_scripts/sectioning_top_node_up_explicit.sh \ - test_scripts/coverage_texi_formatting.sh \ - test_scripts/coverage_formatting.sh \ -- test_scripts/coverage_formatting_fr.sh \ - test_scripts/indices_double_index_entry.sh \ - test_scripts/indices_split_chapter_index.sh \ - test_scripts/indices_index_split.sh \ -@@ -1447,7 +1445,6 @@ one_test_files_generated_list = \ +diff -up texinfo-6.5.92/install-info/tests/Makefile.in.orig texinfo-6.5.92/install-info/tests/Makefile.in +--- texinfo-6.5.92/install-info/tests/Makefile.in.orig 2019-02-01 16:16:49.000000000 +0100 ++++ texinfo-6.5.92/install-info/tests/Makefile.in 2019-02-18 10:33:52.078877104 +0100 +@@ -1229,8 +1229,8 @@ ii-0021-test ii-0022-test ii-0023-test i + ii-0026-test ii-0027-test ii-0028-test ii-0029-test ii-0030-test \ + ii-0031-test ii-0032-test ii-0033-test ii-0034-test ii-0035-test \ + ii-0036-test ii-0037-test ii-0038-test ii-0039-test ii-0040-test \ +-ii-0041-test ii-0042-test ii-0043-test ii-0044-test ii-0045-test \ +-ii-0046-test ii-0047-test ii-0048-test ii-0049-test ii-0050-test \ ++ii-0042-test ii-0043-test ii-0044-test ii-0045-test \ ++ii-0046-test ii-0047-test ii-0048-test ii-0049-test \ + ii-0051-test ii-0052-test ii-0053-test ii-0054-test ii-0055-test \ + ii-0056-test ii-0057-test + +diff -up texinfo-6.5.92/tp/tests/Makefile.in.orig texinfo-6.5.92/tp/tests/Makefile.in +--- texinfo-6.5.92/tp/tests/Makefile.in.orig 2019-02-01 16:16:50.000000000 +0100 ++++ texinfo-6.5.92/tp/tests/Makefile.in 2019-02-18 10:33:13.774827269 +0100 +@@ -1374,7 +1374,6 @@ one_test_files_generated_list = \ test_scripts/layout_formatting_html32.sh \ test_scripts/layout_formatting_regions.sh \ test_scripts/layout_formatting_exotic.sh \ - test_scripts/layout_formatting_fr_icons.sh \ test_scripts/layout_formatting_chm.sh \ test_scripts/layout_formatting_nodes.sh \ - test_scripts/tex_html_block_EOL_tex.sh \ + test_scripts/layout_formatting.sh \ diff --git a/texinfo-6.5-covscan-fixes.patch b/texinfo-6.5-covscan-fixes.patch index 892685a..522d511 100644 --- a/texinfo-6.5-covscan-fixes.patch +++ b/texinfo-6.5-covscan-fixes.patch @@ -1,6 +1,6 @@ -unchanged: ---- texinfo-6.4/contrib/fix-info-dir.orig 2014-04-22 03:56:56.000000000 +0200 -+++ texinfo-6.4/contrib/fix-info-dir 2018-08-08 10:40:42.585496361 +0200 +diff -up texinfo-6.5.91/contrib/fix-info-dir.p7 texinfo-6.5.91/contrib/fix-info-dir +--- texinfo-6.5.91/contrib/fix-info-dir.p7 2019-01-21 10:52:18.453973008 +0100 ++++ texinfo-6.5.91/contrib/fix-info-dir 2019-01-21 10:52:18.456973012 +0100 @@ -28,7 +28,6 @@ if test -z "$LINENO"; then fi @@ -9,32 +9,10 @@ unchanged: MENU_FILTER1='s/^\*\([ ]\)\{1,\}/* /' MENU_FILTER2='s/\([ ]\)\{1,\}$//g' -unchanged: ---- texinfo-6.4/info/echo-area.c.orig 2018-07-25 12:42:38.806784712 +0200 -+++ texinfo-6.4/info/echo-area.c 2018-07-25 12:43:15.452815108 +0200 -@@ -979,6 +979,7 @@ info_read_completing_internal (const cha - inform_in_echo_area (_("No completions")); - else - inform_in_echo_area (_("Not complete")); -+ free (line); - continue; - } - } -unchanged: ---- texinfo-6.4/info/info.c.orig 2018-07-25 14:12:18.086188150 +0200 -+++ texinfo-6.4/info/info.c 2018-07-25 14:13:00.915223083 +0200 -@@ -295,6 +295,7 @@ get_initial_file (int *argc, char ***arg - ref_index, ref_list, ref_slots, 2); - - initial_file = MANPAGE_FILE_BUFFER_NAME; -+ free (man_node); - return; - } - } -unchanged: ---- texinfo-6.4/info/infomap.c.orig 2017-05-15 18:35:24.000000000 +0200 -+++ texinfo-6.4/info/infomap.c 2018-07-30 09:40:58.517674645 +0200 -@@ -603,6 +603,7 @@ fetch_user_maps (char *init_file) +diff -up texinfo-6.5.91/info/infomap.c.p7 texinfo-6.5.91/info/infomap.c +--- texinfo-6.5.91/info/infomap.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/infomap.c 2019-01-21 10:52:18.457973013 +0100 +@@ -589,6 +589,7 @@ fetch_user_maps (char *init_file) compile (inf, filename, &sup_info, &sup_ea); free (filename); @@ -42,25 +20,10 @@ unchanged: return 1; } -unchanged: ---- texinfo-6.4/info/m-x.c.orig 2017-05-14 12:55:17.000000000 +0200 -+++ texinfo-6.4/info/m-x.c 2018-07-30 10:11:23.799858816 +0200 -@@ -81,7 +81,10 @@ DECLARE_INFO_COMMAND (describe_command, - InfoCommand *cmd = named_function (line); - - if (!cmd) -- return; -+ { -+ free (line); -+ return; -+ } - - window_message_in_echo_area ("%s: %s.", - line, function_documentation (cmd)); -unchanged: ---- texinfo-6.4/info/makedoc.c.orig 2014-11-07 11:58:55.000000000 +0100 -+++ texinfo-6.4/info/makedoc.c 2018-07-30 10:23:55.128644559 +0200 -@@ -427,7 +427,11 @@ process_one_file (char *filename, FILE * +diff -up texinfo-6.5.91/info/makedoc.c.p7 texinfo-6.5.91/info/makedoc.c +--- texinfo-6.5.91/info/makedoc.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/makedoc.c 2019-01-21 10:52:18.457973013 +0100 +@@ -425,7 +425,11 @@ process_one_file (char *filename, FILE * offset++; if (offset >= file_size) @@ -73,10 +36,25 @@ unchanged: doc = xmalloc (1 + (offset - point)); strncpy (doc, buffer + point, offset - point); -unchanged: ---- texinfo-6.4/info/nodes.c 2018-07-30 10:59:25.515087533 +0200 -+++ texinfo-6.4/info/nodes.c 2018-07-30 11:10:47.547853493 +0200 -@@ -305,7 +305,10 @@ +diff -up texinfo-6.5.91/info/m-x.c.p7 texinfo-6.5.91/info/m-x.c +--- texinfo-6.5.91/info/m-x.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/m-x.c 2019-01-21 10:52:18.457973013 +0100 +@@ -79,7 +79,10 @@ DECLARE_INFO_COMMAND (describe_command, + InfoCommand *cmd = named_function (line); + + if (!cmd) +- return; ++ { ++ free (line); ++ return; ++ } + + window_message_in_echo_area ("%s: %s.", + line, function_documentation (cmd)); +diff -up texinfo-6.5.91/info/nodes.c.p7 texinfo-6.5.91/info/nodes.c +--- texinfo-6.5.91/info/nodes.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/nodes.c 2019-01-21 10:52:18.457973013 +0100 +@@ -303,7 +303,10 @@ get_nodes_of_tags_table (FILE_BUFFER *fi for (p = 0; nodedef[p] && nodedef[p] != INFO_TAGSEP; p++) ; if (nodedef[p] != INFO_TAGSEP) @@ -88,7 +66,7 @@ unchanged: entry->nodename = xmalloc (p + 1); strncpy (entry->nodename, nodedef, p); -@@ -479,6 +482,7 @@ +@@ -477,6 +480,7 @@ get_tags_of_indirect_tags_table (FILE_BU } file_buffer->subfiles = NULL; free_file_buffer_tags (file_buffer); @@ -96,10 +74,10 @@ unchanged: return; } -unchanged: ---- texinfo-6.4/info/session.c.orig 2018-07-30 11:11:33.997905448 +0200 -+++ texinfo-6.4/info/session.c 2018-07-30 11:38:27.135721289 +0200 -@@ -3554,6 +3554,7 @@ DECLARE_INFO_COMMAND (info_goto_invocati +diff -up texinfo-6.5.91/info/session.c.p7 texinfo-6.5.91/info/session.c +--- texinfo-6.5.91/info/session.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/session.c 2019-01-21 10:52:18.458973014 +0100 +@@ -3552,6 +3552,7 @@ DECLARE_INFO_COMMAND (info_goto_invocati if (!line) { info_abort_key (window, 0); @@ -107,10 +85,10 @@ unchanged: return; } if (*line) -unchanged: ---- texinfo-6.4/info/variables.c.def24 2017-05-03 21:48:19.000000000 +0200 -+++ texinfo-6.4/info/variables.c 2018-07-30 12:53:06.692694120 +0200 -@@ -361,6 +361,7 @@ read_variable_name (char *prompt, WINDOW +diff -up texinfo-6.5.91/info/variables.c.p7 texinfo-6.5.91/info/variables.c +--- texinfo-6.5.91/info/variables.c.p7 2019-01-13 12:43:10.000000000 +0100 ++++ texinfo-6.5.91/info/variables.c 2019-01-21 10:52:18.459973015 +0100 +@@ -359,6 +359,7 @@ read_variable_name (char *prompt, WINDOW { char *line; REFERENCE **variables; @@ -118,7 +96,7 @@ unchanged: /* Get the completion array of variable names. */ variables = make_variable_completions_array (); -@@ -384,7 +385,9 @@ read_variable_name (char *prompt, WINDOW +@@ -382,7 +383,9 @@ read_variable_name (char *prompt, WINDOW return NULL; } @@ -129,10 +107,10 @@ unchanged: } /* Make an array of REFERENCE which actually contains the names of the -diff -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install-info.c ---- texinfo-6.4/install-info/install-info.c 2018-07-30 13:47:00.265812976 +0200 -+++ texinfo-6.4/install-info/install-info.c 2018-07-30 13:53:50.427431251 +0200 -@@ -867,10 +867,16 @@ +diff -up texinfo-6.5.91/install-info/install-info.c.p7 texinfo-6.5.91/install-info/install-info.c +--- texinfo-6.5.91/install-info/install-info.c.p7 2019-01-21 10:52:18.447973002 +0100 ++++ texinfo-6.5.91/install-info/install-info.c 2019-01-21 10:52:18.460973016 +0100 +@@ -864,10 +864,16 @@ determine_file_type: char *command = concat (*compression_program, " -d", ""); if (gzclose (f) < 0) @@ -151,7 +129,7 @@ diff -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install p = popen (command, "r"); if (!p) { -@@ -880,6 +886,7 @@ +@@ -877,6 +883,7 @@ determine_file_type: } else *is_pipe = 1; @@ -159,7 +137,7 @@ diff -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install return p; } else -@@ -923,7 +930,10 @@ +@@ -920,7 +927,10 @@ readfile (char *filename, int *sizep, &pipe_p); if (!f) @@ -171,7 +149,7 @@ diff -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install for (;;) { -@@ -983,6 +993,7 @@ +@@ -980,6 +990,7 @@ output_dirfile (char *dirfile, int dir_n { char *command = concat (compression_program, ">", dirfile_tmp); output = popen (command, "w"); @@ -179,7 +157,7 @@ diff -u texinfo-6.4/install-info/install-info.c texinfo-6.4/install-info/install } else output = fopen (dirfile_tmp, "w"); -@@ -1724,6 +1735,8 @@ +@@ -1721,6 +1732,8 @@ reformat_new_entries (struct spec_entry format_entry (name, name_len, desc, desc_len, calign, align, maxwidth, &entry->text, &entry->text_len); diff --git a/texinfo-6.5-fix-for-perl-5.28.patch b/texinfo-6.5-fix-for-perl-5.28.patch deleted file mode 100644 index 77346a8..0000000 --- a/texinfo-6.5-fix-for-perl-5.28.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up texinfo-6.5/tp/Texinfo/Parser.pm.orig texinfo-6.5/tp/Texinfo/Parser.pm ---- texinfo-6.5/tp/Texinfo/Parser.pm.orig 2018-06-12 13:40:29.356030136 +0200 -+++ texinfo-6.5/tp/Texinfo/Parser.pm 2018-06-12 13:41:28.357725639 +0200 -@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$) - } - } elsif ($command eq 'clickstyle') { - # REMACRO -- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { -+ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*/) { - $args = ['@'.$1]; - $self->{'clickstyle'} = $1; - $remaining = $line; -- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; -+ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*(\@(c|comment)((\@|\s+).*)?)?//; - $has_comment = 1 if (defined($4)); - } else { - $self->line_error (sprintf($self->__( diff --git a/texinfo.spec b/texinfo.spec index a04e5a1..a1841f8 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -2,8 +2,8 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 6.5 -Release: 12%{?dist} +Version: 6.6 +Release: 1%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -15,14 +15,10 @@ Patch1: texinfo-6.0-disable-failing-info-test.patch Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch # Patch3: we need to fix template fix-info-dir generates Patch3: info-6.5-sync-fix-info-dir.patch -# Update to 2018-03-10 texinfo.tex -Patch4: texinfo-20180310-texinfo.tex.patch -# rhbz#1592433, bug in fix-info-dir --delete -Patch5: texinfo-6.5-fix-info-dir.patch -# Patch6: rhbz#1590308, fixes test fail with unescaped left brace -Patch6: texinfo-6.5-fix-for-perl-5.28.patch -# Patch7: fixes issues detected by static analysis -Patch7: texinfo-6.5-covscan-fixes.patch +# Patch4: rhbz#1592433, bug in fix-info-dir --delete +Patch4: texinfo-6.5-fix-info-dir.patch +# Patch5: fixes issues detected by static analysis +Patch5: texinfo-6.5-covscan-fixes.patch BuildRequires: gcc BuildRequires: perl-generators @@ -145,6 +141,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Mon Feb 18 2019 Vitezslav Crhonek - 6.6-1 +- Update to texinfo-6.6 + Resolves: #1677911 + * Sun Feb 03 2019 Fedora Release Engineering - 6.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d2cfdf12a76fb30726e342202982260d6dd5f7a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 01:17:47 +0000 Subject: [PATCH 11/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 a1841f8..c2374c1 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.6 -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 @@ -141,6 +141,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Feb 18 2019 Vitezslav Crhonek - 6.6-1 - Update to texinfo-6.6 Resolves: #1677911 From 272a0a07107d3cc1988026d9891d8ec6de03b9a5 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 26 Sep 2019 15:16:02 +0200 Subject: [PATCH 12/48] Update to texinfo-6.7, Move texlive-tex files to more approriate location --- .gitignore | 4 ++-- sources | 4 ++-- texinfo.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d3b8ba7..815816f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/texinfo-6.6.tar.xz -/texinfo-6.6.tar.xz.sig +/texinfo-6.7.tar.xz +/texinfo-6.7.tar.xz.sig diff --git a/sources b/sources index b522b9d..5019262 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-6.6.tar.xz) = 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0 -SHA512 (texinfo-6.6.tar.xz.sig) = b4af1d28e4cc20b6e86255b907542122aa1da423652ea962b885b2f2d1cc135747d12c4eb78a24c25320b981e2448ce87f66bf9ac264527f989dc7439cefd03b +SHA512 (texinfo-6.7.tar.xz) = da55a0d0a760914386393c5e8e864540265d8550dc576f784781a6d72501918e8afce716ff343e5c2a0ce09cf921bfaf0a48ecb49f6182a7d10e920ae3ea17e7 +SHA512 (texinfo-6.7.tar.xz.sig) = 5306769ae7802f5b0643cef82ca7d219e0da922c4706d8802251a6e2f3361b4c244b3b67f3c4a27990b3e5dc75268cc6de6080e76071f74b7dbbcc8b6d3fe407 diff --git a/texinfo.spec b/texinfo.spec index c2374c1..d4bdc0d 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -1,9 +1,9 @@ -%global tex_texinfo %{_datadir}/texmf/tex/texinfo +%global tex_texinfo %{_datadir}/texlive/texmf-dist/tex/texinfo Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 6.6 -Release: 2%{?dist} +Version: 6.7 +Release: 1%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -141,6 +141,12 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Thu Sep 26 2019 Vitezslav Crhonek - 6.7-1 +- Update to texinfo-6.7 + Resolves: #1754648 +- Move texlive-tex files to more approriate location + Resolves: #1719379 + * Sat Jul 27 2019 Fedora Release Engineering - 6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From aec4bacb917aa302429eac7b873991c18d8c4802 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 8 Oct 2019 10:59:17 +0200 Subject: [PATCH 13/48] Revert move of texinfo-tex files --- texinfo.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/texinfo.spec b/texinfo.spec index d4bdc0d..cf8b20f 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -1,9 +1,9 @@ -%global tex_texinfo %{_datadir}/texlive/texmf-dist/tex/texinfo +%global tex_texinfo %{_datadir}/texmf/tex/texinfo Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.7 -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 @@ -141,6 +141,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Tue Oct 08 2019 Vitezslav Crhonek - 6.7-2 +- Revert move of texinfo-tex files + Resolves: #1758817 + * Thu Sep 26 2019 Vitezslav Crhonek - 6.7-1 - Update to texinfo-6.7 Resolves: #1754648 From b722dd0fe0c77b5e4b5bcefaa894a1a4dad85815 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 9 Jan 2020 12:52:56 +0100 Subject: [PATCH 14/48] Fix mode of dir.old --- texinfo.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/texinfo.spec b/texinfo.spec index cf8b20f..e014a17 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -127,7 +127,7 @@ export ALL_TESTS=yes %{_mandir}/man1/install-info.1* %{_mandir}/man5/info.5* %ghost %{_infodir}/dir -%ghost %{_infodir}/dir.old +%ghost %attr(644, root, root) %{_infodir}/dir.old %files tex %{_bindir}/texindex @@ -141,6 +141,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Thu Jan 09 2020 Vitezslav Crhonek - 6.7-3 +- Fix mode of dir.old + * Tue Oct 08 2019 Vitezslav Crhonek - 6.7-2 - Revert move of texinfo-tex files Resolves: #1758817 From f81dc25e16b9bfcedde817cdb816add3efe6ecdf Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Fri, 24 Jan 2020 08:33:37 +0100 Subject: [PATCH 15/48] Update texinfo-tex to make it replacement for texlive-texinfo --- texinfo.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/texinfo.spec b/texinfo.spec index e014a17..95ec6e8 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -1,9 +1,9 @@ -%global tex_texinfo %{_datadir}/texmf/tex/texinfo +%global tex_texinfo %{_datadir}/texlive/texmf-dist/tex/texinfo Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -53,6 +53,8 @@ Requires: texinfo = %{version}-%{release} Requires: tex(tex) tex(epsf.tex) Requires(post): %{_bindir}/texconfig-sys Requires(postun): %{_bindir}/texconfig-sys +Provides: texlive-texinfo +Obsoletes: texlive-texinfo <= 9:2019-15 %description tex Texinfo is a documentation system that can produce both online @@ -141,6 +143,11 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Fri Jan 24 2020 Vitezslav Crhonek - 6.7-4 +- Move texlive-tex files to more approriate location again, this + time in sync with dropping texlive-texinfo from texlive + Resolves: #1719379 + * Thu Jan 09 2020 Vitezslav Crhonek - 6.7-3 - Fix mode of dir.old From 7f8bbbc0f737803f0add542882f5b49ecce57a62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 01:24:12 +0000 Subject: [PATCH 16/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 95ec6e8..47bd263 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.7 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -143,6 +143,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 6.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 24 2020 Vitezslav Crhonek - 6.7-4 - Move texlive-tex files to more approriate location again, this time in sync with dropping texlive-texinfo from texlive From b3e3edaa72a891d1a76537d0693e5d0ac436669d Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 5 Mar 2020 16:00:18 -0500 Subject: [PATCH 17/48] add additional Provides: tex-texinfo --- texinfo.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/texinfo.spec b/texinfo.spec index 47bd263..7c86679 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.7 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -53,6 +53,7 @@ Requires: texinfo = %{version}-%{release} Requires: tex(tex) tex(epsf.tex) Requires(post): %{_bindir}/texconfig-sys Requires(postun): %{_bindir}/texconfig-sys +Provides: tex-texinfo Provides: texlive-texinfo Obsoletes: texlive-texinfo <= 9:2019-15 @@ -143,6 +144,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Wed Mar 5 2020 Tom Callaway - 6.7-6 +- add additional Provides: tex-texinfo ("it's an older code sir, but it checks out") + * Fri Jan 31 2020 Fedora Release Engineering - 6.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8dc36530937d6ec00ffb10d875bd7f6993710b6f Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 5 Mar 2020 16:20:19 -0500 Subject: [PATCH 18/48] fix date in changelog --- texinfo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/texinfo.spec b/texinfo.spec index 7c86679..3235ea8 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -144,7 +144,7 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog -* Wed Mar 5 2020 Tom Callaway - 6.7-6 +* Thu Mar 5 2020 Tom Callaway - 6.7-6 - add additional Provides: tex-texinfo ("it's an older code sir, but it checks out") * Fri Jan 31 2020 Fedora Release Engineering - 6.7-5 From 661a64aeb5b72ec1ffa85cb4c8864815d2777601 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 16 Mar 2020 13:05:05 +0100 Subject: [PATCH 19/48] Add BR: perl(Unicode::Normalize) --- texinfo.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/texinfo.spec b/texinfo.spec index 3235ea8..405f1f9 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.7 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -24,7 +24,7 @@ BuildRequires: gcc BuildRequires: perl-generators BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper) BuildRequires: perl(Locale::Messages), perl(Unicode::EastAsianWidth), perl(Text::Unidecode) -BuildRequires: perl(Storable) +BuildRequires: perl(Storable), perl(Unicode::Normalize) # Texinfo perl packages are not installed in default perl library dirs %global __provides_exclude ^perl\\(.*Texinfo.*\\)$ @@ -144,6 +144,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Mon Mar 16 2020 Jitka Plesnikova - 6.7-7 +- Add BR: perl(Unicode::Normalize) + * Thu Mar 5 2020 Tom Callaway - 6.7-6 - add additional Provides: tex-texinfo ("it's an older code sir, but it checks out") From c543bfe93d8d1c3cf19c3c8298da2e18064ebb28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 12:21:12 +0000 Subject: [PATCH 20/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 405f1f9..61b953c 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.7 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -144,6 +144,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 6.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Mar 16 2020 Jitka Plesnikova - 6.7-7 - Add BR: perl(Unicode::Normalize) From 11a1ead7302954f076f0aade36bb92a22eecbf6e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 22:28:25 +0000 Subject: [PATCH 21/48] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- texinfo.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/texinfo.spec b/texinfo.spec index 61b953c..4f97562 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -20,6 +20,7 @@ Patch4: texinfo-6.5-fix-info-dir.patch # Patch5: fixes issues detected by static analysis Patch5: texinfo-6.5-covscan-fixes.patch +BuildRequires: make BuildRequires: gcc BuildRequires: perl-generators BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper) From 87325d4625edcb96ff78fbc553eb49e85823228b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:50:02 +0000 Subject: [PATCH 22/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 4f97562..97dcba2 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.7 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -145,6 +145,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 6.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 6.7-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ba3d5b7e455fe02166a9d5a238e6e9ae17a3c88d Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 2 Feb 2021 14:42:10 +0100 Subject: [PATCH 23/48] Fix problem in shell code found by ShellCheck in test script --- texinfo-6.7-fix-function-exit.patch | 12 ++++++++++++ texinfo.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 texinfo-6.7-fix-function-exit.patch diff --git a/texinfo-6.7-fix-function-exit.patch b/texinfo-6.7-fix-function-exit.patch new file mode 100644 index 0000000..bacfc3b --- /dev/null +++ b/texinfo-6.7-fix-function-exit.patch @@ -0,0 +1,12 @@ +diff -up texinfo-6.7/tp/tests/run_parser_all.sh.orig texinfo-6.7/tp/tests/run_parser_all.sh +--- texinfo-6.7/tp/tests/run_parser_all.sh.orig 2019-08-25 19:11:47.000000000 +0200 ++++ texinfo-6.7/tp/tests/run_parser_all.sh 2021-02-02 14:36:15.290152957 +0100 +@@ -46,7 +46,7 @@ check_latex2html_and_tex4ht () + if echo "$remaining" | grep '[-]init mediawiki.pm' >/dev/null; then + if test "$no_html2wiki" = 'yes' ; then + echo "S: (no html2wiki) $current" +- continue 2 ++ return 2 + fi + fi + fi diff --git a/texinfo.spec b/texinfo.spec index 97dcba2..1c77ffd 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.7 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -19,6 +19,8 @@ Patch3: info-6.5-sync-fix-info-dir.patch Patch4: texinfo-6.5-fix-info-dir.patch # Patch5: fixes issues detected by static analysis Patch5: texinfo-6.5-covscan-fixes.patch +# Patch6: fixes issue found by ShellCheck in test script +Patch6: texinfo-6.7-fix-function-exit.patch BuildRequires: make BuildRequires: gcc @@ -145,6 +147,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Tue Feb 02 2021 Vitezslav Crhonek - 6.7-10 +- Fix problem in shell code found by ShellCheck in test script + * Wed Jan 27 2021 Fedora Release Engineering - 6.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 1b55a36f7e3cc4773eb1982f8c50fe845de95cf7 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 14 Jun 2021 14:23:18 +0200 Subject: [PATCH 24/48] Fix install path of install-info --- texinfo.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/texinfo.spec b/texinfo.spec index 1c77ffd..e1c4eaf 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.7 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -44,6 +44,7 @@ are going to write documentation for the GNU Project. %package -n info Summary: A stand-alone TTY-based reader for GNU texinfo documentation +Provides: /sbin/install-info %description -n info The GNU project uses the texinfo file format for much of its @@ -86,7 +87,8 @@ mkdir -p ${RPM_BUILD_ROOT}/sbin mkdir -p $RPM_BUILD_ROOT%{tex_texinfo} install -p -m644 doc/texinfo.tex doc/txi-??.tex $RPM_BUILD_ROOT%{tex_texinfo} -mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin +mkdir -p $RPM_BUILD_ROOT%{_sbindir} +mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT%{_sbindir} install -Dpm0755 -t %{buildroot}%{_sbindir} contrib/fix-info-dir @@ -127,7 +129,7 @@ export ALL_TESTS=yes %license COPYING %{_bindir}/info %{_infodir}/info-stnd.info* -/sbin/install-info +%{_sbindir}/install-info %{_sbindir}/fix-info-dir %{_mandir}/man1/info.1* %{_mandir}/man1/install-info.1* @@ -147,6 +149,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Mon Jun 14 2021 Vitezslav Crhonek - 6.7-11 +- Fix install path of install-info + * Tue Feb 02 2021 Vitezslav Crhonek - 6.7-10 - Fix problem in shell code found by ShellCheck in test script From 9b2cca4817fa4bd8d520fed05e9560fc7183dcdf Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 20 Jul 2021 12:25:21 +0200 Subject: [PATCH 25/48] Update to texinfo-6.8 Signed-off-by: Vitezslav Crhonek --- .gitignore | 4 +- sources | 4 +- texinfo-4.12-zlib.patch | 236 --------------------------- texinfo-6.5-covscan-fixes.patch | 143 ++-------------- texinfo-6.7-fix-function-exit.patch | 12 -- texinfo-6.8-undo-gnulib-nonnul.patch | 182 +++++++++++++++++++++ texinfo.spec | 38 +++-- 7 files changed, 217 insertions(+), 402 deletions(-) delete mode 100644 texinfo-4.12-zlib.patch delete mode 100644 texinfo-6.7-fix-function-exit.patch create mode 100644 texinfo-6.8-undo-gnulib-nonnul.patch diff --git a/.gitignore b/.gitignore index 815816f..108f7be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/texinfo-6.7.tar.xz -/texinfo-6.7.tar.xz.sig +/texinfo-6.8.tar.xz +/texinfo-6.8.tar.xz.sig diff --git a/sources b/sources index 5019262..8653407 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-6.7.tar.xz) = da55a0d0a760914386393c5e8e864540265d8550dc576f784781a6d72501918e8afce716ff343e5c2a0ce09cf921bfaf0a48ecb49f6182a7d10e920ae3ea17e7 -SHA512 (texinfo-6.7.tar.xz.sig) = 5306769ae7802f5b0643cef82ca7d219e0da922c4706d8802251a6e2f3361b4c244b3b67f3c4a27990b3e5dc75268cc6de6080e76071f74b7dbbcc8b6d3fe407 +SHA512 (texinfo-6.8.tar.xz) = 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909 +SHA512 (texinfo-6.8.tar.xz.sig) = 3b41ddf6b5a04c7f5fe1b4708a76f96b042cc3da0c786a2858d16c3db62d5506cc56e66199f69df92a6f039d42a8d670455f24f4c94056a9c0f500dfad51fabf diff --git a/texinfo-4.12-zlib.patch b/texinfo-4.12-zlib.patch deleted file mode 100644 index 78ef437..0000000 --- a/texinfo-4.12-zlib.patch +++ /dev/null @@ -1,236 +0,0 @@ -diff -up texinfo-6.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-info/install-info.c ---- texinfo-6.5.91/install-info/install-info.c.orig 2019-01-13 12:43:10.000000000 +0100 -+++ texinfo-6.5.91/install-info/install-info.c 2019-01-14 09:31:45.322849494 +0100 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - #define TAB_WIDTH 8 - -@@ -681,15 +682,15 @@ The first time you invoke Info you start - - Return either stdin reading the file, or a non-stdin pipe reading - the output of the compression program. */ --FILE * -+void * - open_possibly_compressed_file (char *filename, - void (*create_callback) (char *), -- char **opened_filename, char **compression_program) -+ char **opened_filename, char **compression_program, int *is_pipe) - { - char *local_opened_filename, *local_compression_program; - int nread; - char data[13]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it's easier - to always determine it. */ -@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *fil - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -754,7 +755,7 @@ open_possibly_compressed_file (char *fil - (*create_callback) (filename); - - /* And try opening it again. */ -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; - } -@@ -764,26 +765,26 @@ open_possibly_compressed_file (char *fil - - /* Read first few bytes of file rather than relying on the filename. - If the file is shorter than this it can't be usable anyway. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { -- if (nread == 0) -+ if (nread >= 0) - { - /* Try to create the file if its empty. */ -- if (feof (f) && create_callback) -+ if (gzeof (f) && create_callback) - { -- if (fclose (f) != 0) -+ if (gzclose (f) < 0) - return 0; /* unknown error closing file */ - - if (remove (filename) != 0) - return 0; /* unknown error deleting file */ - - (*create_callback) (filename); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; -- nread = fread (data, sizeof (data), 1, f); -- if (nread == 0) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread <= 0) - return 0; - goto determine_file_type; /* success */ - } -@@ -854,35 +855,40 @@ determine_file_type: - *compression_program = NULL; - - /* Seek back over the magic bytes. */ -- if (fseek (f, 0, 0) < 0) -+ if (gzseek (f, 0, SEEK_SET) == -1) - return 0; - - if (*compression_program) - { /* It's compressed, so open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program, " -d", ""); - -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - return 0; -- f = freopen (*opened_filename, FOPEN_RBIN, stdin); -- if (!f) -+ p = freopen (*opened_filename, FOPEN_RBIN, stdin); -+ if (!p) - return 0; -- f = popen (command, "r"); -- if (!f) -+ p = popen (command, "r"); -+ if (!p) - { - /* Used for error message in calling code. */ - *opened_filename = command; - return 0; - } -+ else -+ *is_pipe = 1; -+ return p; - } - else - { --#if O_BINARY -+#if 0 && O_BINARY - /* Since this is a text file, and we opened it in binary mode, - switch back to text mode. */ - f = freopen (*opened_filename, "r", f); - if (! f) - return 0; - #endif -+ *is_pipe = 0; - } - - return f; -@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, - void (*create_callback) (char *), char **opened_filename, - char **compression_program) - { -- FILE *f; -+ void *f; -+ int pipe_p; - int filled = 0; - int data_size = 8192; - char *data = xmalloc (data_size); -@@ -909,14 +916,20 @@ readfile (char *filename, int *sizep, - /* If they passed the space for the file name to return, use it. */ - f = open_possibly_compressed_file (filename, create_callback, - opened_filename, -- compression_program); -+ compression_program, -+ &pipe_p); - - if (!f) - return 0; - - for (;;) - { -- int nread = fread (data + filled, 1, data_size - filled, f); -+ int nread; -+ -+ if (pipe_p) -+ nread = fread (data + filled, 1, data_size - filled, f); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - return 0; - if (nread == 0) -@@ -935,8 +948,10 @@ readfile (char *filename, int *sizep, - /* We need to close the stream, since on some systems the pipe created - by popen is simulated by a temporary file which only gets removed - inside pclose. */ -- if (f != stdin) -+ if (pipe_p) - pclose (f); -+ else -+ gzclose (f); - - *sizep = filled; - return data; -diff -up texinfo-6.5.91/install-info/Makefile.in.orig texinfo-6.5.91/install-info/Makefile.in ---- texinfo-6.5.91/install-info/Makefile.in.orig 2019-01-14 09:32:31.729895052 +0100 -+++ texinfo-6.5.91/install-info/Makefile.in 2019-01-14 09:32:52.574914503 +0100 -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) diff --git a/texinfo-6.5-covscan-fixes.patch b/texinfo-6.5-covscan-fixes.patch index 522d511..63e5167 100644 --- a/texinfo-6.5-covscan-fixes.patch +++ b/texinfo-6.5-covscan-fixes.patch @@ -1,17 +1,6 @@ -diff -up texinfo-6.5.91/contrib/fix-info-dir.p7 texinfo-6.5.91/contrib/fix-info-dir ---- texinfo-6.5.91/contrib/fix-info-dir.p7 2019-01-21 10:52:18.453973008 +0100 -+++ texinfo-6.5.91/contrib/fix-info-dir 2019-01-21 10:52:18.456973012 +0100 -@@ -28,7 +28,6 @@ if test -z "$LINENO"; then - fi - - MENU_BEGIN='^\*\([ ]\)\{1,\}Menu:' --MENU_ITEM='^\* ([^ ]).*:([ ])+\(' - MENU_FILTER1='s/^\*\([ ]\)\{1,\}/* /' - MENU_FILTER2='s/\([ ]\)\{1,\}$//g' - -diff -up texinfo-6.5.91/info/infomap.c.p7 texinfo-6.5.91/info/infomap.c ---- texinfo-6.5.91/info/infomap.c.p7 2019-01-13 12:43:10.000000000 +0100 -+++ texinfo-6.5.91/info/infomap.c 2019-01-21 10:52:18.457973013 +0100 +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) compile (inf, filename, &sup_info, &sup_ea); @@ -20,74 +9,9 @@ diff -up texinfo-6.5.91/info/infomap.c.p7 texinfo-6.5.91/info/infomap.c return 1; } -diff -up texinfo-6.5.91/info/makedoc.c.p7 texinfo-6.5.91/info/makedoc.c ---- texinfo-6.5.91/info/makedoc.c.p7 2019-01-13 12:43:10.000000000 +0100 -+++ texinfo-6.5.91/info/makedoc.c 2019-01-21 10:52:18.457973013 +0100 -@@ -425,7 +425,11 @@ process_one_file (char *filename, FILE * - - offset++; - if (offset >= file_size) -- break; -+ { -+ free (func_name); -+ free (func); -+ break; -+ } - - doc = xmalloc (1 + (offset - point)); - strncpy (doc, buffer + point, offset - point); -diff -up texinfo-6.5.91/info/m-x.c.p7 texinfo-6.5.91/info/m-x.c ---- texinfo-6.5.91/info/m-x.c.p7 2019-01-13 12:43:10.000000000 +0100 -+++ texinfo-6.5.91/info/m-x.c 2019-01-21 10:52:18.457973013 +0100 -@@ -79,7 +79,10 @@ DECLARE_INFO_COMMAND (describe_command, - InfoCommand *cmd = named_function (line); - - if (!cmd) -- return; -+ { -+ free (line); -+ return; -+ } - - window_message_in_echo_area ("%s: %s.", - line, function_documentation (cmd)); -diff -up texinfo-6.5.91/info/nodes.c.p7 texinfo-6.5.91/info/nodes.c ---- texinfo-6.5.91/info/nodes.c.p7 2019-01-13 12:43:10.000000000 +0100 -+++ texinfo-6.5.91/info/nodes.c 2019-01-21 10:52:18.457973013 +0100 -@@ -303,7 +303,10 @@ get_nodes_of_tags_table (FILE_BUFFER *fi - for (p = 0; nodedef[p] && nodedef[p] != INFO_TAGSEP; p++) - ; - if (nodedef[p] != INFO_TAGSEP) -- continue; -+ { -+ free (entry); -+ continue; -+ } - - entry->nodename = xmalloc (p + 1); - strncpy (entry->nodename, nodedef, p); -@@ -477,6 +480,7 @@ get_tags_of_indirect_tags_table (FILE_BU - } - file_buffer->subfiles = NULL; - free_file_buffer_tags (file_buffer); -+ free (subfiles); - return; - } - -diff -up texinfo-6.5.91/info/session.c.p7 texinfo-6.5.91/info/session.c ---- texinfo-6.5.91/info/session.c.p7 2019-01-13 12:43:10.000000000 +0100 -+++ texinfo-6.5.91/info/session.c 2019-01-21 10:52:18.458973014 +0100 -@@ -3552,6 +3552,7 @@ DECLARE_INFO_COMMAND (info_goto_invocati - if (!line) - { - info_abort_key (window, 0); -+ free (default_program_name); - return; - } - if (*line) -diff -up texinfo-6.5.91/info/variables.c.p7 texinfo-6.5.91/info/variables.c ---- texinfo-6.5.91/info/variables.c.p7 2019-01-13 12:43:10.000000000 +0100 -+++ texinfo-6.5.91/info/variables.c 2019-01-21 10:52:18.459973015 +0100 +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 @@ -359,6 +359,7 @@ read_variable_name (char *prompt, WINDOW { char *line; @@ -107,57 +31,10 @@ diff -up texinfo-6.5.91/info/variables.c.p7 texinfo-6.5.91/info/variables.c } /* Make an array of REFERENCE which actually contains the names of the -diff -up texinfo-6.5.91/install-info/install-info.c.p7 texinfo-6.5.91/install-info/install-info.c ---- texinfo-6.5.91/install-info/install-info.c.p7 2019-01-21 10:52:18.447973002 +0100 -+++ texinfo-6.5.91/install-info/install-info.c 2019-01-21 10:52:18.460973016 +0100 -@@ -864,10 +864,16 @@ determine_file_type: - char *command = concat (*compression_program, " -d", ""); - - if (gzclose (f) < 0) -- return 0; -+ { -+ free (command); -+ return 0; -+ } - p = freopen (*opened_filename, FOPEN_RBIN, stdin); - if (!p) -- return 0; -+ { -+ free (command); -+ return 0; -+ } - p = popen (command, "r"); - if (!p) - { -@@ -877,6 +883,7 @@ determine_file_type: - } - else - *is_pipe = 1; -+ free (command); - return p; - } - else -@@ -920,7 +927,10 @@ readfile (char *filename, int *sizep, - &pipe_p); - - if (!f) -- return 0; -+ { -+ free (data); -+ return 0; -+ } - - for (;;) - { -@@ -980,6 +990,7 @@ output_dirfile (char *dirfile, int dir_n - { - char *command = concat (compression_program, ">", dirfile_tmp); - output = popen (command, "w"); -+ free (command); - } - else - output = fopen (dirfile_tmp, "w"); -@@ -1721,6 +1732,8 @@ reformat_new_entries (struct spec_entry +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); diff --git a/texinfo-6.7-fix-function-exit.patch b/texinfo-6.7-fix-function-exit.patch deleted file mode 100644 index bacfc3b..0000000 --- a/texinfo-6.7-fix-function-exit.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up texinfo-6.7/tp/tests/run_parser_all.sh.orig texinfo-6.7/tp/tests/run_parser_all.sh ---- texinfo-6.7/tp/tests/run_parser_all.sh.orig 2019-08-25 19:11:47.000000000 +0200 -+++ texinfo-6.7/tp/tests/run_parser_all.sh 2021-02-02 14:36:15.290152957 +0100 -@@ -46,7 +46,7 @@ check_latex2html_and_tex4ht () - if echo "$remaining" | grep '[-]init mediawiki.pm' >/dev/null; then - if test "$no_html2wiki" = 'yes' ; then - echo "S: (no html2wiki) $current" -- continue 2 -+ return 2 - fi - fi - fi diff --git a/texinfo-6.8-undo-gnulib-nonnul.patch b/texinfo-6.8-undo-gnulib-nonnul.patch new file mode 100644 index 0000000..ef60038 --- /dev/null +++ b/texinfo-6.8-undo-gnulib-nonnul.patch @@ -0,0 +1,182 @@ +diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h +--- texinfo-6.8/gnulib/lib/cdefs.h.orig 2021-03-11 19:57:53.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/cdefs.h 2021-07-19 12:26:46.985176475 +0200 +@@ -321,15 +321,15 @@ + + /* The nonnull function attribute marks pointer parameters that + must not be NULL. */ +-#ifndef __attribute_nonnull__ ++#ifndef __nonnull + # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) +-# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) ++# define __nonnull(params) __attribute__ ((__nonnull__ params)) + # else +-# define __attribute_nonnull__(params) ++# define __nonnull(params) + # endif +-#endif +-#ifndef __nonnull +-# define __nonnull(params) __attribute_nonnull__ (params) ++#elif !defined __GLIBC__ ++# undef __nonnull ++# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params) + #endif + + /* If fortification mode, we warn about unused results of certain +diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h +--- texinfo-6.8/gnulib/lib/libc-config.h.orig 2021-03-11 19:57:54.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/libc-config.h 2021-07-19 12:27:58.810590975 +0200 +@@ -33,9 +33,9 @@ + #include + + /* On glibc this includes and and #defines +- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and +- DragonFlyBSD 5.9 it includes which defines __nonnull. +- Elsewhere it is harmless. */ ++ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it ++ includes which defines __nonnull. Elsewhere it ++ is harmless. */ + #include + + /* From glibc . */ +diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c +--- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-03-11 19:57:54.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c 2021-07-19 12:24:46.878419397 +0200 +@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY + + /* Initialize a dynamic array object. This must be called before any + use of the object. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static void + DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list) + { +@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST + } + + /* Deallocate the dynamic array and its elements. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_FREE (struct DYNARRAY_STRUCT *list) + { +@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l + } + + /* Return true if the dynamic array is in an error state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline bool + DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list) + { +@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct + + /* Mark the dynamic array as failed. All elements are deallocated as + a side effect. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static void + DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list) + { +@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA + + /* Return the number of elements which have been added to the dynamic + array. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline size_t + DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list) + { +@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR + + /* Return a pointer to the array element at INDEX. Terminate the + process if INDEX is out of bounds. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index) + { +@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU + /* Return a pointer to the first array element, if any. For a + zero-length array, the pointer can be NULL even though the dynamic + array has not entered the failure state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list) + { +@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S + /* Return a pointer one element past the last array element. For a + zero-length array, the pointer can be NULL even though the dynamic + array has not entered the failure state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list) + { +@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S + /* Add ITEM at the end of the array, enlarging it by one element. + Mark *LIST as failed if the dynamic array allocation size cannot be + increased. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline void + DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item) + { +@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR + /* Allocate a place for a new element in *LIST and return a pointer to + it. The pointer can be NULL if the dynamic array cannot be + enlarged due to a memory allocation failure. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) + static + /* Avoid inlining with the larger initialization code. */ + #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE)) +@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY + existing size, new elements are added (which can be initialized). + Otherwise, the list is truncated, and elements are freed. Return + false on memory allocation failure (and mark *LIST as failed). */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static bool + DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size) + { +@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_ + } + + /* Remove the last element of LIST if it is present. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list) + { +@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA + + /* Remove all elements from the list. The elements are freed, but the + list itself is not. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list) + { +@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S + stored in *RESULT if LIST refers to an empty list. On success, the + pointer in *RESULT is heap-allocated and must be deallocated using + free. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1, 2)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2)) + static bool + DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, + DYNARRAY_FINAL_TYPE *result) +@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA + have a sentinel at the end). If LENGTHP is not NULL, the array + length is written to *LENGTHP. *LIST is re-initialized and can be + reused. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) + static DYNARRAY_ELEMENT * + DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp) + { diff --git a/texinfo.spec b/texinfo.spec index e1c4eaf..10bcfad 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -2,32 +2,32 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 6.7 -Release: 11%{?dist} +Version: 6.8 +Release: 1%{?dist} License: GPLv3+ 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 -Patch0: texinfo-4.12-zlib.patch -# Patch1: this is needed just for koji/mock, all tests pass fine in local build -Patch1: texinfo-6.0-disable-failing-info-test.patch -# Patch2: rhbz#1348671, because of OSTree -Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch -# Patch3: we need to fix template fix-info-dir generates -Patch3: info-6.5-sync-fix-info-dir.patch -# Patch4: rhbz#1592433, bug in fix-info-dir --delete -Patch4: texinfo-6.5-fix-info-dir.patch -# Patch5: fixes issues detected by static analysis -Patch5: texinfo-6.5-covscan-fixes.patch -# Patch6: fixes issue found by ShellCheck in test script -Patch6: texinfo-6.7-fix-function-exit.patch +# Patch0: this is needed just for koji/mock, all tests pass fine in local build +Patch0: texinfo-6.0-disable-failing-info-test.patch +# Patch1: rhbz#1348671, because of OSTree +Patch1: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch +# Patch2: we need to fix template fix-info-dir generates +Patch2: info-6.5-sync-fix-info-dir.patch +# Patch3: rhbz#1592433, bug in fix-info-dir --delete +Patch3: texinfo-6.5-fix-info-dir.patch +# Patch4: fixes issues detected by static analysis +Patch4: texinfo-6.5-covscan-fixes.patch +# Patch5: undos change done in gnulib that causes build to fail +# https://lists.gnu.org/r/bug-gnulib/2021-03/msg00066.html +Patch5: texinfo-6.8-undo-gnulib-nonnul.patch BuildRequires: make BuildRequires: gcc BuildRequires: perl-generators -BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper) +BuildRequires: ncurses-devel, help2man, perl(Data::Dumper) BuildRequires: perl(Locale::Messages), perl(Unicode::EastAsianWidth), perl(Text::Unidecode) -BuildRequires: perl(Storable), perl(Unicode::Normalize) +BuildRequires: perl(Storable), perl(Unicode::Normalize), perl(File::Copy) # Texinfo perl packages are not installed in default perl library dirs %global __provides_exclude ^perl\\(.*Texinfo.*\\)$ @@ -149,6 +149,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Tue Jul 20 2021 Vitezslav Crhonek - 6.8-1 +- Update to texinfo-6.8 + Resolves: #1978903 + * Mon Jun 14 2021 Vitezslav Crhonek - 6.7-11 - Fix install path of install-info From ee6558d66d566aba83bdc174c6a8ee144e9ae0f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:07:58 +0000 Subject: [PATCH 26/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 10bcfad..8e315b6 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.8 -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 @@ -149,6 +149,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 6.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jul 20 2021 Vitezslav Crhonek - 6.8-1 - Update to texinfo-6.8 Resolves: #1978903 From bb8b141da63fdfb092da0ef2246e3ee8d388ae08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 02:34:34 +0000 Subject: [PATCH 27/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 8e315b6..dba49d7 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -149,6 +149,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 6.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 6.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 9eb5f8c43b21690e75d1b02a6078d94fbb8af7b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 10:21:00 +0000 Subject: [PATCH 28/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 dba49d7..dff4a36 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 6.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -149,6 +149,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 6.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 6.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0878f5c1988bbd8f654341aaf480c8685a74ac57 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Fri, 18 Nov 2022 10:08:31 +0100 Subject: [PATCH 29/48] Update to texinfo-7.0 Signed-off-by: Vitezslav Crhonek --- .gitignore | 2 + fix-info-dir | 316 ++++++++++++++++++++ sources | 4 +- texinfo-6.0-disable-failing-info-test.patch | 25 -- texinfo-6.8-undo-gnulib-nonnul.patch | 182 ----------- texinfo.spec | 37 ++- 6 files changed, 341 insertions(+), 225 deletions(-) create mode 100755 fix-info-dir delete mode 100644 texinfo-6.0-disable-failing-info-test.patch delete mode 100644 texinfo-6.8-undo-gnulib-nonnul.patch diff --git a/.gitignore b/.gitignore index 108f7be..7a40bab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /texinfo-6.8.tar.xz /texinfo-6.8.tar.xz.sig +/texinfo-7.0.tar.xz +/texinfo-7.0.tar.xz.sig diff --git a/fix-info-dir b/fix-info-dir new file mode 100755 index 0000000..0659552 --- /dev/null +++ b/fix-info-dir @@ -0,0 +1,316 @@ +#!/bin/sh +#fix-info-dir (GNU texinfo) +VERSION=1.1 +#Copyright (C) 1998, 2003 Free Software Foundation, Inc. +#fix-info-dir comes with NO WARRANTY, to the extent permitted by law. +#You may redistribute copies of fix-info-dir +#under the terms of the GNU General Public License. +#For more information about these matters, see the files named COPYING." +#fix-info-dir was derived from update-info and gen-dir-node +# The skeleton file contains info topic names in the +# order they should appear in the output. There are three special +# lines that alter the behavior: a line consisting of just "--" causes +# the next line to be echoed verbatim to the output. A line +# containing just "%%" causes all the remaining filenames (wildcards +# allowed) in the rest of the file to be ignored. A line containing +# just "!!" exits the script when reached (unless preceded by a line +# containing just "--"). +#Author: Richard L. Hawes, rhawes@dmapub.dma.org. + +# ###SECTION 1### Constants +set -h 2>/dev/null +# ENVIRONMENT +if test -z "$TMPDIR"; then + TMPDIR="/usr/tmp" +fi +if test -z "$LINENO"; then + LINENO="0" +fi + +MENU_BEGIN='^\*\([ ]\)\{1,\}Menu:' +MENU_FILTER1='s/^\*\([ ]\)\{1,\}/* /' +MENU_FILTER2='s/\([ ]\)\{1,\}$//g' + +TMP_FILE1="${TMPDIR}/fx${$}.info" +TMP_FILE2="${TMPDIR}/fy${$}.info" +TMP_FILE_LIST="$TMP_FILE1 $TMP_FILE2" + +TRY_HELP_MSG="Try --help for more information" + +# ###SECTION 100### main program +#variables set by options +CREATE_NODE="" +DEBUG=":" +MODE="" +# +Total="0" +Changed="" + +while test "$*"; do + case "$1" in + -c|--create) CREATE_NODE="y";; + --debug) set -eux; DEBUG="set>&2";; + -d|--delete) MODE="Detect_Invalid";; + +d);; + --version) +cat<&2 + echo "$TRY_HELP_MSG">&2 + exit 2;; + *) break;; + esac + shift +done + +ORIGINAL_DIR=`pwd` + +if test "$#" -gt "0"; then + INFO_DIR="$1" + shift +else + INFO_DIR=$DEFAULT_INFO_DIR +fi + +if test ! -d "${INFO_DIR}"; then + DIR_FILE=`basename ${INFO_DIR}`; + INFO_DIR=`dirname ${INFO_DIR}`; +else + DIR_FILE="dir" +fi + +cd "$INFO_DIR"||exit + + +if test "$CREATE_NODE"; then + if test "$#" -gt "0"; then + if test `expr $1 : /` = '1'; then + SKELETON="$1" + else + SKELETON="$ORIGINAL_DIR/$1" + fi + if test ! -r "$SKELETON" && test -f "$SKELETON"; then + echo "$0:$LINENO: $SKELETON is not readable">&2 + exit 2 + fi + shift + else + SKELETON=/dev/null + + fi +else + if test ! -f "$DIR_FILE"; then + echo "$0:$LINENO: $DIR_FILE is irregular or nonexistant">&2 + exit 2 + elif test ! -r "$DIR_FILE"; then + echo "$0:$LINENO: $DIR_FILE is not readable">&2 + exit 2 + elif test ! -w "$DIR_FILE"; then + echo "$0:$LINENO: $DIR_FILE is not writeable">&2 + exit 2 + fi +fi + +if test "$#" -gt "0"; then + echo "$0:$LINENO: Too many parameters">&2 + echo "$TRY_HELP_MSG">&2 + exit 2 +fi + +if test -f "$DIR_FILE"; then + cp "$DIR_FILE" "$DIR_FILE.old" + echo "Backed up $DIR_FILE to $DIR_FILE.old." +fi + +if test "$CREATE_NODE"; then + if test "$MODE"; then + echo "$0:$LINENO: ERROR: Illogical option combination: -d -c">&2 + echo "$TRY_HELP_MSG">&2 + exit 2 + fi + echo "Creating new Info Node: `pwd`/$DIR_FILE" + Changed="y" + +{ + + ### output the dir header + echo "-*- Text -*-" + echo "This file was generated automatically by $0." + echo "This version was generated on `date`" + echo "by `whoami`@`hostname` for `pwd`" + + cat<" visits the Emacs topic, etc. + + In Emacs, you can click mouse button 2 on a menu item or cross reference + to select it. + +* Menu: The list of major topics begins on the next line. + +DIR_FILE_END_OF_FILE + +### go through the list of files in the skeleton. If an info file +### exists, grab the ENTRY information from it. If an entry exists +### use it, otherwise create a minimal $DIR_FILE entry. + + # Read one line from the file. This is so that we can echo lines with + # whitespace and quoted characters in them. + while read fileline; do + # flag fancy features + if test ! -z "$echoline"; then # echo line + echo "$fileline" + echoline="" + continue + elif test "${fileline}" = "--"; then + # echo the next line + echoline="1" + continue + elif test "${fileline}" = "%%"; then + # skip remaining files listed in skeleton file + skip="1" + continue + elif test "${fileline}" = "!!"; then + # quit now + break + fi + + # handle files if they exist + for file in $fileline""; do + fname= + if test -z "$file"; then + break + fi + # Find the file to operate upon. + if test -r "$file"; then + fname="$file" + elif test -r "${file}.info"; then + fname="${file}.info" + elif test -r "${file}.gz"; then + fname="${file}.gz" + elif test -r "${file}.info.gz"; then + fname="${file}.info.gz" + else + echo "$0:$LINENO: can't find info file for ${file}?">&2 + continue + fi + + # if we found something and aren't skipping, do the entry + if test "$skip"; then + continue + fi + + infoname=`echo $file|sed -e 's/.info$//'` + entry=`zcat -f $fname|\ + sed -e '1,/START-INFO-DIR-ENTRY/d'\ + -e '/END-INFO-DIR-ENTRY/,$d'` + if [ ! -z "${entry}" ]; then + echo "${entry}" + else + echo "* ${infoname}: (${infoname})." + fi + Total=`expr "$Total" + "1"` + done + done +}>$DIR_FILE<$SKELETON +fi + +trap ' eval "$DEBUG"; rm -f $TMP_FILE_LIST; exit ' 0 +trap ' rm -f $TMP_FILE_LIST + exit ' 1 +trap ' rm -f $TMP_FILE_LIST + echo "$0:$LINENO: received INT signal.">&2 + exit ' 2 +trap ' rm -f $TMP_FILE_LIST + echo "$0:$LINENO: received QUIT signal.">&2 + exit ' 3 + +sed -e "1,/$MENU_BEGIN/d" -e "$MENU_FILTER1" -e "$MENU_FILTER2"<$DIR_FILE\ +|sed -n -e '/\* /{ +s/).*$//g +s/\.gz$// +s/\.info$// +s/^.*(//p +}'|sort -u>$TMP_FILE1 +ls -F|sed -e '/\/$/d' -e '/[-.][0-9]/d'\ + -e "/^$DIR_FILE\$/d" -e "/^$DIR_FILE.old\$/d"\ + -e 's/[*@]$//' -e 's/\.gz$//' -e 's/\.info$//'|sort>$TMP_FILE2 + +if test -z "$MODE"; then + #Detect Missing + DONE_MSG="total menu item(s) were inserted into `pwd`/$DIR_FILE" + for Info_Name in `comm -13 $TMP_FILE1 $TMP_FILE2`; do + if test -r "$Info_Name"; then + Info_File="$Info_Name" + elif test -r "${Info_Name}.info"; then + Info_File="${Info_Name}.info" + elif test -r "${Info_Name}.gz"; then + Info_File="${Info_Name}.gz" + elif test -r "${Info_Name}.info.gz"; then + Info_File="${Info_Name}.info.gz" + else + echo "$0:$LINENO: can't find info file for ${Info_Name}?">&2 + continue + fi + Changed="y" + if install-info $Info_File $DIR_FILE; then + Total=`expr "$Total" + "1"` + fi + done +else + # Detect Invalid + DONE_MSG="total invalid menu item(s) were removed from `pwd`/$DIR_FILE" + for Info_Name in `comm -23 $TMP_FILE1 $TMP_FILE2`; do + Changed="y" + if install-info --remove $Info_Name $DIR_FILE; then + Total=`expr "$Total" + "1"` + fi + done +fi + +# print summary +if test "$Changed"; then + echo "$Total $DONE_MSG" +else + echo "Nothing to do" +fi +rm -f $TMP_FILE_LIST +eval "$DEBUG" +exit 0 diff --git a/sources b/sources index 8653407..9b93b35 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-6.8.tar.xz) = 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909 -SHA512 (texinfo-6.8.tar.xz.sig) = 3b41ddf6b5a04c7f5fe1b4708a76f96b042cc3da0c786a2858d16c3db62d5506cc56e66199f69df92a6f039d42a8d670455f24f4c94056a9c0f500dfad51fabf +SHA512 (texinfo-7.0.tar.xz) = 99f691515a3c43c76eca7dd78e8a79108ec8d64ebb2a677bb0473e5a67da50ebdf14d9c5428ebe7618f6cba435e6a4c42079ad2f5665371b06585f2fd28d695e +SHA512 (texinfo-7.0.tar.xz.sig) = a56452b91c73dc692d2793618ce7b9ac25df7f5a200ad9035b830942edddf301038cf214a55f397e0a28052eb41b5d17fc927129374e624b2ebf4abfa1310703 diff --git a/texinfo-6.0-disable-failing-info-test.patch b/texinfo-6.0-disable-failing-info-test.patch deleted file mode 100644 index 5a8b72a..0000000 --- a/texinfo-6.0-disable-failing-info-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up texinfo-6.5.92/install-info/tests/Makefile.in.orig texinfo-6.5.92/install-info/tests/Makefile.in ---- texinfo-6.5.92/install-info/tests/Makefile.in.orig 2019-02-01 16:16:49.000000000 +0100 -+++ texinfo-6.5.92/install-info/tests/Makefile.in 2019-02-18 10:33:52.078877104 +0100 -@@ -1229,8 +1229,8 @@ ii-0021-test ii-0022-test ii-0023-test i - ii-0026-test ii-0027-test ii-0028-test ii-0029-test ii-0030-test \ - ii-0031-test ii-0032-test ii-0033-test ii-0034-test ii-0035-test \ - ii-0036-test ii-0037-test ii-0038-test ii-0039-test ii-0040-test \ --ii-0041-test ii-0042-test ii-0043-test ii-0044-test ii-0045-test \ --ii-0046-test ii-0047-test ii-0048-test ii-0049-test ii-0050-test \ -+ii-0042-test ii-0043-test ii-0044-test ii-0045-test \ -+ii-0046-test ii-0047-test ii-0048-test ii-0049-test \ - ii-0051-test ii-0052-test ii-0053-test ii-0054-test ii-0055-test \ - ii-0056-test ii-0057-test - -diff -up texinfo-6.5.92/tp/tests/Makefile.in.orig texinfo-6.5.92/tp/tests/Makefile.in ---- texinfo-6.5.92/tp/tests/Makefile.in.orig 2019-02-01 16:16:50.000000000 +0100 -+++ texinfo-6.5.92/tp/tests/Makefile.in 2019-02-18 10:33:13.774827269 +0100 -@@ -1374,7 +1374,6 @@ one_test_files_generated_list = \ - test_scripts/layout_formatting_html32.sh \ - test_scripts/layout_formatting_regions.sh \ - test_scripts/layout_formatting_exotic.sh \ -- test_scripts/layout_formatting_fr_icons.sh \ - test_scripts/layout_formatting_chm.sh \ - test_scripts/layout_formatting_nodes.sh \ - test_scripts/layout_formatting.sh \ diff --git a/texinfo-6.8-undo-gnulib-nonnul.patch b/texinfo-6.8-undo-gnulib-nonnul.patch deleted file mode 100644 index ef60038..0000000 --- a/texinfo-6.8-undo-gnulib-nonnul.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h ---- texinfo-6.8/gnulib/lib/cdefs.h.orig 2021-03-11 19:57:53.000000000 +0100 -+++ texinfo-6.8/gnulib/lib/cdefs.h 2021-07-19 12:26:46.985176475 +0200 -@@ -321,15 +321,15 @@ - - /* The nonnull function attribute marks pointer parameters that - must not be NULL. */ --#ifndef __attribute_nonnull__ -+#ifndef __nonnull - # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) --# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) -+# define __nonnull(params) __attribute__ ((__nonnull__ params)) - # else --# define __attribute_nonnull__(params) -+# define __nonnull(params) - # endif --#endif --#ifndef __nonnull --# define __nonnull(params) __attribute_nonnull__ (params) -+#elif !defined __GLIBC__ -+# undef __nonnull -+# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params) - #endif - - /* If fortification mode, we warn about unused results of certain -diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h ---- texinfo-6.8/gnulib/lib/libc-config.h.orig 2021-03-11 19:57:54.000000000 +0100 -+++ texinfo-6.8/gnulib/lib/libc-config.h 2021-07-19 12:27:58.810590975 +0200 -@@ -33,9 +33,9 @@ - #include - - /* On glibc this includes and and #defines -- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and -- DragonFlyBSD 5.9 it includes which defines __nonnull. -- Elsewhere it is harmless. */ -+ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it -+ includes which defines __nonnull. Elsewhere it -+ is harmless. */ - #include - - /* From glibc . */ -diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c ---- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-03-11 19:57:54.000000000 +0100 -+++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c 2021-07-19 12:24:46.878419397 +0200 -@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY - - /* Initialize a dynamic array object. This must be called before any - use of the object. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static void - DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list) - { -@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST - } - - /* Deallocate the dynamic array and its elements. */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static void - DYNARRAY_FREE (struct DYNARRAY_STRUCT *list) - { -@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l - } - - /* Return true if the dynamic array is in an error state. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline bool - DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list) - { -@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct - - /* Mark the dynamic array as failed. All elements are deallocated as - a side effect. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static void - DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list) - { -@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA - - /* Return the number of elements which have been added to the dynamic - array. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline size_t - DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list) - { -@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR - - /* Return a pointer to the array element at INDEX. Terminate the - process if INDEX is out of bounds. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline DYNARRAY_ELEMENT * - DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index) - { -@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU - /* Return a pointer to the first array element, if any. For a - zero-length array, the pointer can be NULL even though the dynamic - array has not entered the failure state. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline DYNARRAY_ELEMENT * - DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list) - { -@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S - /* Return a pointer one element past the last array element. For a - zero-length array, the pointer can be NULL even though the dynamic - array has not entered the failure state. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline DYNARRAY_ELEMENT * - DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list) - { -@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S - /* Add ITEM at the end of the array, enlarging it by one element. - Mark *LIST as failed if the dynamic array allocation size cannot be - increased. */ --__attribute_nonnull__ ((1)) -+__nonnull ((1)) - static inline void - DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item) - { -@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR - /* Allocate a place for a new element in *LIST and return a pointer to - it. The pointer can be NULL if the dynamic array cannot be - enlarged due to a memory allocation failure. */ --__attribute_maybe_unused__ __attribute_warn_unused_result__ --__attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) - static - /* Avoid inlining with the larger initialization code. */ - #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE)) -@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY - existing size, new elements are added (which can be initialized). - Otherwise, the list is truncated, and elements are freed. Return - false on memory allocation failure (and mark *LIST as failed). */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static bool - DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size) - { -@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_ - } - - /* Remove the last element of LIST if it is present. */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static void - DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list) - { -@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA - - /* Remove all elements from the list. The elements are freed, but the - list itself is not. */ --__attribute_maybe_unused__ __attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __nonnull ((1)) - static void - DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list) - { -@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S - stored in *RESULT if LIST refers to an empty list. On success, the - pointer in *RESULT is heap-allocated and must be deallocated using - free. */ --__attribute_maybe_unused__ __attribute_warn_unused_result__ --__attribute_nonnull__ ((1, 2)) -+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2)) - static bool - DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, - DYNARRAY_FINAL_TYPE *result) -@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA - have a sentinel at the end). If LENGTHP is not NULL, the array - length is written to *LENGTHP. *LIST is re-initialized and can be - reused. */ --__attribute_maybe_unused__ __attribute_warn_unused_result__ --__attribute_nonnull__ ((1)) -+__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) - static DYNARRAY_ELEMENT * - DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp) - { diff --git a/texinfo.spec b/texinfo.spec index dff4a36..1d186b9 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -2,25 +2,21 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 6.8 -Release: 4%{?dist} +Version: 7.0 +Release: 1%{?dist} License: GPLv3+ 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 -# Patch0: this is needed just for koji/mock, all tests pass fine in local build -Patch0: texinfo-6.0-disable-failing-info-test.patch -# Patch1: rhbz#1348671, because of OSTree -Patch1: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch -# Patch2: we need to fix template fix-info-dir generates -Patch2: info-6.5-sync-fix-info-dir.patch -# Patch3: rhbz#1592433, bug in fix-info-dir --delete -Patch3: texinfo-6.5-fix-info-dir.patch -# Patch4: fixes issues detected by static analysis -Patch4: texinfo-6.5-covscan-fixes.patch -# Patch5: undos change done in gnulib that causes build to fail -# https://lists.gnu.org/r/bug-gnulib/2021-03/msg00066.html -Patch5: texinfo-6.8-undo-gnulib-nonnul.patch +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 BuildRequires: make BuildRequires: gcc @@ -70,7 +66,10 @@ The texinfo-tex package provides tools to format Texinfo documents for printing using TeX. %prep -%autosetup -p1 +%setup -q +mkdir contrib +install -Dpm0755 -t contrib %{SOURCE2} +%autopatch -p1 %build %configure --with-external-Text-Unidecode \ @@ -120,6 +119,8 @@ export ALL_TESTS=yes %{_bindir}/pod2texi %{_datadir}/texinfo %{_infodir}/texinfo* +%{_infodir}/texi2any_api.info* +%{_infodir}/texi2any_internals.info* %{_mandir}/man1/makeinfo.1* %{_mandir}/man5/texinfo.5* %{_mandir}/man1/texi2any.1* @@ -149,6 +150,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Fri Nov 18 2022 Vitezslav Crhonek - 7.0-1 +- Update to texinfo-7.0 + Resolves: #2140872 + * Sat Jul 23 2022 Fedora Release Engineering - 6.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 330d41343c755a51b5288452c9f393e2ac117546 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 1 Dec 2022 12:59:29 +0100 Subject: [PATCH 30/48] Update to texinfo-7.0.1 Signed-off-by: Vitezslav Crhonek --- .gitignore | 2 ++ sources | 4 ++-- texinfo.spec | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7a40bab..f0d7870 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /texinfo-6.8.tar.xz.sig /texinfo-7.0.tar.xz /texinfo-7.0.tar.xz.sig +/texinfo-7.0.1.tar.xz +/texinfo-7.0.1.tar.xz.sig diff --git a/sources b/sources index 9b93b35..2fec72d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-7.0.tar.xz) = 99f691515a3c43c76eca7dd78e8a79108ec8d64ebb2a677bb0473e5a67da50ebdf14d9c5428ebe7618f6cba435e6a4c42079ad2f5665371b06585f2fd28d695e -SHA512 (texinfo-7.0.tar.xz.sig) = a56452b91c73dc692d2793618ce7b9ac25df7f5a200ad9035b830942edddf301038cf214a55f397e0a28052eb41b5d17fc927129374e624b2ebf4abfa1310703 +SHA512 (texinfo-7.0.1.tar.xz) = 8e1616341fbbfe0cd90bd1b0452874c75b99d88dffe5f88c53fdc32f00d67c07c15c6c774b241e1f7507f0347314737e533854939c3be6334ca9feb9cd049009 +SHA512 (texinfo-7.0.1.tar.xz.sig) = ddf3142639a2bf61f67f86114ec0661637824d448d4aee16855cc19bd1e1b5bd608acc51cd9c2f6fbe8311d6f119a9dee823a6826332dbaaafb4b8d1a173dd85 diff --git a/texinfo.spec b/texinfo.spec index 1d186b9..de7548d 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -2,7 +2,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo -Version: 7.0 +Version: 7.0.1 Release: 1%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ @@ -150,6 +150,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Thu Dec 01 2022 Vitezslav Crhonek - 7.0.1-1 +- Update to texinfo-7.0.1 + Resolves: #2149772 + * Fri Nov 18 2022 Vitezslav Crhonek - 7.0-1 - Update to texinfo-7.0 Resolves: #2140872 From 8f66a00371350225b7af99c06c58bac186c32e94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:55:18 +0000 Subject: [PATCH 31/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_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 de7548d..e81932e 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.1 -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 @@ -150,6 +150,9 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 7.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 01 2022 Vitezslav Crhonek - 7.0.1-1 - Update to texinfo-7.0.1 Resolves: #2149772 From edde67cf119220c0206c9894cd243e4c9ed821f8 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 23 Jan 2023 14:05:00 +0100 Subject: [PATCH 32/48] Update to texinfo-7.0.2 Signed-off-by: Vitezslav Crhonek --- .gitignore | 8 ++------ sources | 4 ++-- texinfo.spec | 8 ++++++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index f0d7870..bacab2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,2 @@ -/texinfo-6.8.tar.xz -/texinfo-6.8.tar.xz.sig -/texinfo-7.0.tar.xz -/texinfo-7.0.tar.xz.sig -/texinfo-7.0.1.tar.xz -/texinfo-7.0.1.tar.xz.sig +/texinfo-7.0.2.tar.xz +/texinfo-7.0.2.tar.xz.sig diff --git a/sources b/sources index 2fec72d..81075c3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (texinfo-7.0.1.tar.xz) = 8e1616341fbbfe0cd90bd1b0452874c75b99d88dffe5f88c53fdc32f00d67c07c15c6c774b241e1f7507f0347314737e533854939c3be6334ca9feb9cd049009 -SHA512 (texinfo-7.0.1.tar.xz.sig) = ddf3142639a2bf61f67f86114ec0661637824d448d4aee16855cc19bd1e1b5bd608acc51cd9c2f6fbe8311d6f119a9dee823a6826332dbaaafb4b8d1a173dd85 +SHA512 (texinfo-7.0.2.tar.xz) = 26dd5bb1392f2197ecde296ba157d4533f4b11fadf1238481da4cf2b3796c665ce96049df8d2f9a6d4fa22b7e9013d9978d195e525288663f0a54482bbc22b2b +SHA512 (texinfo-7.0.2.tar.xz.sig) = 93ec60133d9f05e77e2b11879069cdccbf3066fd33716b91aa7ae0878da931e80f58fed246be592a3fbcba3d17eec30cd51cef2ceab04ff3fe0b22e83c22cab2 diff --git a/texinfo.spec b/texinfo.spec index e81932e..d5c986d 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.1 -Release: 2%{?dist} +Version: 7.0.2 +Release: 1%{?dist} License: GPLv3+ Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz @@ -150,6 +150,10 @@ export ALL_TESTS=yes %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Mon Jan 23 2023 Vitezslav Crhonek - 7.0.2-1 +- Update to texinfo-7.0.2 + Resolves: #2162979 + * Sat Jan 21 2023 Fedora Release Engineering - 7.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 7c044e6540c077cc30721e57fecbb457724d4a1c Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 22 Feb 2023 14:58:14 +0100 Subject: [PATCH 33/48] 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 34/48] 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 35/48] 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 36/48] 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 37/48] 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 38/48] 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 39/48] 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 40/48] 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 41/48] 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 42/48] 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 43/48] 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 44/48] 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 45/48] 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 46/48] 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 47/48] 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 48/48] 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