* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 07fddc52ff27f3fb1b65c49c4301719d5622620e
@ 2013-03-16 12:49 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-03-16 12:49 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 18818 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 07fddc52ff27f3fb1b65c49c4301719d5622620e (commit)
via 4df7a0acef1e40ebc60bcdfcd0f437816d933f14 (commit)
via 984546cd6eb2e6109f1943a3b0eade0307bcdce5 (commit)
from a2634ecb8ddbc2883fb9304b2effccc76e3b5881 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 07fddc52ff27f3fb1b65c49c4301719d5622620e
Author: Thomas Ebert <thomas.ebert(a)ipfire.org>
Date: Sat Mar 16 10:01:39 2013 +0100
texinfo: Update to version 5.1.
Fixes bug #10308.
commit 4df7a0acef1e40ebc60bcdfcd0f437816d933f14
Author: Thomas Ebert <thomas.ebert(a)ipfire.org>
Date: Sat Mar 16 09:56:50 2013 +0100
perl-libintl-perl: New package.
This is required by texinfo >= 5.1.
commit 984546cd6eb2e6109f1943a3b0eade0307bcdce5
Author: Thomas Ebert <thomas.ebert(a)ipfire.org>
Date: Sat Mar 16 10:06:34 2013 +0100
file: Updated to recent version 5.13
Fixes bug #10309.
-----------------------------------------------------------------------
Summary of changes:
file/file.nm | 2 +-
.../perl-libintl-perl.nm | 27 ++--
texinfo/patches/texinfo-4.12-zlib.patch | 169 ---------------------
texinfo/patches/texinfo-4.13a-data_types.patch | 32 ----
.../texinfo-4.13a-help-index-segfault.patch | 23 ---
.../texinfo-4.13a-makeinfo-sectioning.patch | 20 ---
texinfo/patches/texinfo-4.13a-mosdo-crash.patch | 11 --
texinfo/patches/texinfo-4.13a-powerpc.patch | 12 --
texinfo/patches/texinfo-4.13a-testsuite_fix.patch | 13 --
.../patches/texinfo-4.13a-texi2dvi-regexp.patch | 12 --
texinfo/texinfo.nm | 7 +-
11 files changed, 16 insertions(+), 312 deletions(-)
copy perl-BDB/perl-BDB.nm => perl-libintl-perl/perl-libintl-perl.nm (55%)
delete mode 100644 texinfo/patches/texinfo-4.12-zlib.patch
delete mode 100644 texinfo/patches/texinfo-4.13a-data_types.patch
delete mode 100644 texinfo/patches/texinfo-4.13a-help-index-segfault.patch
delete mode 100644 texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch
delete mode 100644 texinfo/patches/texinfo-4.13a-mosdo-crash.patch
delete mode 100644 texinfo/patches/texinfo-4.13a-powerpc.patch
delete mode 100644 texinfo/patches/texinfo-4.13a-testsuite_fix.patch
delete mode 100644 texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch
Difference in files:
diff --git a/file/file.nm b/file/file.nm
index c9f1f67..c9eed0d 100644
--- a/file/file.nm
+++ b/file/file.nm
@@ -4,7 +4,7 @@
###############################################################################
name = file
-version = 5.12
+version = 5.13
release = 1
groups = System/Tools
diff --git a/perl-libintl-perl/perl-libintl-perl.nm b/perl-libintl-perl/perl-libintl-perl.nm
new file mode 100644
index 0000000..eb511b0
--- /dev/null
+++ b/perl-libintl-perl/perl-libintl-perl.nm
@@ -0,0 +1,49 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = perl-libintl-perl
+version = 1.23
+release = 1
+thisapp = libintl-perl-%{version}
+
+groups = Development/Libraries
+url = http://search.cpan.org/dist/libintl-perl/
+license = GPL+ or Artistic
+summary = An internationalization library for Perl
+
+description
+ The package libintl-perl is an internationalization library for Perl
+ that aims to be compatible with the Uniforum message translations
+ system as implemented for example in GNU gettext.
+end
+
+source_dl = http://search.cpan.org/CPAN/authors/id/G/GU/GUIDO/
+
+build
+ requires
+ # required for perl macros
+ pakfire-builder >= 0.9.23-6
+ perl(ExtUtils::MakeMaker)
+ end
+
+ build
+ perl Makefile.PL INSTALLDIRS=vendor
+ make %{PARALLELISMFLAGS}
+ end
+
+ test
+ make test
+ end
+
+ make_install_targets = pure_install DESTDIR=%{BUILDROOT}
+end
+
+packages
+ package %{name}
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/texinfo/patches/texinfo-4.12-zlib.patch b/texinfo/patches/texinfo-4.12-zlib.patch
deleted file mode 100644
index 3635b55..0000000
--- a/texinfo/patches/texinfo-4.12-zlib.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-diff -up texinfo-4.12/install-info/Makefile.in_old texinfo-4.12/install-info/Makefile.in
---- texinfo-4.12/install-info/Makefile.in_old 2008-05-13 13:33:55.000000000 +0200
-+++ texinfo-4.12/install-info/Makefile.in 2008-05-13 13:52:35.000000000 +0200
-@@ -114,7 +114,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- 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 = ../lib/libtxi.a \
- $(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1)
-diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/install-info.c
---- texinfo-4.12/install-info/install-info.c_old 2008-05-13 13:52:44.000000000 +0200
-+++ texinfo-4.12/install-info/install-info.c 2008-05-14 10:30:53.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <getopt.h>
- #include <regex.h>
- #include <argz.h>
-+#include <zlib.h>
-
- #define TAB_WIDTH 8
-
-@@ -638,7 +639,7 @@ The first time you invoke Info you start
- COMPRESSION_PROGRAM. The compression program is determined by the
- magic number, not the filename. */
-
--FILE *
-+void *
- open_possibly_compressed_file (char *filename,
- void (*create_callback) (char *),
- char **opened_filename, char **compression_program, int *is_pipe)
-@@ -646,7 +647,7 @@ open_possibly_compressed_file (char *fil
- 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. */
-@@ -654,22 +655,22 @@ 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, ".bz2", "");
-- 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__
-@@ -677,13 +678,13 @@ open_possibly_compressed_file (char *fil
- {
- 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
- if (!f)
-@@ -695,7 +696,7 @@ open_possibly_compressed_file (char *fil
- /* And try opening it again. */
- free (*opened_filename);
- *opened_filename = filename;
-- f = fopen (*opened_filename, FOPEN_RBIN);
-+ f = gzopen (*opened_filename, FOPEN_RBIN);
- if (!f)
- pfatal_with_name (filename);
- }
-@@ -706,12 +707,12 @@ 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))
- {
- /* Empty files don't set errno, so we get something like
- "install-info: No error for foo", which is confusing. */
-- if (nread == 0)
-+ if (nread >= 0)
- fatal (_("%s: empty file"), *opened_filename, 0);
- pfatal_with_name (*opened_filename);
- }
-@@ -758,20 +759,22 @@ open_possibly_compressed_file (char *fil
-
- if (*compression_program)
- { /* It's compressed, so fclose the file and then open a pipe. */
-+ FILE *p;
- char *command = concat (*compression_program," -cd <", *opened_filename);
-- if (fclose (f) < 0)
-+ if (gzclose (f) < 0)
- pfatal_with_name (*opened_filename);
-- f = popen (command, "r");
-- if (f)
-+ p = popen (command, "r");
-+ if (p)
- *is_pipe = 1;
- else
- pfatal_with_name (command);
-+ return p;
- }
- else
- { /* It's a plain file, seek back over the magic bytes. */
-- if (fseek (f, 0, 0) < 0)
-+ if (gzseek (f, 0, SEEK_SET) < 0)
- pfatal_with_name (*opened_filename);
--#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);
-@@ -796,7 +799,7 @@ readfile (char *filename, int *sizep,
- char **compression_program)
- {
- char *real_name;
-- FILE *f;
-+ void *f;
- int pipe_p;
- int filled = 0;
- int data_size = 8192;
-@@ -810,7 +813,12 @@ readfile (char *filename, int *sizep,
-
- 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)
- pfatal_with_name (real_name);
- if (nread == 0)
-@@ -832,7 +840,7 @@ readfile (char *filename, int *sizep,
- if (pipe_p)
- pclose (f);
- else
-- fclose (f);
-+ gzclose (f);
-
- *sizep = filled;
- return data;
diff --git a/texinfo/patches/texinfo-4.13a-data_types.patch b/texinfo/patches/texinfo-4.13a-data_types.patch
deleted file mode 100644
index 2a87c21..0000000
--- a/texinfo/patches/texinfo-4.13a-data_types.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
---- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200
-+++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200
-@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
- const char *carried_over_ptr;
- size_t carried_over_len, carried_over_count;
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-+ size_t cur_len = mb_len (mbi_cur (iter));
- int replen;
- int delim = 0;
- int rc;
-@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
- mbi_advance (iter))
- {
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-+ size_t cur_len = mb_len (mbi_cur (iter));
-
- if (cur_len == 1)
- {
-@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
- mbi_advance (iter))
- {
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-- int replen;
-+ size_t cur_len = mb_len (mbi_cur (iter));
-+ size_t replen;
-
- if (cur_ptr >= endp)
- break;
diff --git a/texinfo/patches/texinfo-4.13a-help-index-segfault.patch b/texinfo/patches/texinfo-4.13a-help-index-segfault.patch
deleted file mode 100644
index 6194176..0000000
--- a/texinfo/patches/texinfo-4.13a-help-index-segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up texinfo-4.13/info/indices.c.orig texinfo-4.13/info/indices.c
---- texinfo-4.13/info/indices.c.orig 2010-08-31 12:04:38.317462471 +0200
-+++ texinfo-4.13/info/indices.c 2010-08-31 12:11:49.322624552 +0200
-@@ -192,6 +192,7 @@ do_info_index_search (WINDOW *window, in
- index for, build and remember an index now. */
- fb = file_buffer_of_window (window);
- if (!initial_index_filename ||
-+ !fb ||
- (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
- {
- info_free_references (index_index);
-@@ -287,8 +288,9 @@ index_entry_exists (WINDOW *window, char
- return 0;
-
- fb = file_buffer_of_window (window);
-- if (!initial_index_filename
-- || (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
-+ if (!initial_index_filename ||
-+ !fb ||
-+ (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
- {
- info_free_references (index_index);
- index_index = info_indices_of_file_buffer (fb);
diff --git a/texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch b/texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch
deleted file mode 100644
index 75a2986..0000000
--- a/texinfo/patches/texinfo-4.13a-makeinfo-sectioning.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up texinfo-4.13/makeinfo/sectioning.c.orig texinfo-4.13/makeinfo/sectioning.c
---- texinfo-4.13/makeinfo/sectioning.c.orig 2010-11-10 11:24:53.000000000 +0100
-+++ texinfo-4.13/makeinfo/sectioning.c 2010-11-10 11:25:28.000000000 +0100
-@@ -256,14 +256,14 @@ current_chapter_number (void)
- return xstrdup ("");
- else if (enum_marker == APPENDIX_MAGIC)
- {
-- char s[1];
-+ char s[2];
- sprintf (s, "%c", numbers[0] + 64);
- return xstrdup (s);
- }
- else
- {
- char s[5];
-- sprintf (s, "%d", numbers[0]);
-+ sprintf (s, "%4d", numbers[0]);
- return xstrdup (s);
- }
- }
diff --git a/texinfo/patches/texinfo-4.13a-mosdo-crash.patch b/texinfo/patches/texinfo-4.13a-mosdo-crash.patch
deleted file mode 100644
index 77e3a76..0000000
--- a/texinfo/patches/texinfo-4.13a-mosdo-crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- texinfo-4.13/install-info/install-info.c.mosdo-crash 2009-09-02 20:18:44.000000000 -0400
-+++ texinfo-4.13/install-info/install-info.c 2009-09-02 20:19:53.000000000 -0400
-@@ -1765,7 +1765,7 @@
- err = argz_add (&argz, &argz_len, opt);
- free (opt); opt = NULL;
-
-- opt = xmalloc (strlen (regex) + sizeof ("--section="));
-+ opt = xmalloc (strlen (title) + sizeof ("--section="));
- if (sprintf (opt, "--section=%s", title) == -1)
- err = 1;
- if (!err)
diff --git a/texinfo/patches/texinfo-4.13a-powerpc.patch b/texinfo/patches/texinfo-4.13a-powerpc.patch
deleted file mode 100644
index b6c046e..0000000
--- a/texinfo/patches/texinfo-4.13a-powerpc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up texinfo-4.13/install-info/install-info.c.patch texinfo-4.13/install-info/install-info.c
---- texinfo-4.13/install-info/install-info.c.patch 2010-01-11 14:46:32.000000000 +0100
-+++ texinfo-4.13/install-info/install-info.c 2010-01-11 14:48:47.162152695 +0100
-@@ -772,7 +772,7 @@ open_possibly_compressed_file (char *fil
- }
- else
- { /* It's a plain file, seek back over the magic bytes. */
-- if (gzseek (f, 0, SEEK_SET) < 0)
-+ if (gzseek (f, 0, SEEK_SET) == -1)
- pfatal_with_name (*opened_filename);
- #if 0 && O_BINARY
- /* Since this is a text file, and we opened it in binary mode,
diff --git a/texinfo/patches/texinfo-4.13a-testsuite_fix.patch b/texinfo/patches/texinfo-4.13a-testsuite_fix.patch
deleted file mode 100644
index 5286e7d..0000000
--- a/texinfo/patches/texinfo-4.13a-testsuite_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur a/makeinfo/tests/accentenc b/makeinfo/tests/accentenc
---- a/makeinfo/tests/accentenc 2004-04-11 19:56:47.000000000 +0200
-+++ b/makeinfo/tests/accentenc 2011-07-27 20:24:36.603237061 +0200
-@@ -1,7 +1,8 @@
- #!/bin/sh
- # Test encoded accent info output.
-
--unset TEXINFO_OUTPUT
-+unset TEXINFO_OUTPUT LANG LANGUAGE
-+LC_ALL=POSIX; export LC_ALL
- : ${srcdir=.}
- input=`basename $0`.txi
- output=`basename $0`.info
diff --git a/texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch b/texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch
deleted file mode 100644
index 54dabac..0000000
--- a/texinfo/patches/texinfo-4.13a-texi2dvi-regexp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up texinfo-4.13/util/texi2dvi.orig texinfo-4.13/util/texi2dvi
---- texinfo-4.13/util/texi2dvi.orig 2010-10-11 14:08:21.340831908 +0200
-+++ texinfo-4.13/util/texi2dvi 2010-10-11 14:12:14.235841752 +0200
-@@ -1683,7 +1683,7 @@ input_file_name_decode ()
-
- # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
- # prepend `./' in order to avoid that the tools take it as an option.
-- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
-+ echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \
- || command_line_filename="./$command_line_filename"
-
- # See if the file exists. If it doesn't we're in trouble since, even
diff --git a/texinfo/texinfo.nm b/texinfo/texinfo.nm
index a59e450..e96c731 100644
--- a/texinfo/texinfo.nm
+++ b/texinfo/texinfo.nm
@@ -4,8 +4,8 @@
###############################################################################
name = texinfo
-version = 4.13a
-release = 2
+version = 5.1
+release = 1
groups = Applications/Publishing
url = http://www.gnu.org/software/texinfo/
@@ -24,11 +24,10 @@ build
requires
help2man
ncurses-devel
+ perl-libintl-perl
zlib-devel
end
- DIR_APP = %{DIR_SRC}/%{name}-4.13
-
test
make check
end
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-16 12:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-16 12:49 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 07fddc52ff27f3fb1b65c49c4301719d5622620e git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox