From a76aa943cfd0901fd14b111841beb6f2a9fe5824 Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@norcus.(none)>
Date: Tue, 31 Aug 2010 13:11:26 +0200
Subject: [PATCH 1/2] Fix info crash when using index in help window

---
 texinfo-4.13a-help-index-segfault.patch | 23 +++++++++++++++++++++++
 texinfo.spec                            |  9 ++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 texinfo-4.13a-help-index-segfault.patch

diff --git a/texinfo-4.13a-help-index-segfault.patch b/texinfo-4.13a-help-index-segfault.patch
new file mode 100644
index 0000000..6194176
--- /dev/null
+++ b/texinfo-4.13a-help-index-segfault.patch
@@ -0,0 +1,23 @@
+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.spec b/texinfo.spec
index e1bc5a6..3b59e88 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -15,6 +15,8 @@ Patch1: texinfo-4.13a-data_types.patch
 # Patch2: is already upstream
 Patch2: texinfo-4.13a-mosdo-crash.patch
 Patch3: texinfo-4.13a-powerpc.patch
+# Patch4: accepted by upstream, bz579263
+Patch4: texinfo-4.13a-help-index-segfault.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +62,7 @@ for printing using TeX.
 %patch1 -p1 -b .data_types
 %patch2 -p1 -b .mosdo-crash
 %patch3 -p1 -b .powerpc
+%patch4 -p1 -b .help-index-segfault
 
 %build
 %configure
@@ -159,6 +162,10 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Tue Aug 31 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.13a-10
+- Fix info crash when using index in help window
+  Resolves: #579263
+
 * Mon Jan 11 2010 Jan Gorig <jgorig@redhat.com> - 4.13a-9
 - Fix PowerPC return code bug #531349
 

From 1cbcd7e2335a6f95357fdffdadcb2b20d730ba78 Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Mon, 11 Oct 2010 14:47:27 +0200
Subject: [PATCH 2/2] Fix incopatible regexp with the lates version of egrep in
 texi2dvi script

---
 texinfo-4.13a-texi2dvi-regexp.patch | 12 ++++++++++++
 texinfo.spec                        | 11 +++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 texinfo-4.13a-texi2dvi-regexp.patch

diff --git a/texinfo-4.13a-texi2dvi-regexp.patch b/texinfo-4.13a-texi2dvi-regexp.patch
new file mode 100644
index 0000000..54dabac
--- /dev/null
+++ b/texinfo-4.13a-texi2dvi-regexp.patch
@@ -0,0 +1,12 @@
+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.spec b/texinfo.spec
index 3b59e88..9b0a709 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -17,10 +17,12 @@ Patch2: texinfo-4.13a-mosdo-crash.patch
 Patch3: texinfo-4.13a-powerpc.patch
 # Patch4: accepted by upstream, bz579263
 Patch4: texinfo-4.13a-help-index-segfault.patch
+# Patch5: already upstream, bz641534
+Patch5: texinfo-4.13a-texi2dvi-regexp.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: zlib-devel, ncurses-devel
+BuildRequires: zlib-devel, ncurses-devel, help2man
 
 %description
 Texinfo is a documentation system that can produce both online
@@ -63,6 +65,7 @@ for printing using TeX.
 %patch2 -p1 -b .mosdo-crash
 %patch3 -p1 -b .powerpc
 %patch4 -p1 -b .help-index-segfault
+%patch5 -p1 -b .texi2dvi-regexp
 
 %build
 %configure
@@ -162,6 +165,10 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Mon Oct 11 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.13a-11
+- Fix incopatible regexp with the lates version of egrep in texi2dvi script
+  Resolves: #641534
+
 * Tue Aug 31 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.13a-10
 - Fix info crash when using index in help window
   Resolves: #579263