- Update from version 6.8 to 7.0.2 - Update of rootfile - Removal of patch which was needed due to inability to build texinfo-6.8 with glibc-2.34 Problem was fixed for building with glibc-2.34 and onwards with texinfo-7.0 - Changelog 7.0.2 (22 January 2023) This is a bug-fix release with minimal changes. * texi2any . do not distribute architecture-dependent files . build fixed on OpenIndiana 11 * info . further fix of recoding of UTF-8 files to ASCII . fix check for presence of man pages on Solaris * install-info . fix build by avoiding function name clash on some platforms . compiler warning re strncat silenced 7.0.1 (30 November 2022) This is a bug-fix release with minimal changes. * texi2any . avoid crashes on empty @image argument and other potential crashes (with "Can't use an undefined value as an ARRAY reference" message) . avoid hang on @ref command inside section command * info . fix recoding of UTF-8 files to ASCII when run in C locale * js . index search fixed for new HTML output . some obsolete files removed from distribution 7.0 (7 November 2022) * texi2any . LaTeX added as an output format, selected with --latex . EPUB 3 added as an output format, selected with --epub3 . reform throughout the code in general . thorough review of character encoding issues . new customization variables involved with character encoding: INPUT_FILE_NAME_ENCODING, OUTPUT_FILE_NAME_ENCODING, DOC_ENCODING_FOR_INPUT_FILE_NAME, DOC_ENCODING_FOR_OUTPUT_FILE_NAME, MESSAGE_ENCODING and COMMAND_LINE_ENCODING . warn if full-text commands (@ref, @footnote, @anchor) appear in @w . new variable NO_TOP_NODE_OUTPUT . IGNORE_BEFORE_SETFILENAME variable removed. former effect is now always on. . HTML output: . use manual_name_html as output directory for split HTML instead of manual_name or manual_name.html . default DOCTYPE declaration changed to plain HTML5 style rather than HTML4 DTD reference . output only the CSS rules that are needed in an output file . remove CSS_LINES variable and add SHOW_BUILTIN_CSS_RULES (custom CSS can still be output using EXTRA_HEAD) . use <code> tag for the output of @t and @verb instead of <tt> . use <abbr> for @acronym instead of <acronym> . link to table of contents from short table of contents only if a table of contents is actually output . prefix classes from @example arguments with `user-' . percent encode URL in @url/@uref, @email, @image and external manual file . new USE_XML_SYNTAX, HTML_ROOT_ELEMENT_ATTRIBUTES and NO_CUSTOM_HTML_ATTRIBUTE variables can be used to output valid XHTML . systematic addition of classes attribute in HTML elements based on the Texinfo @-command names. renaming of class attributes to avoid confusion with @-commands formatting and describe the role in the document rather than the formatting style. . COPIABLE_ANCHORS renamed to COPIABLE_LINKS . do not add a title by default; SHOW_TITLE or NO_TOP_NODE_OUTPUT has to be set . USE_TITLEPAGE_FOR_TITLE is now true by default . L2H variable removed, replaced by HTML_MATH set to `l2h' . rename OVERVIEW_LINK_TO_TOC to SHORT_TOC_LINK_TO_TOC . rename BEFORE_OVERVIEW to BEFORE_SHORT_TOC_LINE . rename AFTER_OVERVIEW to AFTER_SHORT_TOC_LINES . remove PRE_ABOUT, AFTER_ABOUT, and add PROGRAM_NAME_IN_ABOUT . remove KEEP_TOP_EXTERNAL_REF . new variables IGNORE_REF_TO_TOP_NODE_UP, CONVERT_TO_LATEX_IN_MATH, HTMLXREF_MODE and HTMLXREF_FILE . DocBook output: . do not output Top node or text before the first @node or sectioning @-command. NO_TOP_NODE_OUTPUT can be set to false to output Top node for now. . replace @definfocenlose defined @-commands by the argument as-is to be more consistent with printed output . HTML/DocBook output: . USE_NUMERIC_ENTITY changed to mean to use numeric entities instead of named entities. former effect is now always on. . ENABLE_ENCODING_USE_ENTITY variable removed. former effect is now always off. . Info output . quote problematic node names (with :, comma...) by default . new customization variable ASCII_PUNCTUATION to use plain ASCII characters for quotation marks and a few other symbols * texinfo.tex . `@microtype on' uses microtypography in formatting for pdfTeX and LuaTeX . do not ignore @part page immediately following Top node . do `@set txicodevaristt' to get slanted typewriter for @var in code, `@clear txicodevaristt' to use slanted, variable-width roman font for @var everywhere. flag is @set by default, but we may turn this off in the future. . new file doc/texinfo-zh.tex for Texinfo documents in Chinese. new support file doc/txi-zh.tex for Chinese. doc/short-sample-zh.texi is a sample document. * info . better support for index entries containing parentheses . better support for getting bold text etc. when displaying manpages . bug fixed where the first index entry in a file could be ignored . M-C-f closes as well as opens footnotes window . do not crash if run in Brazilian Portuguese locale * Language . @deftype* commands use typewriter font in argument list . new commands @latex, @iflatex, @ifnotlatex for new LaTeX output format . do `@set txidefnamenospace' to omit space after a definition name * Other . build fixed for glibc 2.34
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/texinfo | 19 +- lfs/texinfo | 7 +- .../texinfo-6.8-undo-gnulib-nonnul.patch | 186 ------------------ 3 files changed, 17 insertions(+), 195 deletions(-) delete mode 100644 src/patches/texinfo-6.8-undo-gnulib-nonnul.patch
diff --git a/config/rootfiles/common/texinfo b/config/rootfiles/common/texinfo index 13df03542..76ff08310 100644 --- a/config/rootfiles/common/texinfo +++ b/config/rootfiles/common/texinfo @@ -15,6 +15,8 @@ #usr/lib/texinfo/XSParagraph.la #usr/lib/texinfo/XSParagraph.so #usr/share/info/info-stnd.info +#usr/share/info/texi2any_api.info +#usr/share/info/texi2any_internals.info #usr/share/info/texinfo.info #usr/share/info/texinfo.info-1 #usr/share/info/texinfo.info-2 @@ -38,7 +40,10 @@ #usr/share/texinfo/Pod-Simple-Texinfo/Pod/Simple #usr/share/texinfo/Pod-Simple-Texinfo/Pod/Simple/Texinfo.pm #usr/share/texinfo/Texinfo +#usr/share/texinfo/Texinfo/Commands.pm +#usr/share/texinfo/Texinfo/Commands.pod #usr/share/texinfo/Texinfo/Common.pm +#usr/share/texinfo/Texinfo/Config.pm #usr/share/texinfo/Texinfo/Convert #usr/share/texinfo/Texinfo/Convert/Converter.pm #usr/share/texinfo/Texinfo/Convert/DocBook.pm @@ -46,21 +51,21 @@ #usr/share/texinfo/Texinfo/Convert/IXIN.pm #usr/share/texinfo/Texinfo/Convert/IXINSXML.pm #usr/share/texinfo/Texinfo/Convert/Info.pm -#usr/share/texinfo/Texinfo/Convert/Line.pm +#usr/share/texinfo/Texinfo/Convert/LaTeX.pm #usr/share/texinfo/Texinfo/Convert/NodeNameNormalization.pm #usr/share/texinfo/Texinfo/Convert/Paragraph.pm #usr/share/texinfo/Texinfo/Convert/ParagraphNonXS.pm #usr/share/texinfo/Texinfo/Convert/PlainTexinfo.pm #usr/share/texinfo/Texinfo/Convert/Plaintext.pm #usr/share/texinfo/Texinfo/Convert/Texinfo.pm +#usr/share/texinfo/Texinfo/Convert/TexinfoMarkup.pm #usr/share/texinfo/Texinfo/Convert/TexinfoSXML.pm #usr/share/texinfo/Texinfo/Convert/TexinfoXML.pm #usr/share/texinfo/Texinfo/Convert/Text.pm #usr/share/texinfo/Texinfo/Convert/TextContent.pm -#usr/share/texinfo/Texinfo/Convert/UnFilled.pm #usr/share/texinfo/Texinfo/Convert/Unicode.pm +#usr/share/texinfo/Texinfo/Convert/Utils.pm #usr/share/texinfo/Texinfo/Documentlanguages.pm -#usr/share/texinfo/Texinfo/Encoding.pm #usr/share/texinfo/Texinfo/MiscXS.pm #usr/share/texinfo/Texinfo/ModulePath.pm #usr/share/texinfo/Texinfo/Parser.pm @@ -68,18 +73,22 @@ #usr/share/texinfo/Texinfo/Report.pm #usr/share/texinfo/Texinfo/Structuring.pm #usr/share/texinfo/Texinfo/Transformations.pm +#usr/share/texinfo/Texinfo/Translations.pm #usr/share/texinfo/Texinfo/XS #usr/share/texinfo/Texinfo/XS/parsetexi #usr/share/texinfo/Texinfo/XS/parsetexi/Parsetexi.pm #usr/share/texinfo/Texinfo/XSLoader.pm +#usr/share/texinfo/ext +#usr/share/texinfo/ext/epub3.pm +#usr/share/texinfo/ext/latex2html.pm +#usr/share/texinfo/ext/tex4ht.pm #usr/share/texinfo/htmlxref.cnf #usr/share/texinfo/init #usr/share/texinfo/init/book.pm #usr/share/texinfo/init/chm.pm +#usr/share/texinfo/init/documentation_examples.pm #usr/share/texinfo/init/highlight_syntax.pm #usr/share/texinfo/init/html32.pm -#usr/share/texinfo/init/latex2html.pm -#usr/share/texinfo/init/tex4ht.pm #usr/share/texinfo/js #usr/share/texinfo/js/info.css #usr/share/texinfo/js/info.js diff --git a/lfs/texinfo b/lfs/texinfo index 5ee90d0dc..62acc0af5 100644 --- a/lfs/texinfo +++ b/lfs/texinfo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 6.8 +VER = 7.0.2
THISAPP = texinfo-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb +$(DL_FILE)_BLAKE2 = 23737cc800392c949add14c1d0a01a294e8c224d958c03325c96d6540dcfae49db5c2d4a8c29310c0603f8ac8477f6ee00a14db4aa6caab317b19e776139e617
install : $(TARGET)
@@ -77,7 +77,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch b/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch deleted file mode 100644 index 60f2e63b7..000000000 --- a/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch +++ /dev/null @@ -1,186 +0,0 @@ - -Patch by Vitezslav Crhonek vcrhonek@redhat.com -Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560f... - -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 <config.h> - - /* On glibc this includes <features.h> and <sys/cdefs.h> and #defines -- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and -- DragonFlyBSD 5.9 it includes <sys/cdefs.h> which defines __nonnull. -- Elsewhere it is harmless. */ -+ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it -+ includes <sys/cdefs.h> which defines __nonnull. Elsewhere it -+ is harmless. */ - #include <errno.h> - - /* From glibc <errno.h>. */ -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) - {