Compare commits
No commits in common. 'c9' and 'c10-beta' have entirely different histories.
@ -1 +1,3 @@
|
||||
SOURCES/texinfo-6.7.tar.xz
|
||||
SOURCES/fix-info-dir
|
||||
SOURCES/info-6.5-sync-fix-info-dir.patch
|
||||
SOURCES/texinfo-7.1.tar.xz
|
||||
|
||||
@ -1 +1,3 @@
|
||||
d84d46368e2694919c05a539cb8c616ac89bf4df SOURCES/texinfo-6.7.tar.xz
|
||||
97524a044cd04e1e947e0620425d94e8d1239bc4 SOURCES/fix-info-dir
|
||||
6395e3cb1f421702de10459c73f4882b2226e7b4 SOURCES/info-6.5-sync-fix-info-dir.patch
|
||||
1bb0fcde3d6bdaaabd620926d4648ac18956c03e SOURCES/texinfo-7.1.tar.xz
|
||||
|
||||
@ -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 <getopt.h>
|
||||
#include <regex.h>
|
||||
#include <argz.h>
|
||||
+#include <zlib.h>
|
||||
|
||||
#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)
|
||||
@ -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 \
|
||||
@ -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
|
||||
@ -1,8 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCXYpOxhkcZ2F2aW5zbWl0
|
||||
aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/upFfsA/ijrBDSblwgcANew2xreyJMk
|
||||
2oicyeBfOWwiSbjlBNSsAP4+mM2vwqo2CAHqUd2CHGV0tz/FnU7SxPrOdJneUIc2
|
||||
xQ==
|
||||
=5SpL
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -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;
|
||||
@ -0,0 +1,8 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCZS/iphkcZ2F2aW5zbWl0
|
||||
aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/up5LYBALwlhLMF0ms2VhWq8mXvHbii
|
||||
L2ySgaLsL1Pe3bFv6UC5AP0XSWsH5VQGq3wRVvo5KCH9TIi2aAMZ3RrfJbaPmxHS
|
||||
xA==
|
||||
=bAky
|
||||
-----END PGP SIGNATURE-----
|
||||
Loading…
Reference in new issue