rpms/texinfo
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: rpms:imports/c9-beta/texinfo-6.7-15.el9
Branches Tags
rpms:c8
rpms:c10s
rpms:c8s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c9s
rpms:imports/c10s/texinfo-7.1-5.el10
rpms:imports/c10s/texinfo-7.1-4.el10
rpms:imports/c10s/texinfo-7.1-3.el10
rpms:imports/c9/texinfo-6.7-15.el9
rpms:imports/c8/texinfo-6.5-7.el8
rpms:imports/c9-beta/texinfo-6.7-15.el9
rpms:imports/c8-beta/texinfo-6.5-7.el8
rpms:imports/c8s/texinfo-6.5-7.el8_5
rpms:imports/c8s/texinfo-6.5-7.el8
rpms:imports/c9-beta/texinfo-6.7-12.el9
rpms:imports/c8-beta/texinfo-6.5-6.el8
rpms:imports/c8-beta/texinfo-6.5-5.el8
rpms:imports/c8-beta/texinfo-6.5-4.el8
rpms:imports/c8s/texinfo-6.5-6.el8
rpms:imports/c8/texinfo-6.5-6.el8
rpms:imports/c8/texinfo-6.5-4.el8
..
compare: rpms:c8
Branches Tags
rpms:c10s
rpms:c8s
rpms:c9
rpms:c8
rpms:c9-beta
rpms:c8-beta
rpms:c9s
rpms:imports/c10s/texinfo-7.1-5.el10
rpms:imports/c10s/texinfo-7.1-4.el10
rpms:imports/c10s/texinfo-7.1-3.el10
rpms:imports/c9/texinfo-6.7-15.el9
rpms:imports/c8/texinfo-6.5-7.el8
rpms:imports/c9-beta/texinfo-6.7-15.el9
rpms:imports/c8-beta/texinfo-6.5-7.el8
rpms:imports/c8s/texinfo-6.5-7.el8_5
rpms:imports/c8s/texinfo-6.5-7.el8
rpms:imports/c9-beta/texinfo-6.7-12.el9
rpms:imports/c8-beta/texinfo-6.5-6.el8
rpms:imports/c8-beta/texinfo-6.5-5.el8
rpms:imports/c8-beta/texinfo-6.5-4.el8
rpms:imports/c8s/texinfo-6.5-6.el8
rpms:imports/c8/texinfo-6.5-6.el8
rpms:imports/c8/texinfo-6.5-4.el8

No commits in common. "imports/c9-beta/texinfo-6.7-15.el9" and "c8" have entirely different histories.
imports/c9 ... c8

11 changed files with 171 additions and 255 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/texinfo-6.7.tar.xz SOURCES/texinfo-6.5.tar.xz

2
.texinfo.metadata
View File

@ -1 +1 @@
d84d46368e2694919c05a539cb8c616ac89bf4df SOURCES/texinfo-6.7.tar.xz 72a06b48862911c638787cc3307871b990a59726 SOURCES/texinfo-6.5.tar.xz

15
SOURCES/macros.info Normal file
View File

@ -0,0 +1,15 @@
%info_requires \
Requires(post): /sbin/install-info \
Requires(preun): /sbin/install-info
%info_post() \
if [ -f %{_infodir}/%1 ]; then # --excludedocs? \
/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 || : \
fi \
fi

34
SOURCES/texinfo-4.12-zlib.patch
View File

@ -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 diff -up texinfo-6.4/install-info/install-info.c.orig texinfo-6.4/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.4/install-info/install-info.c.orig 2016-03-04 18:52:26.000000000 +0100
+++ texinfo-6.5.91/install-info/install-info.c 2019-01-14 09:31:45.322849494 +0100 +++ texinfo-6.4/install-info/install-info.c 2017-06-27 15:14:20.167998983 +0200
@@ -19,6 +19,7 @@ @@ -22,6 +22,7 @@
#include <getopt.h> #include <getopt.h>
#include <regex.h> #include <regex.h>
#include <argz.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 #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 Return either stdin reading the file, or a non-stdin pipe reading
the output of the compression program. */ 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 /* We let them pass NULL if they don't want this info, but it's easier
to always determine it. */ 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 = &local_opened_filename;
*opened_filename = 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__ */ #endif /* __MSDOS__ */
if (!f) 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); (*create_callback) (filename);
/* And try opening it again. */ /* 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) if (!f)
return 0; 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. /* 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. */ 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; return 0;
goto determine_file_type; /* success */ goto determine_file_type; /* success */
} }
@@ -854,35 +855,40 @@ determine_file_type: @@ -857,35 +858,40 @@ determine_file_type:
*compression_program = NULL; *compression_program = NULL;
/* Seek back over the magic bytes. */ /* 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; 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, void (*create_callback) (char *), char **opened_filename,
char **compression_program) 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 filled = 0;
int data_size = 8192; int data_size = 8192;
char *data = xmalloc (data_size); 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. */ /* If they passed the space for the file name to return, use it. */
f = open_possibly_compressed_file (filename, create_callback, f = open_possibly_compressed_file (filename, create_callback,
opened_filename, 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) if (nread < 0)
return 0; return 0;
if (nread == 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 /* 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 by popen is simulated by a temporary file which only gets removed
inside pclose. */ 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; *sizep = filled;
return data; return data;
diff -up texinfo-6.5.91/install-info/Makefile.in.orig texinfo-6.5.91/install-info/Makefile.in diff -up texinfo-6.4/install-info/Makefile.in.orig texinfo-6.4/install-info/Makefile.in
--- texinfo-6.5.91/install-info/Makefile.in.orig 2019-01-14 09:32:31.729895052 +0100 --- texinfo-6.4/install-info/Makefile.in.orig 2017-06-23 08:04:39.000000000 +0200
+++ texinfo-6.5.91/install-info/Makefile.in 2019-01-14 09:32:52.574914503 +0100 +++ texinfo-6.4/install-info/Makefile.in 2017-06-27 15:14:20.167998983 +0200
@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" @@ -221,7 +221,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
am_ginstall_info_OBJECTS = install-info.$(OBJEXT) am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) 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 +ginstall_info_LDADD = $(LDADD) -lz
am__DEPENDENCIES_1 = am__DEPENDENCIES_1 =
ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

62
SOURCES/texinfo-6.0-disable-failing-info-test.patch
View File

@ -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 diff -up texinfo-6.4.90/info/Makefile.in.orig texinfo-6.4.90/info/Makefile.in
--- texinfo-6.5.92/install-info/tests/Makefile.in.orig 2019-02-01 16:16:49.000000000 +0100 --- texinfo-6.4.90/info/Makefile.in.orig 2017-07-10 21:06:01.000000000 +0200
+++ texinfo-6.5.92/install-info/tests/Makefile.in 2019-02-18 10:33:52.078877104 +0100 +++ texinfo-6.4.90/info/Makefile.in 2017-07-11 09:58:06.501153160 +0200
@@ -1229,8 +1229,8 @@ ii-0021-test ii-0022-test ii-0023-test i @@ -1367,7 +1367,6 @@ TESTS = \
ii-0026-test ii-0027-test ii-0028-test ii-0029-test ii-0030-test \ t/end-of-line.sh \
ii-0031-test ii-0032-test ii-0033-test ii-0034-test ii-0035-test \ t/goal-column.sh \
ii-0036-test ii-0037-test ii-0038-test ii-0039-test ii-0040-test \ t/star-note-non-whitespace.sh \
-ii-0041-test ii-0042-test ii-0043-test ii-0044-test ii-0045-test \ - t/c-u-m-x-scroll-forward.sh \
-ii-0046-test ii-0047-test ii-0048-test ii-0049-test ii-0050-test \ t/last-no-history.sh \
+ii-0042-test ii-0043-test ii-0044-test ii-0045-test \ t/split-footnotes.sh \
+ii-0046-test ii-0047-test ii-0048-test ii-0049-test \ t/window-split-dir.sh \
ii-0051-test ii-0052-test ii-0053-test ii-0054-test ii-0055-test \ @@ -1392,10 +1391,6 @@ TESTS = \
ii-0056-test ii-0057-test t/search-skip-screen.sh \
t/search-empty.sh \
diff -up texinfo-6.5.92/tp/tests/Makefile.in.orig texinfo-6.5.92/tp/tests/Makefile.in t/close-window-after-search.sh \
--- texinfo-6.5.92/tp/tests/Makefile.in.orig 2019-02-01 16:16:50.000000000 +0100 - t/inc-sea-forward.sh \
+++ texinfo-6.5.92/tp/tests/Makefile.in 2019-02-18 10:33:13.774827269 +0100 - t/inc-sea-forward-nonregex.sh \
@@ -1374,7 +1374,6 @@ one_test_files_generated_list = \ - 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 = \
test_scripts/layout_formatting_html32.sh \ test_scripts/layout_formatting_html32.sh \
test_scripts/layout_formatting_regions.sh \ test_scripts/layout_formatting_regions.sh \
test_scripts/layout_formatting_exotic.sh \ test_scripts/layout_formatting_exotic.sh \
- test_scripts/layout_formatting_fr_icons.sh \ - test_scripts/layout_formatting_fr_icons.sh \
test_scripts/layout_formatting_chm.sh \ test_scripts/layout_formatting_chm.sh \
test_scripts/layout_formatting_nodes.sh \ test_scripts/layout_formatting_nodes.sh \
test_scripts/layout_formatting.sh \ test_scripts/tex_html_block_EOL_tex.sh \

96
SOURCES/texinfo-6.5-covscan-fixes.patch
View File

@ -1,6 +1,6 @@
diff -up texinfo-6.5.91/contrib/fix-info-dir.p7 texinfo-6.5.91/contrib/fix-info-dir diff -up texinfo-6.5/contrib/fix-info-dir.orig texinfo-6.5/contrib/fix-info-dir
--- texinfo-6.5.91/contrib/fix-info-dir.p7 2019-01-21 10:52:18.453973008 +0100 --- texinfo-6.5/contrib/fix-info-dir.orig 2018-10-04 11:34:13.664483757 +0200
+++ texinfo-6.5.91/contrib/fix-info-dir 2019-01-21 10:52:18.456973012 +0100 +++ texinfo-6.5/contrib/fix-info-dir 2018-10-04 11:34:13.666483758 +0200
@@ -28,7 +28,6 @@ if test -z "$LINENO"; then @@ -28,7 +28,6 @@ if test -z "$LINENO"; then
fi fi
@ -9,10 +9,32 @@ diff -up texinfo-6.5.91/contrib/fix-info-dir.p7 texinfo-6.5.91/contrib/fix-info-
MENU_FILTER1='s/^\*\([ ]\)\{1,\}/* /' MENU_FILTER1='s/^\*\([ ]\)\{1,\}/* /'
MENU_FILTER2='s/\([ ]\)\{1,\}$//g' MENU_FILTER2='s/\([ ]\)\{1,\}$//g'
diff -up texinfo-6.5.91/info/infomap.c.p7 texinfo-6.5.91/info/infomap.c diff -up texinfo-6.5/info/echo-area.c.orig texinfo-6.5/info/echo-area.c
--- texinfo-6.5.91/info/infomap.c.p7 2019-01-13 12:43:10.000000000 +0100 --- texinfo-6.5/info/echo-area.c.orig 2017-02-04 02:02:43.000000000 +0100
+++ texinfo-6.5.91/info/infomap.c 2019-01-21 10:52:18.457973013 +0100 +++ texinfo-6.5/info/echo-area.c 2018-10-04 11:34:13.667483758 +0200
@@ -589,6 +589,7 @@ fetch_user_maps (char *init_file) @@ -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;
}
}
diff -up texinfo-6.5/info/info.c.orig texinfo-6.5/info/info.c
--- texinfo-6.5/info/info.c.orig 2017-07-09 17:12:57.000000000 +0200
+++ texinfo-6.5/info/info.c 2018-10-04 11:34:13.667483758 +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;
}
}
diff -up texinfo-6.5/info/infomap.c.orig texinfo-6.5/info/infomap.c
--- texinfo-6.5/info/infomap.c.orig 2017-05-15 18:35:24.000000000 +0200
+++ texinfo-6.5/info/infomap.c 2018-10-04 11:34:13.667483758 +0200
@@ -603,6 +603,7 @@ fetch_user_maps (char *init_file)
compile (inf, filename, &sup_info, &sup_ea); compile (inf, filename, &sup_info, &sup_ea);
free (filename); free (filename);
@ -20,10 +42,10 @@ diff -up texinfo-6.5.91/info/infomap.c.p7 texinfo-6.5.91/info/infomap.c
return 1; return 1;
} }
diff -up texinfo-6.5.91/info/makedoc.c.p7 texinfo-6.5.91/info/makedoc.c diff -up texinfo-6.5/info/makedoc.c.orig texinfo-6.5/info/makedoc.c
--- texinfo-6.5.91/info/makedoc.c.p7 2019-01-13 12:43:10.000000000 +0100 --- texinfo-6.5/info/makedoc.c.orig 2014-11-07 11:58:55.000000000 +0100
+++ texinfo-6.5.91/info/makedoc.c 2019-01-21 10:52:18.457973013 +0100 +++ texinfo-6.5/info/makedoc.c 2018-10-04 11:34:13.667483758 +0200
@@ -425,7 +425,11 @@ process_one_file (char *filename, FILE * @@ -427,7 +427,11 @@ process_one_file (char *filename, FILE *
offset++; offset++;
if (offset >= file_size) if (offset >= file_size)
@ -36,10 +58,10 @@ diff -up texinfo-6.5.91/info/makedoc.c.p7 texinfo-6.5.91/info/makedoc.c
doc = xmalloc (1 + (offset - point)); doc = xmalloc (1 + (offset - point));
strncpy (doc, buffer + point, 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 diff -up texinfo-6.5/info/m-x.c.orig texinfo-6.5/info/m-x.c
--- texinfo-6.5.91/info/m-x.c.p7 2019-01-13 12:43:10.000000000 +0100 --- texinfo-6.5/info/m-x.c.orig 2017-05-14 12:55:17.000000000 +0200
+++ texinfo-6.5.91/info/m-x.c 2019-01-21 10:52:18.457973013 +0100 +++ texinfo-6.5/info/m-x.c 2018-10-04 11:34:13.667483758 +0200
@@ -79,7 +79,10 @@ DECLARE_INFO_COMMAND (describe_command, @@ -81,7 +81,10 @@ DECLARE_INFO_COMMAND (describe_command,
InfoCommand *cmd = named_function (line); InfoCommand *cmd = named_function (line);
if (!cmd) if (!cmd)
@ -51,10 +73,10 @@ diff -up texinfo-6.5.91/info/m-x.c.p7 texinfo-6.5.91/info/m-x.c
window_message_in_echo_area ("%s: %s.", window_message_in_echo_area ("%s: %s.",
line, function_documentation (cmd)); line, function_documentation (cmd));
diff -up texinfo-6.5.91/info/nodes.c.p7 texinfo-6.5.91/info/nodes.c diff -up texinfo-6.5/info/nodes.c.orig texinfo-6.5/info/nodes.c
--- texinfo-6.5.91/info/nodes.c.p7 2019-01-13 12:43:10.000000000 +0100 --- texinfo-6.5/info/nodes.c.orig 2017-07-09 20:51:40.000000000 +0200
+++ texinfo-6.5.91/info/nodes.c 2019-01-21 10:52:18.457973013 +0100 +++ texinfo-6.5/info/nodes.c 2018-10-04 11:34:13.668483758 +0200
@@ -303,7 +303,10 @@ get_nodes_of_tags_table (FILE_BUFFER *fi @@ -306,7 +306,10 @@ get_nodes_of_tags_table (FILE_BUFFER *fi
for (p = 0; nodedef[p] && nodedef[p] != INFO_TAGSEP; p++) for (p = 0; nodedef[p] && nodedef[p] != INFO_TAGSEP; p++)
; ;
if (nodedef[p] != INFO_TAGSEP) if (nodedef[p] != INFO_TAGSEP)
@ -66,7 +88,7 @@ diff -up texinfo-6.5.91/info/nodes.c.p7 texinfo-6.5.91/info/nodes.c
entry->nodename = xmalloc (p + 1); entry->nodename = xmalloc (p + 1);
strncpy (entry->nodename, nodedef, p); strncpy (entry->nodename, nodedef, p);
@@ -477,6 +480,7 @@ get_tags_of_indirect_tags_table (FILE_BU @@ -480,6 +483,7 @@ get_tags_of_indirect_tags_table (FILE_BU
} }
file_buffer->subfiles = NULL; file_buffer->subfiles = NULL;
free_file_buffer_tags (file_buffer); free_file_buffer_tags (file_buffer);
@ -74,10 +96,10 @@ diff -up texinfo-6.5.91/info/nodes.c.p7 texinfo-6.5.91/info/nodes.c
return; return;
} }
diff -up texinfo-6.5.91/info/session.c.p7 texinfo-6.5.91/info/session.c diff -up texinfo-6.5/info/session.c.orig texinfo-6.5/info/session.c
--- texinfo-6.5.91/info/session.c.p7 2019-01-13 12:43:10.000000000 +0100 --- texinfo-6.5/info/session.c.orig 2017-07-06 20:49:26.000000000 +0200
+++ texinfo-6.5.91/info/session.c 2019-01-21 10:52:18.458973014 +0100 +++ texinfo-6.5/info/session.c 2018-10-04 11:34:13.668483758 +0200
@@ -3552,6 +3552,7 @@ DECLARE_INFO_COMMAND (info_goto_invocati @@ -3554,6 +3554,7 @@ DECLARE_INFO_COMMAND (info_goto_invocati
if (!line) if (!line)
{ {
info_abort_key (window, 0); info_abort_key (window, 0);
@ -85,10 +107,10 @@ diff -up texinfo-6.5.91/info/session.c.p7 texinfo-6.5.91/info/session.c
return; return;
} }
if (*line) if (*line)
diff -up texinfo-6.5.91/info/variables.c.p7 texinfo-6.5.91/info/variables.c diff -up texinfo-6.5/info/variables.c.orig texinfo-6.5/info/variables.c
--- texinfo-6.5.91/info/variables.c.p7 2019-01-13 12:43:10.000000000 +0100 --- texinfo-6.5/info/variables.c.orig 2017-05-03 21:48:19.000000000 +0200
+++ texinfo-6.5.91/info/variables.c 2019-01-21 10:52:18.459973015 +0100 +++ texinfo-6.5/info/variables.c 2018-10-04 11:34:13.669483758 +0200
@@ -359,6 +359,7 @@ read_variable_name (char *prompt, WINDOW @@ -361,6 +361,7 @@ read_variable_name (char *prompt, WINDOW
{ {
char *line; char *line;
REFERENCE **variables; REFERENCE **variables;
@ -96,7 +118,7 @@ diff -up texinfo-6.5.91/info/variables.c.p7 texinfo-6.5.91/info/variables.c
/* Get the completion array of variable names. */ /* Get the completion array of variable names. */
variables = make_variable_completions_array (); variables = make_variable_completions_array ();
@@ -382,7 +383,9 @@ read_variable_name (char *prompt, WINDOW @@ -384,7 +385,9 @@ read_variable_name (char *prompt, WINDOW
return NULL; return NULL;
} }
@ -107,10 +129,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 /* 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 diff -up texinfo-6.5/install-info/install-info.c.orig texinfo-6.5/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/install-info/install-info.c.orig 2018-10-04 11:34:13.661483757 +0200
+++ texinfo-6.5.91/install-info/install-info.c 2019-01-21 10:52:18.460973016 +0100 +++ texinfo-6.5/install-info/install-info.c 2018-10-04 11:34:13.669483758 +0200
@@ -864,10 +864,16 @@ determine_file_type: @@ -867,10 +867,16 @@ determine_file_type:
char *command = concat (*compression_program, " -d", ""); char *command = concat (*compression_program, " -d", "");
if (gzclose (f) < 0) if (gzclose (f) < 0)
@ -129,7 +151,7 @@ diff -up texinfo-6.5.91/install-info/install-info.c.p7 texinfo-6.5.91/install-in
p = popen (command, "r"); p = popen (command, "r");
if (!p) if (!p)
{ {
@@ -877,6 +883,7 @@ determine_file_type: @@ -880,6 +886,7 @@ determine_file_type:
} }
else else
*is_pipe = 1; *is_pipe = 1;
@ -137,7 +159,7 @@ diff -up texinfo-6.5.91/install-info/install-info.c.p7 texinfo-6.5.91/install-in
return p; return p;
} }
else else
@@ -920,7 +927,10 @@ readfile (char *filename, int *sizep, @@ -923,7 +930,10 @@ readfile (char *filename, int *sizep,
&pipe_p); &pipe_p);
if (!f) if (!f)
@ -149,7 +171,7 @@ diff -up texinfo-6.5.91/install-info/install-info.c.p7 texinfo-6.5.91/install-in
for (;;) for (;;)
{ {
@@ -980,6 +990,7 @@ output_dirfile (char *dirfile, int dir_n @@ -983,6 +993,7 @@ output_dirfile (char *dirfile, int dir_n
{ {
char *command = concat (compression_program, ">", dirfile_tmp); char *command = concat (compression_program, ">", dirfile_tmp);
output = popen (command, "w"); output = popen (command, "w");
@ -157,7 +179,7 @@ diff -up texinfo-6.5.91/install-info/install-info.c.p7 texinfo-6.5.91/install-in
} }
else else
output = fopen (dirfile_tmp, "w"); output = fopen (dirfile_tmp, "w");
@@ -1721,6 +1732,8 @@ reformat_new_entries (struct spec_entry @@ -1724,6 +1735,8 @@ reformat_new_entries (struct spec_entry
format_entry (name, name_len, desc, desc_len, calign, align, format_entry (name, name_len, desc, desc_len, calign, align,
maxwidth, &entry->text, &entry->text_len); maxwidth, &entry->text, &entry->text_len);

7
SOURCES/texinfo-6.5.tar.xz.sig Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iF4EABEIAAYFAlm4QBsACgkQ3bxXnas3+6mlNwD/Tzn0IxHxWCII18A72dLZ0rDB
0GtvrWV4c/wtYHSGSNEA/3iIAv2qbGreDAXAzLHKsWm5vKzFvRPeDS7GBJQg018q
=EUkI
-----END PGP SIGNATURE-----

53
SOURCES/texinfo-6.7-convscan-fixes.patch
View File

@ -1,53 +0,0 @@
diff -up texinfo-6.7/gnulib/lib/regex_internal.c.orig texinfo-6.7/gnulib/lib/regex_internal.c
--- texinfo-6.7/gnulib/lib/regex_internal.c.orig 2019-08-25 19:11:45.000000000 +0200
+++ texinfo-6.7/gnulib/lib/regex_internal.c 2022-02-09 09:51:41.084596377 +0100
@@ -1724,7 +1724,10 @@ create_cd_newstate (const re_dfa_t *dfa,
}
if (re_node_set_init_copy (newstate->entrance_nodes, nodes)
!= REG_NOERROR)
- return NULL;
+ {
+ free_state (newstate);
+ return NULL;
+ }
nctx_nodes = 0;
newstate->has_constraint = 1;
}
diff -up texinfo-6.7/info/session.c.orig texinfo-6.7/info/session.c
--- texinfo-6.7/info/session.c.orig 2022-02-09 09:51:30.952589716 +0100
+++ texinfo-6.7/info/session.c 2022-02-09 09:51:41.085596377 +0100
@@ -2897,7 +2897,10 @@ DECLARE_INFO_COMMAND (info_menu_sequence
node = info_follow_menus (dir_node, nodes, &error, 0);
info_set_node_of_window (window, node);
if (error)
- show_error_node (error);
+ {
+ show_error_node (error);
+ free (error);
+ }
}
free (nodes);
@@ -3668,8 +3671,9 @@ DECLARE_INFO_COMMAND (info_view_file, _(
else
info_set_node_of_window (window, node);
- free (line);
}
+
+ free (line);
}
/* **************************************************************** */
diff -up texinfo-6.7/util/texi2dvi.orig texinfo-6.7/util/texi2dvi
--- texinfo-6.7/util/texi2dvi.orig 2019-09-23 20:28:10.000000000 +0200
+++ texinfo-6.7/util/texi2dvi 2022-02-09 09:51:41.086596378 +0100
@@ -1697,7 +1697,7 @@ cleanup ()
input_file_name_decode ()
{
case $command_line_filename in
- *\\input{*}*)
+ *\\input\{*\}*)
# Let AUC-TeX error parser deal with line numbers.
line_error=false
command_line_filename=`\

12
SOURCES/texinfo-6.7-fix-function-exit.patch
View File

@ -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

8
SOURCES/texinfo-6.7.tar.xz.sig
View File

@ -1,8 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCXYpOxhkcZ2F2aW5zbWl0
aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/upFfsA/ijrBDSblwgcANew2xreyJMk
2oicyeBfOWwiSbjlBNSsAP4+mM2vwqo2CAHqUd2CHGV0tz/FnU7SxPrOdJneUIc2
xQ==
=5SpL
-----END PGP SIGNATURE-----

135
SPECS/texinfo.spec
View File

@ -1,13 +1,15 @@
%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 Summary: Tools needed to create Texinfo format documentation files
Name: texinfo Name: texinfo
Version: 6.7 Version: 6.5
Release: 15%{?dist} Release: 7%{?dist}
License: GPLv3+ License: GPLv3+
Url: http://www.gnu.org/software/texinfo/ Url: http://www.gnu.org/software/texinfo/
Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
Source1: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz.sig Source1: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz.sig
# Source5: macro definitions
Source5: macros.info
Patch0: texinfo-4.12-zlib.patch 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 tests pass fine in local build
Patch1: texinfo-6.0-disable-failing-info-test.patch Patch1: texinfo-6.0-disable-failing-info-test.patch
@ -15,21 +17,15 @@ Patch1: texinfo-6.0-disable-failing-info-test.patch
Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.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: we need to fix template fix-info-dir generates
Patch3: info-6.5-sync-fix-info-dir.patch Patch3: info-6.5-sync-fix-info-dir.patch
# Patch4: rhbz#1592433, bug in fix-info-dir --delete # Patch4: fixes issues detected by static analysis
Patch4: texinfo-6.5-fix-info-dir.patch Patch4: texinfo-6.5-covscan-fixes.patch
# Patch5: fixes issues detected by static analysis # Patch5: rhbz#2022201, fixes a loop when /dev/null doesn't exist
Patch5: texinfo-6.5-covscan-fixes.patch Patch5: texinfo-6.5-fix-info-dir.patch
# Patch6: fixes issue found by ShellCheck in test script
Patch6: texinfo-6.7-fix-function-exit.patch
# Patch7: fixes another batch of issues detected by static analysis
Patch7: texinfo-6.7-convscan-fixes.patch
BuildRequires: make
BuildRequires: gcc BuildRequires: gcc
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper) BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper)
BuildRequires: perl(Locale::Messages), perl(Unicode::EastAsianWidth), perl(Text::Unidecode) BuildRequires: perl(Locale::Messages), perl(Unicode::EastAsianWidth), perl(Text::Unidecode)
BuildRequires: perl(Storable), perl(Unicode::Normalize) BuildRequires: perl(Storable)
# Texinfo perl packages are not installed in default perl library dirs # Texinfo perl packages are not installed in default perl library dirs
%global __provides_exclude ^perl\\(.*Texinfo.*\\)$ %global __provides_exclude ^perl\\(.*Texinfo.*\\)$
@ -58,9 +54,6 @@ Requires: texinfo = %{version}-%{release}
Requires: tex(tex) tex(epsf.tex) Requires: tex(tex) tex(epsf.tex)
Requires(post): %{_bindir}/texconfig-sys Requires(post): %{_bindir}/texconfig-sys
Requires(postun): %{_bindir}/texconfig-sys Requires(postun): %{_bindir}/texconfig-sys
Provides: tex-texinfo
Provides: texlive-texinfo
Obsoletes: texlive-texinfo <= 9:2019-15
%description tex %description tex
Texinfo is a documentation system that can produce both online Texinfo is a documentation system that can produce both online
@ -92,6 +85,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin
install -Dpm0755 -t %{buildroot}%{_sbindir} contrib/fix-info-dir 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}
%find_lang %{name}_document %find_lang %{name}_document
@ -134,6 +130,7 @@ export ALL_TESTS=yes
%{_mandir}/man1/info.1* %{_mandir}/man1/info.1*
%{_mandir}/man1/install-info.1* %{_mandir}/man1/install-info.1*
%{_mandir}/man5/info.5* %{_mandir}/man5/info.5*
%{_rpmconfigdir}/macros.d/macros.info
%ghost %{_infodir}/dir %ghost %{_infodir}/dir
%ghost %attr(644, root, root) %{_infodir}/dir.old %ghost %attr(644, root, root) %{_infodir}/dir.old
@ -149,99 +146,23 @@ export ALL_TESTS=yes
%{_mandir}/man1/pdftexi2dvi.1* %{_mandir}/man1/pdftexi2dvi.1*
%changelog %changelog
* Mon Feb 21 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.7-15 * Mon Jan 17 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.5-7
- Fix a loop in fix-info-dir when /dev/null doesn't exist
Resolves: #2022201
* Thu Jan 09 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.5-6
- Fix file mode for dir.old (fixes failing rpm -V info)
Related: #1708912
* Thu Dec 12 2019 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.5-5
- Rebuild - Rebuild
Related: #1938884 Resolves: #1708912
- Enable gating on OSCI
Resolves: #1681507
* Wed Feb 16 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.7-14 * Tue Oct 09 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.5-4
- Rebuild
Related: #1938884
* Thu Feb 10 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.7-13
- Fix issues found by static analysis
Resolves: #1938884
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 6.7-12
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.7-11
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Feb 02 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.7-10
- Fix problem in shell code found by ShellCheck in test script
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.7-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.7-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Mar 16 2020 Jitka Plesnikova <jplesnik@redhat.com> - 6.7-7
- Add BR: perl(Unicode::Normalize)
* Thu Mar 5 2020 Tom Callaway <spot@fedoraproject.org> - 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 <releng@fedoraproject.org> - 6.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 24 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 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 <vcrhonek@redhat.com> - 6.7-3
- Fix mode of dir.old
* Tue Oct 08 2019 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.7-2
- Revert move of texinfo-tex files
Resolves: #1758817
* Thu Sep 26 2019 Vitezslav Crhonek <vcrhonek@redhat.com> - 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 <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 - Fix issues detected by static analysis
Resolves: #1606966
* 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 * Tue Feb 13 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.5-3
- Implement transaction filetriggers for crating info/dir - Implement transaction filetriggers for crating info/dir