11 changed files with 189 additions and 402 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,12 @@
-/texinfo-6.6.tar.xz
-/texinfo-6.6.tar.xz.sig
+texinfo-4.13a.tar.lzma
+texinfo-4.13a.tar.lzma.sig
+/texinfo-5.0.tar.xz
+/texinfo-5.0.tar.xz.sig
+/texinfo-5.1.tar.xz
+/texinfo-5.1.tar.xz.sig
+/texinfo-5.2.tar.xz
+/texinfo-5.2.tar.xz.sig
+/texinfo-6.0.tar.xz
+/texinfo-6.0.tar.xz.sig
+/texinfo-6.1.tar.xz
+/texinfo-6.1.tar.xz.sig
--- a/info-6.5-sync-fix-info-dir.patch
+++ b/info-6.5-sync-fix-info-dir.patch
@ -1,40 +0,0 @@
-diff -uNr texinfo-6.5.orig/contrib/fix-info-dir texinfo-6.5/contrib/fix-info-dir
--- texinfo-6.5.orig/contrib/fix-info-dir	2014-04-22 03:56:56.000000000 +0200
-+++ texinfo-6.5/contrib/fix-info-dir	2018-02-04 13:48:35.979359350 +0100
-@@ -163,29 +163,23 @@
- {
- 
- 	### 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<<DIR_FILE_END_OF_FILE
-This is the file .../info/$DIR_FILE, which contains the topmost node of the
-Info hierarchy.  The first time you invoke Info you start off
-looking at that node, which is ($DIR_FILE)Top.
-
-+This is the file .../info/$DIR_FILE, which contains the
-+topmost node of the Info hierarchy, called ($DIR_FILE)Top.
-+The first time you invoke Info you start off looking at this node.
- 
-File: $DIR_FILE       Node: Top       This is the top of the INFO tree
-+File: $DIR_FILE,	Node: Top	This is the top of the INFO tree
- 
-   This (the Directory node) gives a menu of major topics.
-  Typing "q" exits, "?" lists all Info commands, "d" returns here,
-+  Typing "q" exits, "H" lists all Info commands, "d" returns here,
-   "h" gives a primer for first-timers,
-  "mEmacs<Return>" visits the Emacs topic, etc.
-+  "mEmacs<Return>" visits the Emacs manual, 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.
-
-+* Menu:
- DIR_FILE_END_OF_FILE
- 
- ### go through the list of files in the skeleton.  If an info file
--- a/22
+++ b/22
@ -0,0 +1,22 @@
+$Id: dir,v 1.2 1996/09/24 18:43:01 karl Exp $
+This is the file .../info/dir, which contains the topmost node of the
+Info hierarchy.  The first time you invoke Info you start off
+looking at that node, which is (dir)Top.
+
+File: dir	Node: Top	This is the top of the INFO tree
+
+  This (the Directory node) gives a menu of major topics. 
+  Typing "q" exits, "?" lists all Info commands, "d" returns here,
+  "h" gives a primer for first-timers,
+  "mEmacs<Return>" visits the Emacs topic, etc.
+
+  In Emacs, you can click mouse button 2 on a menu item or cross reference
+  to select it.
+
+* Menu: 
+
+Texinfo documentation system
+* Info: (info).                 Documentation browsing system.
+
+Miscellaneous
+* bash: (bash).                 The Bourne Again Shell.
--- a/macros.info
+++ b/macros.info
@ -1,15 +1,15 @@
 %info_requires \
-Requires(post): /sbin/install-info \
-Requires(preun): /sbin/install-info
+Requires(post): /usr/sbin/install-info \
+Requires(preun): /usr/sbin/install-info

 %info_post() \
 if [ -f %{_infodir}/%1 ]; then # --excludedocs? \
-  /sbin/install-info %{_infodir}/%1 %{_infodir}/dir || : \
+  /usr/sbin/install-info %{_infodir}/%1 %{_infodir}/dir || : \
 fi

 %info_preun() \
 if [ $1 == 0 ]; then \
  if [ -f %{_infodir}/%1 ]; then # --excludedocs? \
-    /sbin/install-info --delete %{_infodir}/%1 %{_infodir}/dir || : \
+    /usr/sbin/install-info --delete %{_infodir}/%1 %{_infodir}/dir || : \
  fi \
 fi
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (texinfo-6.6.tar.xz) = 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
-SHA512 (texinfo-6.6.tar.xz.sig) = b4af1d28e4cc20b6e86255b907542122aa1da423652ea962b885b2f2d1cc135747d12c4eb78a24c25320b981e2448ce87f66bf9ac264527f989dc7439cefd03b
+1d7ec1888fae00730693597852b00cde  texinfo-6.1.tar.xz
+d58158e37a901cff25d2cb4dab4a04a6  texinfo-6.1.tar.xz.sig
--- a/texinfo-4.12-zlib.patch
+++ b/texinfo-4.12-zlib.patch
@ -1,7 +1,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 @@
+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-02-06 13:20:24.000000000 +0100
+++ texinfo-6.1/install-info/install-info.c	2016-02-11 09:19:15.646258510 +0100
+@@ -22,6 +22,7 @@
 #include <getopt.h>
 #include <regex.h>
 #include <argz.h>
@ -9,7 +9,7 @@ diff -up texinfo-6.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-
 
 #define TAB_WIDTH 8
 
-@@ -681,15 +682,15 @@ The first time you invoke Info you start
+@@ -684,15 +685,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.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-
 
   /* 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
+@@ -700,48 +701,48 @@ open_possibly_compressed_file (char *fil
     opened_filename = &local_opened_filename;
 
   *opened_filename = filename;
@ -85,7 +85,7 @@ diff -up texinfo-6.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-
     }
 #endif /* __MSDOS__ */
   if (!f)
-@@ -754,7 +755,7 @@ open_possibly_compressed_file (char *fil
+@@ -757,7 +758,7 @@ open_possibly_compressed_file (char *fil
           (*create_callback) (filename);
 
           /* And try opening it again.  */
@ -94,7 +94,7 @@ diff -up texinfo-6.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-
           if (!f)
             return 0;
         }
-@@ -764,26 +765,26 @@ open_possibly_compressed_file (char *fil
+@@ -767,26 +768,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.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-
                 return 0;
               goto determine_file_type; /* success */
             }
-@@ -854,35 +855,40 @@ determine_file_type:
+@@ -857,35 +858,40 @@ determine_file_type:
     *compression_program = NULL;
 
   /* Seek back over the magic bytes.  */
@ -177,7 +177,7 @@ diff -up texinfo-6.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-
     }
 
   return f;
-@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep,
+@@ -904,7 +910,8 @@ readfile (char *filename, int *sizep,
     void (*create_callback) (char *), char **opened_filename,
     char **compression_program)
 {
@ -187,7 +187,7 @@ diff -up texinfo-6.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-
   int filled = 0;
   int data_size = 8192;
   char *data = xmalloc (data_size);
-@@ -909,14 +916,20 @@ readfile (char *filename, int *sizep,
+@@ -912,14 +919,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.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-
       if (nread < 0)
         return 0;
       if (nread == 0)
-@@ -935,8 +948,10 @@ readfile (char *filename, int *sizep,
+@@ -938,8 +951,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.5.91/install-info/install-info.c.orig texinfo-6.5.91/install-
 
   *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)"
+diff -up texinfo-6.1/install-info/Makefile.in.orig texinfo-6.1/install-info/Makefile.in
+--- texinfo-6.1/install-info/Makefile.in.orig	2016-02-06 13:24:05.000000000 +0100
+++ texinfo-6.1/install-info/Makefile.in	2016-02-11 09:17:14.660744184 +0100
+@@ -215,7 +215,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.5.91/install-info/Makefile.in.orig texinfo-6.5.91/install-inf
 +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)
--- a/texinfo-6.0-disable-failing-info-test.patch
+++ b/texinfo-6.0-disable-failing-info-test.patch
@ -1,25 +1,49 @@
-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 = \
+diff -up texinfo-6.1/info/Makefile.in.orig texinfo-6.1/info/Makefile.in
+--- texinfo-6.1/info/Makefile.in.orig	2016-02-06 13:24:05.000000000 +0100
+++ texinfo-6.1/info/Makefile.in	2016-02-09 12:48:35.505942307 +0100
+@@ -1342,7 +1342,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 \
+@@ -1365,10 +1364,6 @@ TESTS = \
+ 	t/replace-viewed.sh \
+ 	t/search-skip-screen.sh \
+ 	t/search-empty.sh \
+-	t/inc-sea-forward.sh \
+-	t/inc-sea-forward-nonregex.sh \
+-	t/inc-sea-insensitive.sh \
+-	t/inc-sea-history.sh \
+ 	t/gc-split.sh \
+ 	t/anchor-positions.sh \
+ 	t/quoted-label-as-target.sh \
+diff -up texinfo-6.1/tp/tests/Makefile.in.orig texinfo-6.1/tp/tests/Makefile.in
+--- texinfo-6.1/tp/tests/Makefile.in.orig	2016-02-09 12:49:19.741103869 +0100
+++ texinfo-6.1/tp/tests/Makefile.in	2016-02-09 12:50:34.780377935 +0100
+@@ -1286,7 +1286,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/coverage_formatting_cr.sh \
+      test_scripts/indices_double_index_entry.sh \
+      test_scripts/indices_split_chapter_index.sh \
+@@ -1391,7 +1390,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 \
+      test_scripts/formatting_texi_glossary.sh \
+@@ -1421,7 +1419,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 \
--- a/texinfo-6.1-texi2dvi-fix.patch
+++ b/texinfo-6.1-texi2dvi-fix.patch
@ -0,0 +1,29 @@
+diff -up texinfo-6.1/util/texi2dvi.orig texinfo-6.1/util/texi2dvi
+--- texinfo-6.1/util/texi2dvi.orig	2016-02-06 13:21:52.000000000 +0100
+++ texinfo-6.1/util/texi2dvi	2016-02-24 09:36:18.726954888 +0100
+@@ -988,15 +988,16 @@ run_bibtex ()
+ #                         that match PREDICATE.
+ filter_files ()
+ {
+-  test -n "$xref_files_new" && echo "$xref_files_new" |
+-  # Filter existing files matching the criterion.
+-  #
+-  while read file; do
+-    $1 "$file"
+-  done |
+-  sort |
+-  # Some files are opened several times, e.g., listings.sty's *.vrb.
+-  uniq
+  test -n "$xref_files_new" || return 0
+  echo "$xref_files_new" |
+    # Filter existing files matching the criterion.
+    #
+    while read file; do
+      $1 "$file"
+    done |
+    sort |
+    # Some files are opened several times, e.g., listings.sty's *.vrb.
+    uniq
+ }
+ 
+ # run_index - Run texindex (or makeindex or texindy) on current index
--- a/texinfo-6.5-covscan-fixes.patch
+++ b/texinfo-6.5-covscan-fixes.patch
@ -1,168 +0,0 @@
-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
-@@ -589,6 +589,7 @@ fetch_user_maps (char *init_file)
-   compile (inf, filename, &sup_info, &sup_ea);
- 
-   free (filename);
-+  fclose (inf);
-   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
-@@ -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-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
- 
-       format_entry (name, name_len, desc, desc_len, calign, align, 
-                     maxwidth, &entry->text, &entry->text_len);
-+      free (desc);
-+      free (name);
-     }
- }
- 
--- a/texinfo-6.5-fix-info-dir.patch
+++ b/texinfo-6.5-fix-info-dir.patch
@ -1,41 +0,0 @@
-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..9240060 100755
--- a/contrib/fix-info-dir
-+++ b/contrib/fix-info-dir
-@@ -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"
-		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
--- a/texinfo.spec
+++ b/texinfo.spec
@ -2,26 +2,27 @@

 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
-Version: 6.6
-Release: 2%{?dist}
+Version: 6.1
+Release: 3%{?dist}
 License: GPLv3+
+Group: Applications/Publishing
 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: info-dir
+# 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: this is needed just for koji/mock, all test 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
-
-BuildRequires: gcc
-BuildRequires: perl-generators
+# Patch2: rhbz#1309702, already upstream
+Patch2: texinfo-6.1-texi2dvi-fix.patch
+# Patch3: rhbz#1348671, because of OSTree
+Patch3: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+Requires: perl >= 5.7.3, perl(Text::Unidecode)
+Requires: perl(Unicode::EastAsianWidth), perl(Data::Dumper), perl(Locale::Messages)
 BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper)
 BuildRequires: perl(Locale::Messages), perl(Unicode::EastAsianWidth), perl(Text::Unidecode)
 BuildRequires: perl(Storable)
@ -41,6 +42,7 @@ are going to write documentation for the GNU Project.

 %package -n info
 Summary: A stand-alone TTY-based reader for GNU texinfo documentation
+Group: System Environment/Base

 %description -n info
 The GNU project uses the texinfo file format for much of its
@ -49,6 +51,7 @@ browser program for viewing texinfo files.

 %package tex
 Summary: Tools for formatting Texinfo documentation files using TeX
+Group: Applications/Publishing
 Requires: texinfo = %{version}-%{release}
 Requires: tex(tex) tex(epsf.tex)
 Requires(post): %{_bindir}/texconfig-sys
@ -63,33 +66,67 @@ The texinfo-tex package provides tools to format Texinfo documents
 for printing using TeX.

 %prep
-%autosetup -p1
+%setup -q
+%patch0 -p1 -b .zlib
+%patch1 -p1 -b .disable-failing-info-test
+%patch2 -p1 -b .texi2dvi-fix
+%patch3 -p1 -b .orig

 %build
 %configure --with-external-Text-Unidecode \
           --with-external-libintl-perl \
           --with-external-Unicode-EastAsianWidth \
           --disable-perl-xs
-%make_build
+make %{?_smp_mflags}

 %install
 mkdir -p ${RPM_BUILD_ROOT}/sbin

-%make_install
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'

 mkdir -p $RPM_BUILD_ROOT%{tex_texinfo}
 install -p -m644 doc/texinfo.tex doc/txi-??.tex $RPM_BUILD_ROOT%{tex_texinfo}

+install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_infodir}/dir
 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

 %check
 export ALL_TESTS=yes
-%make_build check
+make %{?_smp_mflags} check
+
+%post
+if [ -f %{_infodir}/texinfo.gz ]; then # --excludedocs?
+    /sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir || :
+fi
+
+%preun
+if [ $1 = 0 ]; then
+    if [ -f %{_infodir}/texinfo.gz ]; then # --excludedocs?
+        /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir || :
+    fi
+fi
+
+%post -n info
+if [ -f %{_infodir}/info-stnd.info ]; then # --excludedocs?
+    /sbin/install-info %{_infodir}/info-stnd.info %{_infodir}/dir
+fi
+if [ -x /bin/sed ]; then
+    /bin/sed -i '/^This is.*produced by makeinfo.*from/d' %{_infodir}/dir || :
+fi
+
+%preun -n info
+if [ $1 = 0 ]; then
+    if [ -f %{_infodir}/info-stnd.info ]; then # --excludedocs?
+        /sbin/install-info --delete %{_infodir}/info-stnd.info %{_infodir}/dir \
+        || :
+    fi
+fi

 %post tex
 %{_bindir}/texconfig-sys rehash 2> /dev/null || :
@ -97,15 +134,10 @@ export ALL_TESTS=yes
 %postun tex
 %{_bindir}/texconfig-sys rehash 2> /dev/null || :

-%transfiletriggerin -n info -- %{_infodir}
-[ -f %{_infodir}/dir ] && create_arg="" || create_arg="--create"
-%{_sbindir}/fix-info-dir $create_arg %{_infodir}/dir &>/dev/null
-
-%transfiletriggerpostun -n info -- %{_infodir}
-[ -f %{_infodir}/dir ] && %{_sbindir}/fix-info-dir --delete %{_infodir}/dir &>/dev/null

 %files -f %{name}.lang -f %{name}_document.lang
 %doc AUTHORS ChangeLog NEWS README TODO
+%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_bindir}/makeinfo
 %{_bindir}/texi2any
@ -118,16 +150,16 @@ export ALL_TESTS=yes
 %{_mandir}/man1/pod2texi.1*

 %files -n info
+%config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir
+%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_bindir}/info
 %{_infodir}/info-stnd.info*
 /sbin/install-info
-%{_sbindir}/fix-info-dir
 %{_mandir}/man1/info.1*
 %{_mandir}/man1/install-info.1*
 %{_mandir}/man5/info.5*
-%ghost %{_infodir}/dir
-%ghost %{_infodir}/dir.old
+%{_rpmconfigdir}/macros.d/macros.info

 %files tex
 %{_bindir}/texindex
@ -141,87 +173,6 @@ export ALL_TESTS=yes
 %{_mandir}/man1/pdftexi2dvi.1*

 %changelog
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Feb 18 2019 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.6-1
- Update to texinfo-6.6
-  Resolves: #1677911
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.5-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Oct 04 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <ignatenkobrain@fedoraproject.org> - 6.5-10
- Drop macros.info
-
-* Wed Aug 08 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.5-9
- Fix issues detected by static analysis
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 29 2018 Jitka Plesnikova <jplesnik@redhat.com> - 6.5-7
- Perl 5.28 rebuild
-
-* Thu Jun 21 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 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 <tibbs@math.uh.edu> - 6.5-5
- Fix bug in fix-info-dir which prevented the transfiletriggerpostun script
-  from working properly.
-
-* Fri Mar 30 2018 Tom Callaway <spot@fedoraproject.org> - 6.5-4
- update texinfo.tex
-
-* Tue Feb 13 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.5-3
- Implement transaction filetriggers for crating info/dir
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Sep 13 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.5-1
- Update to texinfo-6.5
-  Resolves: #1491075
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jul 13 2017 Petr Pisar <ppisar@redhat.com> - 6.4-3
- perl dependency renamed to perl-interpreter
-  <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>
-
-* Mon Jul 10 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4-2
- Fix broken reference following when the reference is split to
-  more than one line
- Fix possible incorrect selection of already loaded file when
-  following cross reference
-  Resolves: #1383057
-
-* Tue Jun 27 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4-1
- Update to texinfo-6.4
-  Resolves: #1464624
-
-* Mon Mar 13 2017 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.3-3
- Fix path to install-info in macros.info
-  Resolves: #1419246
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Sep 19 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.3-1
- Update to texinfo-6.3
-  Resolves: #1374962
-
 * Wed Jun 22 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.1-3
 - install-info: use create-tmp-then-rename pattern because of OSTree
  (patch by Colin Walters)