[groff/f14/master] fix 665535, 670580
jvcelak
jvcelak at fedoraproject.org
Fri Jan 21 17:22:16 UTC 2011
commit 473fcd8c4c739cb26212406b7fe8764b98d300b5
Author: Jan Vcelak <jvcelak at redhat.com>
Date: Fri Jan 21 18:20:31 2011 +0100
fix 665535, 670580
/usr/share/groff/1.20.1/tmac/doc.tmac:3375: bad character definition
[abrt] groff-1.20.1-2.fc14: assertion_failed: Process /usr/bin/troff was
killed by signal 6 (SIGABRT)
groff-ec-before-mapping.patch | 28 +++++++++++++++++++
groff-makenode-error-abrt.patch | 17 ++++++++++++
groff-manpages-typos.patch | 56 +++++++++++++++++++++++++++++++++++++++
groff.spec | 13 ++++++++-
4 files changed, 113 insertions(+), 1 deletions(-)
---
diff --git a/groff-ec-before-mapping.patch b/groff-ec-before-mapping.patch
new file mode 100644
index 0000000..503b92a
--- /dev/null
+++ b/groff-ec-before-mapping.patch
@@ -0,0 +1,28 @@
+tmac/doc.tmac: Call `ec' before mapping characters.
+
+Resolves: #665535
+Upstream: http://lists.gnu.org/archive/html/groff-commit/2009-04/msg00000.html
+
+diff -uNPrp groff-1.20.1/tmac/doc.tmac groff-1.20.1/tmac/doc.tmac
+--- groff-1.20.1/tmac/doc.tmac 2009-01-09 15:25:52.000000000 +0100
++++ groff-1.20.1/tmac/doc.tmac 2011-01-21 17:44:29.199598336 +0100
+@@ -6425,6 +6425,9 @@
+ .blm doc-empty-line
+ .
+ .
++.ec
++.
++.
+ .\" For UTF-8, map some characters conservatively for the sake
+ .\" of easy cut and paste.
+ .
+@@ -6438,9 +6441,6 @@
+ .\}
+ .
+ .
+-.ec
+-.
+-.
+ .\" load local modifications
+ .mso mdoc.local
+ .
diff --git a/groff-makenode-error-abrt.patch b/groff-makenode-error-abrt.patch
new file mode 100644
index 0000000..bd71dfe
--- /dev/null
+++ b/groff-makenode-error-abrt.patch
@@ -0,0 +1,17 @@
+Missing '%' in error message raised from make_node caused SIGABRT.
+
+Resolves: #670580
+Upstream: http://www.mail-archive.com/groff-commit@gnu.org/msg00779.html
+
+diff -uNPrp groff-1.20.1/src/roff/troff/node.cpp groff-1.20.1/src/roff/troff/node.cpp
++++ groff-1.20.1/src/roff/troff/node.cpp 2009-01-09 15:25:52.000000000 +0100
+--- groff-1.20.1/src/roff/troff/node.cpp 2011-01-21 18:01:42.049287601 +0100
+@@ -4981,7 +4981,7 @@ node *make_node(charinfo *ci, environmen
+ case charinfo::TRANSLATE_DUMMY:
+ return new dummy_node;
+ case charinfo::TRANSLATE_HYPHEN_INDICATOR:
+- error("translation to \\% ignored in this context");
++ error("translation to \\%% ignored in this context");
+ break;
+ }
+ charinfo *tem = ci->get_translation();
diff --git a/groff-manpages-typos.patch b/groff-manpages-typos.patch
new file mode 100644
index 0000000..c450db8
--- /dev/null
+++ b/groff-manpages-typos.patch
@@ -0,0 +1,56 @@
+Various manual page fixes. Selected from #668524 and #668461.
+
+Patch was sent upstream:
+http://lists.gnu.org/archive/html/bug-groff/2011-01/msg00011.html
+
+diff -uNPrp a/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.man
+--- a/contrib/mm/groff_mm.man 2011-01-21 14:52:52.302854667 +0100
++++ b/contrib/mm/groff_mm.man 2011-01-21 15:51:53.138775191 +0100
+@@ -1158,7 +1158,7 @@ and also less than or equal to
+ .B Hb
+ or
+ .B Hs
+-are centerered.
++are centered.
+ .RE
+ .
+ .IP
+@@ -1229,7 +1229,7 @@ Fourteen number registers named
+ up to
+ .B H14
+ contain the counter for each heading level.
+-The values are printed using arabic numerals;
++The values are printed using Arabic numerals;
+ this can be changed with the macro
+ .B HM
+ (see below).
+@@ -1590,7 +1590,7 @@ is still controlled by
+ .IR text-indent .
+ .
+ .IP
+-The mark is left-justified whitin the mark area if
++The mark is left-justified within the mark area if
+ .I pad
+ is\~0.
+ If
+@@ -1664,7 +1664,7 @@ Default is\~0.
+ List-status clear.
+ Terminates all current active lists down to
+ .IR list-level ,
+-or\~0 if no argmuent is given.
++or\~0 if no argument is given.
+ This is used by\~\c
+ .B H
+ to clear any active list.
+diff -uNPrp groff-1.21.old/man/roff.man groff-1.21/man/roff.man
+--- groff-1.21.old/man/roff.man 2010-12-31 08:33:09.000000000 +0100
++++ groff-1.21/man/roff.man 2011-01-21 15:26:24.061849971 +0100
+@@ -252,7 +252,7 @@ Today, the name
+ .I roff
+ is used to refer to a
+ .I troff/\:nroff
+-sytem as a whole.
++system as a whole.
+ .
+ .P
+ Ossanna's first version was written in the PDP-11 assembly language and
diff --git a/groff.spec b/groff.spec
index 7674941..779dde2 100644
--- a/groff.spec
+++ b/groff.spec
@@ -3,7 +3,7 @@
Summary: A document formatting system
Name: groff
Version: 1.20.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3+ and GFDL and BSD and MIT
Group: Applications/Publishing
URL: http://groff.ffii.org
@@ -11,6 +11,9 @@ URL: http://groff.ffii.org
Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
Patch1: groff-info-missing-x11.patch
+Patch2: groff-manpages-typos.patch
+Patch3: groff-ec-before-mapping.patch
+Patch4: groff-makenode-error-abrt.patch
Requires: mktemp
Requires: /sbin/install-info
@@ -76,6 +79,9 @@ language and documentation for creating PDF files.
%prep
%setup -q
%patch1 -p1 -b .info-missing-x11
+%patch2 -p1 -b .manpages-typos
+%patch3 -p1 -b .ec-before-mapping
+%patch4 -p1 -b .makenode-error-abrt
for file in NEWS src/devices/grolbp/grolbp.man doc/{groff.info*,webpage.ms} \
contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom} ; do
@@ -198,6 +204,11 @@ fi
%doc %{_docdir}/%{name}-%{version}/pdf/
%changelog
+* Fri Jan 21 2011 Jan Vcelak <jvcelak at redhat.com> 1.20.1-3
+- fix: bad character definition error on some manual pages (#665535)
+- fix: sigabrt in troff when raising error from make_node (#670580)
+- fix: a few manual pages typos
+
* Fri Jul 30 2010 Jan Vcelak <jvcelak at redhat.com> 1.20.1-2
- Resolves: #477394 - Please convert to new font packaging guidelines
More information about the scm-commits
mailing list