14 changed files with 346 additions and 10792 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-SOURCES/groff-1.22.3.tar.gz
-/groff-1.22.3.tar.gz
+SOURCES/groff-1.22.4.tar.gz
--- a/.groff.metadata
+++ b/.groff.metadata
@ -0,0 +1 @@
+2ce4ab107e3fab1414fef2c5b5312f562a4e4d35 SOURCES/groff-1.22.4.tar.gz
--- a/0005-Add-missing-rule-for-gropdf.patch
+++ b/0005-Add-missing-rule-for-gropdf.patch
@ -1,25 +0,0 @@
-From 65c9f2f5152b3eebba8494cbead00d79d1dcbb1c Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Wed, 12 Nov 2014 08:23:00 +0100
-Subject: [PATCH] Add missing rule for gropdf
-
---
- Makefile.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile.in b/Makefile.in
-index 4b5a5c6..7ae9ac2 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -896,6 +896,8 @@ $(GNULIBDIRS): FORCE
- 	  $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \
- 	esac
- 
-+$(SHPROGDIRS): $(PROGDEPDIRS)
-+
- $(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(SHPROGDIRS)
- 
- $(INCDIRS) $(PROGDEPDIRS) $(SHPROGDIRS) $(OTHERDIRS): FORCE
-- 
-1.9.3
-
--- a/SOURCES/0001-missing-groff-x11-info-message-when-gxditview-not-fo.patch
+++ b/SOURCES/0001-missing-groff-x11-info-message-when-gxditview-not-fo.patch
@ -1,7 +1,7 @@
-From 103f1f6b4e4cfd007375cd127b8e69cd102d4097 Mon Sep 17 00:00:00 2001
+From 2f311bd175e78f889df099d5fcd945f357d6f037 Mon Sep 17 00:00:00 2001
 From: Jan Vcelak <jvcelak@redhat.com>
 Date: Tue, 1 Jan 2013 15:32:01 +0100
-Subject: [PATCH] missing groff-x11 info message when gxditview not found
+Subject: [PATCH 1/4] missing groff-x11 info message when gxditview not found

 Adds info message that 'groff-x11' package might be missing when
 executing 'groff -X' and 'gxditview' is not found.
@ -13,10 +13,10 @@ Signed-off-by: Jan Vcelak <jvcelak@redhat.com>
 1 file changed, 2 insertions(+)

 diff --git a/src/roff/groff/pipeline.c b/src/roff/groff/pipeline.c
-index cea7593..fce0abc 100644
+index 2e3236f..75268c2 100644
 --- a/src/roff/groff/pipeline.c
 +++ b/src/roff/groff/pipeline.c
-@@ -486,6 +486,8 @@ int run_pipeline(int ncommands, char ***commands, int no_pipe)
+@@ -487,6 +487,8 @@ int run_pipeline(int ncommands, char ***commands, int no_pipe)
       execvp(commands[i][0], commands[i]);
       error("couldn't exec %1: %2",
 	    commands[i][0], strerror(errno), (char *)0);
@ -26,5 +26,5 @@ index cea7593..fce0abc 100644
       _exit(EXEC_FAILED_EXIT_STATUS);
     }
 -- 
-1.8.0.2
+2.21.1

--- a/SOURCES/0002-load-site-font-and-site-tmac-from-etc-groff.patch
+++ b/SOURCES/0002-load-site-font-and-site-tmac-from-etc-groff.patch
@ -1,7 +1,7 @@
-From c6d8bb3e0ebc03274564d7b2c768e9932cc5f79d Mon Sep 17 00:00:00 2001
+From f83e0b188bb7bf4f38536ff8d08c2ca7384ac161 Mon Sep 17 00:00:00 2001
 From: Jan Vcelak <jvcelak@redhat.com>
 Date: Tue, 1 Jan 2013 15:33:45 +0100
-Subject: [PATCH] load site-font and site-tmac from /etc/groff
+Subject: [PATCH 2/4] load site-font and site-tmac from /etc/groff

 Move site-font and site-tmac configuration from /usr/share/groff to
 /etc/groff. That allows permanent custom changes. (Symlinking brought
@ -13,31 +13,31 @@ Signed-off-by: Jan Vcelak <jvcelak@redhat.com>
 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/Makefile.in b/Makefile.in
-index 7534e56..d97d1b9 100644
+index 505e9c3..5331dd3 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -167,7 +167,7 @@ fontdir=$(datasubdir)/font
- oldfontdir=$(datasubdir)/oldfont
+@@ -3573,7 +3573,7 @@ fontdir = $(datasubdir)/font
+ oldfontdir = $(datasubdir)/oldfont
 
 # `localfontdir' says where local fonts will be installed (as dev*/*).
-localfontdir=$(dataprogramdir)/site-font
-+localfontdir=@sysconfdir@/groff/site-font
+-localfontdir = $(dataprogramdir)/site-font
+localfontdir = @sysconfdir@/groff/site-font
 
 # `legacyfontdir' is for compatibility with non-GNU troff.
- legacyfontdir=/usr/lib/font
-@@ -179,10 +179,10 @@ fontpath=$(localfontdir)$(RT_SEP)$(fontdir)$(RT_SEP)$(legacyfontdir)
- tmacdir=$(datasubdir)/tmac
+ legacyfontdir = /usr/lib/font
+@@ -3585,10 +3585,10 @@ fontpath = $(localfontdir)$(RT_SEP)$(fontdir)$(RT_SEP)$(legacyfontdir)
+ tmacdir = $(datasubdir)/tmac
 
 # `systemtmacdir' says where to install platform-dependent macros.
-systemtmacdir=$(libprogramdir)/site-tmac
-+systemtmacdir=@sysconfdir@/groff/site-tmac
+-systemtmacdir = $(libprogramdir)/site-tmac
+systemtmacdir = @sysconfdir@/groff/site-tmac
 
 # `localtmacdir' says where local files will be installed.
-localtmacdir=$(dataprogramdir)/site-tmac
-+localtmacdir=@sysconfdir@/groff/site-tmac
+-localtmacdir = $(dataprogramdir)/site-tmac
+localtmacdir = @sysconfdir@/groff/site-tmac
 
+ # appresdir
 # `appresdir' says where to install the application resource file for
- # gxditview.
 -- 
-1.8.0.2
+2.21.1

--- a/SOURCES/0003-various-security-fixes.patch
+++ b/SOURCES/0003-various-security-fixes.patch
@ -1,47 +1,46 @@
-From 36115e102859badb08cb5b2398de6b0ba45421d3 Mon Sep 17 00:00:00 2001
+From f95bed4ad636f286ef9ff3f5b4330a10938fd064 Mon Sep 17 00:00:00 2001
 From: Jan Vcelak <jvcelak@redhat.com>
 Date: Tue, 4 Nov 2014 14:36:47 +0100
-Subject: [PATCH] various security fixes
+Subject: [PATCH 3/4] various security fixes

 CVE-2009-5044 (#709413)
 CVE-2009-5080 (#720058)
 CVE-2009-5081 (#720057)

-Based on: http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/groff/groff-1.20.1-owl-tmp.diff?rev=1.2;content-type=text%2Fplain
+Based on: http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/groff/groff-1.20.1-owl-tmp.diff?rev=1.2;content-    type=text%2Fplain
 Resolves: #709415, #720060
 Signed-off-by: Jan Vcelak <jvcelak@redhat.com>
 ---
 contrib/eqn2graph/eqn2graph.sh    |  2 ++
- contrib/gdiffmk/tests/runtests.in |  5 +++--
+ contrib/gdiffmk/tests/runtests.sh |  5 +++--
 contrib/grap2graph/grap2graph.sh  |  2 ++
 contrib/groffer/main_subs.pl      | 10 +++++-----
 contrib/groffer/roff2.pl          |  2 +-
- contrib/pdfmark/pdfroff.man       |  5 +++--
+ contrib/pdfmark/pdfroff.1.man     |  5 +++--
 contrib/pic2graph/pic2graph.sh    |  2 ++
 doc/fixinfo.sh                    |  5 +++--
- doc/groff.info-2                  |  6 +++---
- doc/groff.texinfo                 |  6 +++---
+ doc/groff.texi                    |  6 +++---
 gendef.sh                         | 10 +++-------
- 11 files changed, 30 insertions(+), 25 deletions(-)
+ 10 files changed, 27 insertions(+), 22 deletions(-)

 diff --git a/contrib/eqn2graph/eqn2graph.sh b/contrib/eqn2graph/eqn2graph.sh
-index ee7cc5f..13edf78 100644
+index 3e9c374..4e4f11e 100644
 --- a/contrib/eqn2graph/eqn2graph.sh
 +++ b/contrib/eqn2graph/eqn2graph.sh
-@@ -67,6 +67,8 @@ for d in "$GROFF_TMPDIR" "$TMPDIR" "$TMP" "$TEMP" /tmp; do
- 
-     tmp=$d/eqn2graph$$-$RANDOM
-     (umask 077 && mkdir $tmp) 2> /dev/null && break
+@@ -74,6 +74,8 @@ then
+     # but is supported by the stripped-down dash shell, for instance.
+     tmp="$d/eqn2graph$$-${RANDOM:-$PPID}"
+     (umask 077 && mkdir "$tmp") 2> /dev/null
 +
 +    tmp=
- done;
- if test -z "$tmp"; then
-     echo "$0: cannot create temporary directory" >&2
-diff --git a/contrib/gdiffmk/tests/runtests.in b/contrib/gdiffmk/tests/runtests.in
-index 714ce48..40a35c4 100644
--- a/contrib/gdiffmk/tests/runtests.in
-+++ b/contrib/gdiffmk/tests/runtests.in
-@@ -56,8 +56,9 @@ function TestResult {
+ fi
+ 
+ if ! test -d "$tmp"
+diff --git a/contrib/gdiffmk/tests/runtests.sh b/contrib/gdiffmk/tests/runtests.sh
+index 0f7c3b6..f8aa874 100755
+--- a/contrib/gdiffmk/tests/runtests.sh
+++ b/contrib/gdiffmk/tests/runtests.sh
+@@ -63,8 +63,9 @@ TestResult () {
 	fi
 }
 
@ -54,23 +53,23 @@ index 714ce48..40a35c4 100644
 #	Run tests.
 
 diff --git a/contrib/grap2graph/grap2graph.sh b/contrib/grap2graph/grap2graph.sh
-index 58544e1..aeab832 100644
+index 29df25b..94c436b 100644
 --- a/contrib/grap2graph/grap2graph.sh
 +++ b/contrib/grap2graph/grap2graph.sh
-@@ -63,6 +63,8 @@ for d in "$GROFF_TMPDIR" "$TMPDIR" "$TMP" "$TEMP" /tmp; do
- 
-     tmp=$d/grap2graph$$-$RANDOM
-     (umask 077 && mkdir $tmp) 2> /dev/null && break
+@@ -76,6 +76,8 @@ then
+     # but is supported by the stripped-down dash shell, for instance.
+     tmp="$d/grap2graph$$-${RANDOM:-$PPID}"
+     (umask 077 && mkdir "$tmp") 2> /dev/null
 +
 +    tmp=
- done;
- if test -z "$tmp"; then
-     echo "$0: cannot create temporary directory" >&2
+ fi
+ 
+ if ! test -d "$tmp"
 diff --git a/contrib/groffer/main_subs.pl b/contrib/groffer/main_subs.pl
-index 90627cc..76896cd 100644
+index a40e356..c8c4e53 100644
 --- a/contrib/groffer/main_subs.pl
 +++ b/contrib/groffer/main_subs.pl
-@@ -1239,7 +1239,7 @@ sub main_temp {
+@@ -1244,7 +1244,7 @@ sub main_temp {
   our $fh_stdin;
   our $tmp_cat;
   our $tmp_stdin;
@ -79,7 +78,7 @@ index 90627cc..76896cd 100644
   foreach ($ENV{'GROFF_TMPDIR'}, $ENV{'TMPDIR'}, $ENV{'TMP'}, $ENV{'TEMP'},
 	   $ENV{'TEMPDIR'}, File::Spec->catfile($ENV{'HOME'}, 'tmp')) {
     if ($_ && -d $_ && -w $_) {
-@@ -1271,12 +1271,12 @@ sub main_temp {
+@@ -1276,12 +1276,12 @@ sub main_temp {
 
   # further argument: SUFFIX => '.sh'
   if ($Debug{'KEEP'}) {
@ -97,7 +96,7 @@ index 90627cc..76896cd 100644
   }
 }				# main_temp()
 diff --git a/contrib/groffer/roff2.pl b/contrib/groffer/roff2.pl
-index d8dad3f..f0ca9f2 100755
+index cf5c583..24af006 100755
 --- a/contrib/groffer/roff2.pl
 +++ b/contrib/groffer/roff2.pl
@@ -123,7 +123,7 @@ if ($Has_Groffer) {
@ -109,21 +108,21 @@ index d8dad3f..f0ca9f2 100755
     my ($fh, $stdin);
     if ($tempdir) {
       ($fh, $stdin) = tempfile($template, UNLINK => 1, DIR => $tempdir) ||
-diff --git a/contrib/pdfmark/pdfroff.man b/contrib/pdfmark/pdfroff.man
-index ec412bb..faf2898 100644
--- a/contrib/pdfmark/pdfroff.man
-+++ b/contrib/pdfmark/pdfroff.man
-@@ -555,7 +555,7 @@ defaults to
- .B GROFF_TMPDIR
+diff --git a/contrib/pdfmark/pdfroff.1.man b/contrib/pdfmark/pdfroff.1.man
+index 95d7807..aa6f079 100644
+--- a/contrib/pdfmark/pdfroff.1.man
+++ b/contrib/pdfmark/pdfroff.1.man
+@@ -540,7 +540,7 @@ gs \-dBATCH \-dQUIET \-dNOPAUSE \-dSAFER \-sDEVICE=pdfwrite \e
+ .I GROFF_TMPDIR
 Identifies the directory in which
 .B pdfroff
 -should create temporary files.
 +should create a subdirectory for its temporary files.
 .
 If
- .B \%GROFF_TMPDIR
-@@ -568,7 +568,8 @@ and
- .B TEMP
+ .I \%GROFF_TMPDIR
+@@ -553,7 +553,8 @@ and
+ .I TEMP
 are considered in turn, as possible temporary file repositories.
 If none of these are set, then temporary files are created
 -in the current directory.
@ -131,28 +130,28 @@ index ec412bb..faf2898 100644
 +.BR /tmp .
 .
 .TP
- .B GROFF_GHOSTSCRIPT_INTERPRETER
+ .I GROFF_GHOSTSCRIPT_INTERPRETER
 diff --git a/contrib/pic2graph/pic2graph.sh b/contrib/pic2graph/pic2graph.sh
-index 72c5477..6b3360d 100644
+index b229914..2d6e77c 100644
 --- a/contrib/pic2graph/pic2graph.sh
 +++ b/contrib/pic2graph/pic2graph.sh
-@@ -78,6 +78,8 @@ for d in "$GROFF_TMPDIR" "$TMPDIR" "$TMP" "$TEMP" /tmp; do
-     tmp=$d/pic2graph$$-$RANDOM
-     (umask 077 && mkdir $tmp) 2> /dev/null \
-     && break
+@@ -89,6 +89,8 @@ then
+     # but is supported by the stripped-down dash shell, for instance.
+     tmp="$d/pic2graph$$-${RANDOM:-$PPID}"
+     (umask 077 && mkdir "$tmp") 2> /dev/null
 +
 +    tmp=
- done;
- if test -z "$tmp"; then
-     echo "$0: cannot create temporary directory" >&2
+ fi
+ 
+ if ! test -d "$tmp"
 diff --git a/doc/fixinfo.sh b/doc/fixinfo.sh
-index 2c853f8..6954e6a 100644
+index 47127f8..69bb74d 100644
 --- a/doc/fixinfo.sh
 +++ b/doc/fixinfo.sh
-@@ -22,8 +22,9 @@
- # groff.texinfo macro code.  Hopefully, a new texinfo version makes it
- # unnecessary.
- 
+@@ -24,8 +24,9 @@
+ #
+ # 09-2014: no more problem with texinfo 5.0 or higher
+ #
 -t=${TMPDIR-.}/gro$$.tmp
 -
 +t="`mktemp -t groff-fixinfo.XXXXXXXXXX`" || exit
@ -161,28 +160,11 @@ index 2c853f8..6954e6a 100644
 cat $1 | sed '
 1 {
   N
-diff --git a/doc/groff.info-2 b/doc/groff.info-2
-index 7eaae86..e7dab72 100644
--- a/doc/groff.info-2
-+++ b/doc/groff.info-2
-@@ -1697,9 +1697,9 @@ not there, 'groff' would not know when to stop.
-      time into a document:
- 
-           .sy perl -e 'printf ".nr H %d\\n.nr M %d\\n.nr S %d\\n",\
-                       (localtime(time))[2,1,0]' > /tmp/x\n[$$]
-          .so /tmp/x\n[$$]
-          .sy rm /tmp/x\n[$$]
-+                       (localtime(time))[2,1,0]' > timefile\n[$$]
-+          .so timefile\n[$$]
-+          .sy rm timefile\n[$$]
-           \nH:\nM:\nS
- 
-      Note that this works by having the 'perl' script (run by 'sy')
-diff --git a/doc/groff.texinfo b/doc/groff.texinfo
-index 066b527..83684da 100644
--- a/doc/groff.texinfo
-+++ b/doc/groff.texinfo
-@@ -13736,9 +13736,9 @@ into a document:
+diff --git a/doc/groff.texi b/doc/groff.texi
+index e7fe4aa..b4d01ed 100644
+--- a/doc/groff.texi
+++ b/doc/groff.texi
+@@ -13857,9 +13857,9 @@ into a document:
 @pindex perl
 @Example
 .sy perl -e 'printf ".nr H %d\\n.nr M %d\\n.nr S %d\\n",\
@ -190,13 +172,13 @@ index 066b527..83684da 100644
 -.so /tmp/x\n[$$]
 -.sy rm /tmp/x\n[$$]
 +             (localtime(time))[2,1,0]' > timefile\n[$$]
-++.so timefile\n[$$]
-++.sy rm timefile\n[$$]
+.so timefile\n[$$]
+.sy rm timefile\n[$$]
 \nH:\nM:\nS
 @endExample
 
 diff --git a/gendef.sh b/gendef.sh
-index 41a511b..050bcbe 100644
+index be41dbe..4770bae 100644
 --- a/gendef.sh
 +++ b/gendef.sh
@@ -33,11 +33,9 @@ do
@ -224,5 +206,5 @@ index 41a511b..050bcbe 100644
 
 # eof
 -- 
-1.9.3
+2.21.1

--- a/SOURCES/0004-don-t-use-usr-bin-env-in-shebang.patch
+++ b/SOURCES/0004-don-t-use-usr-bin-env-in-shebang.patch
@ -1,7 +1,7 @@
-From e263e19aa1c63dbcbe710e8aae79c8e298606e4c Mon Sep 17 00:00:00 2001
+From 6c997078a8f74429f58e4679b7630de7962e18b0 Mon Sep 17 00:00:00 2001
 From: Peter Schiffer <pschiffe@redhat.com>
 Date: Tue, 4 Nov 2014 14:49:57 +0100
-Subject: [PATCH] don't use /usr/bin/env in shebang
+Subject: [PATCH 4/4] don't use /usr/bin/env in shebang

 There might be an issue that the script is executed with unwanted version of
 <lang> if that language is provided by enabled dynamic software collection.
@ -15,7 +15,7 @@ Resolves: #987069
 4 files changed, 4 insertions(+), 4 deletions(-)

 diff --git a/contrib/chem/chem.pl b/contrib/chem/chem.pl
-index 1a8b3cc..15eda5f 100755
+index 883907b..57e0216 100755
 --- a/contrib/chem/chem.pl
 +++ b/contrib/chem/chem.pl
@@ -1,4 +1,4 @@
@ -25,7 +25,7 @@ index 1a8b3cc..15eda5f 100755
 # chem - a groff preprocessor for producing chemical structure diagrams
 
 diff --git a/contrib/groffer/groffer.pl b/contrib/groffer/groffer.pl
-index 4e2e575..913e8eb 100755
+index 697dacb..654f18e 100755
 --- a/contrib/groffer/groffer.pl
 +++ b/contrib/groffer/groffer.pl
@@ -1,4 +1,4 @@
@ -35,7 +35,7 @@ index 4e2e575..913e8eb 100755
 # groffer - display groff files
 
 diff --git a/contrib/groffer/roff2.pl b/contrib/groffer/roff2.pl
-index f0ca9f2..1b8577f 100755
+index 24af006..35a560c 100755
 --- a/contrib/groffer/roff2.pl
 +++ b/contrib/groffer/roff2.pl
@@ -1,4 +1,4 @@
@ -45,7 +45,7 @@ index f0ca9f2..1b8577f 100755
 # roff2* - transform roff files into other formats
 
 diff --git a/src/roff/grog/grog.pl b/src/roff/grog/grog.pl
-index fb7b54c..9baa869 100644
+index f7fb8e4..1d5c3d8 100644
 --- a/src/roff/grog/grog.pl
 +++ b/src/roff/grog/grog.pl
@@ -1,4 +1,4 @@
@ -55,5 +55,5 @@ index fb7b54c..9baa869 100644
 # Inspired by doctype script in Kernighan & Pike, Unix Programming
 # Environment, pp 306-8.
 -- 
-1.9.3
+2.21.1

--- a/SOURCES/0005-do-not-overwrite-docdir.patch
+++ b/SOURCES/0005-do-not-overwrite-docdir.patch
@ -0,0 +1,28 @@
+From ad194a6cadbb4718d238c85925ab8c646a3afdf7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
+Date: Fri, 6 Mar 2020 10:40:09 +0100
+Subject: [PATCH 5/5] do not overwrite docdir
+
+---
+ Makefile.in | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5331dd3..21522e3 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -3378,9 +3378,8 @@ doc_dist_target_ok = @doc_dist_target_ok@
+ # `infodir' says where to install info files.
+ 
+ # docdir
+-# `docdir' says where to install documentation files.  The default
+-# location is ${datarootdir}/doc/${PACKAGE}, but we add the version
+-docdir = $(datarootdir)/doc/${PACKAGE}-$(SHORT_VERSION)
+# `docdir' says where to install documentation files.
+docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ g = @g@
+-- 
+2.21.1
+
--- a/SOURCES/0006-xtotroff-Avoid-overrunning-buffer-write.patch
+++ b/SOURCES/0006-xtotroff-Avoid-overrunning-buffer-write.patch
@ -0,0 +1,46 @@
+From 1fce38a3b2dc10c5bdd2c9f97c08c66dce7f0a95 Mon Sep 17 00:00:00 2001
+From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
+Date: Tue, 1 Dec 2020 16:37:16 +1100
+Subject: [PATCH 6/7] [xtotroff]: Avoid overrunning buffer write.
+
+* src/utils/xtotroff/xtotroff.c (MapFont): Avoid writing past
+  the end of a static buffer.  Problem found and patch supplied by
+  Bjarni Ingi Gislason.  I tweaked it to comment it differently (in case
+  the buffer ever needs to grow, but the prospects of future X11
+  server-side font rendering development seem dim) and use snprintf()
+  instead of retaining the existing sprintf().
+
+  Quiets warning: '%s' directive writing up to 255 bytes into a region
+  of size between 0 and 255 [-Wformat-overflow=].
+---
+ src/utils/xtotroff/xtotroff.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/xtotroff/xtotroff.c b/src/utils/xtotroff/xtotroff.c
+index 8545a5e..aee2a1a 100644
+--- a/src/utils/xtotroff/xtotroff.c
+++ b/src/utils/xtotroff/xtotroff.c
+@@ -127,7 +127,9 @@ static int MapFont(char *font_name, const char *troff_name)
+   XFontName parsed;
+   int j, k;
+   DviCharNameMap *char_map;
+-  char encoding[256];
+  /* 'encoding' needs to hold a CharSetRegistry (256), a CharSetEncoding
+     (256) [both from XFontName.h], a dash, and a null terminator. */
+  char encoding[256 * 2 + 1 + 1];
+   char *s;
+   int wid;
+   char name_string[2048];
+@@ -156,7 +158,8 @@ static int MapFont(char *font_name, const char *troff_name)
+     return 0;
+ 
+   XParseFontName(names[0], &parsed, &attributes);
+-  sprintf(encoding, "%s-%s", parsed.CharSetRegistry,
+  size_t sz = sizeof encoding;
+  snprintf(encoding, sz, "%s-%s", parsed.CharSetRegistry,
+ 	  parsed.CharSetEncoding);
+   for (s = encoding; *s; s++)
+     if (isupper(*s))
+-- 
+2.32.0
+
--- a/SOURCES/0007-grohtml-Avoid-deallocation-of-static-strings.patch
+++ b/SOURCES/0007-grohtml-Avoid-deallocation-of-static-strings.patch
@ -0,0 +1,45 @@
+From a84f97f7dbeaf1ad0b3537c10e409dcf77baec52 Mon Sep 17 00:00:00 2001
+From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
+Date: Sun, 23 May 2021 13:01:52 +1000
+Subject: [PATCH 7/7] [grohtml]: Avoid deallocation of static strings.
+
+* src/devices/grohtml/post-html.cpp (assert_state::add): Avoid potential
+  deallocation of statically-allocated strings.  Use strsave() to
+  duplicate them so that they can be safely handed to a_delete().  Also
+  update diagnostic message to report name of complaining program
+  (continuing the long process of fixing Savannah #52463).
+
+Fixes <https://savannah.gnu.org/bugs/index.php?60656>.  Thanks to
+Petru-Florin Mihancea for the report.
+
+Also wrap source lines at 72 columns.
+---
+ src/devices/grohtml/post-html.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/devices/grohtml/post-html.cpp b/src/devices/grohtml/post-html.cpp
+index 7bc017e..5218f92 100644
+--- a/src/devices/grohtml/post-html.cpp
+++ b/src/devices/grohtml/post-html.cpp
+@@ -1737,13 +1737,14 @@ void assert_state::add (assert_pos **h,
+     }
+     if (v == NULL || v[0] != '=') {
+       if (f == NULL)
+-	f = "stdin";
+	f = strsave("stdin");
+       if (l == NULL)
+-	l = "<none>";
+	l = strsave("<none>");
+       if (v == NULL)
+ 	v = "no value at all";
+-      fprintf(stderr, "%s:%s:error in assert format of id=%s expecting value to be prefixed with an '=' got %s\n",
+-	      f, l, i, v);
+      fprintf(stderr, "%s:%s:%s:error in assert format of id=%s;"
+	      " expecting value to be prefixed with an '=', got %s\n",
+	      program_name, f, l, i, v);
+     }
+     t->id = i;
+     t->val = v;
+-- 
+2.32.0
+
--- a/SPECS/groff.spec
+++ b/SPECS/groff.spec
@ -2,10 +2,9 @@

 Summary: A document formatting system
 Name: groff
-Version: 1.22.3
-Release: 18%{?dist}
+Version: 1.22.4
+Release: 10%{?dist}
 License: GPLv3+ and GFDL and BSD and MIT
-Group: Applications/Publishing
 URL: http://www.gnu.org/software/groff/
 Source: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz

@ -16,17 +15,24 @@ Patch1: 0002-load-site-font-and-site-tmac-from-etc-groff.patch
 Patch2: 0003-various-security-fixes.patch
 # resolves: #987069
 Patch3: 0004-don-t-use-usr-bin-env-in-shebang.patch
-# SSIA
-Patch4: 0005-Add-missing-rule-for-gropdf.patch
-# resolves: #1602530
-Patch5: groff-1.22.3-coverity.patch
+# allow to specify custom docdir
+Patch4: 0005-do-not-overwrite-docdir.patch
+# resolves: #1938735
+Patch5: 0006-xtotroff-Avoid-overrunning-buffer-write.patch
+Patch6: 0007-grohtml-Avoid-deallocation-of-static-strings.patch
+
+Requires: coreutils, groff-base = %{version}-%{release}
+
+Recommends: psutils
+
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
+Requires(preun): %{_sbindir}/update-alternatives

-Requires: coreutils, /sbin/install-info, groff-base = %{version}-%{release}
-Requires(post): info
-Requires(preun): info
 BuildRequires: gcc, gcc-c++
-BuildRequires: byacc
+BuildRequires: bison, texinfo
 BuildRequires: git, netpbm-progs, perl-generators, psutils, ghostscript
+
 Provides: nroff-i18n = %{version}-%{release}
 Provides: bundled(gnulib)

@ -46,7 +52,6 @@ groff-x11 package.

 %package base
 Summary: Parts of the groff formatting system required to display manual pages
-Group: Applications/Publishing

 %description base
 The groff-base package contains only necessary parts of groff formatting
@ -55,7 +60,6 @@ display device (PostScript).

 %package perl
 Summary: Parts of the groff formatting system that require Perl
-Group: Applications/Publishing
 Requires: groff-base = %{version}-%{release}

 %description perl
@ -70,9 +74,9 @@ roff2html roff2pdf roff2ps roff2text roff2x (roff code converters).
 %if %{with_x}
 %package x11
 Summary: Parts of the groff formatting system that require X Windows System
-Group: Applications/Publishing
 Requires: groff-base = %{version}-%{release}
 BuildRequires: libXaw-devel, libXmu-devel
+BuildRequires: make
 Provides: groff-gxditview = %{version}-%{release}
 Obsoletes: groff-gxditview < 1.20.1

@ -85,11 +89,8 @@ xtotroff (converts X font metrics into groff font metrics).

 %package doc
 Summary: Documentation for groff document formatting system
-Group: Documentation
 BuildArch: noarch
 Requires: groff = %{version}-%{release}
-Requires(post): info
-Requires(preun): info

 %description doc
 The groff-doc package includes additional documentation for groff
@ -105,7 +106,7 @@ git add .
 git commit -n -m "release %{version}"
 git am %{patches}

-for file in NEWS src/devices/grolbp/grolbp.man doc/{groff.info*,webpage.ms} \
+for file in NEWS src/devices/grolbp/grolbp.1.man doc/webpage.ms \
                contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom,mom.vim}; do
    iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
    mv "${file}_" "$file"
@ -116,10 +117,18 @@ done
    --docdir=%{_pkgdocdir} \
    --with-appresdir=%{_datadir}/X11/app-defaults \
    --with-grofferdir=%{_datadir}/%{name}/%{version}/groffer
-make %{?_smp_mflags}
+%make_build

 %install
-make install DESTDIR=%{buildroot}
+%make_install
+
+# rename files for alternative usage
+mv %{buildroot}%{_bindir}/soelim %{buildroot}%{_bindir}/soelim.%{name}
+touch %{buildroot}%{_bindir}/soelim
+mv %{buildroot}%{_mandir}/man1/soelim.1 %{buildroot}%{_mandir}/man1/soelim.%{name}.1
+touch %{buildroot}%{_mandir}/man1/soelim.1
+mv %{buildroot}%{_mandir}/man7/roff.7 %{buildroot}%{_mandir}/man7/roff.%{name}.7
+touch %{buildroot}%{_mandir}/man7/roff.7

 # some binaries need alias with 'g' or 'z' prefix
 for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} zsoelim; do
@ -154,16 +163,53 @@ popd
 # /bin/sed moved to /usr/bin/sed in Fedora
 sed --in-place 's|#! /bin/sed -f|#! /usr/bin/sed -f|' %{buildroot}%{_datadir}/groff/%{version}/font/devps/generate/symbol.sed

+%pre
+# remove alternativized files if they are not symlinks
+[ -L %{_mandir}/man7/roff.7.gz ] || %{__rm} -f %{_mandir}/man7/roff.7.gz >/dev/null 2>&1 || :
+
 %post
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+# set up the alternatives files
+%{_sbindir}/update-alternatives --install %{_mandir}/man7/roff.7.gz roff.7.gz %{_mandir}/man7/roff.%{name}.7.gz 300 \
+    >/dev/null 2>&1 || :

 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ $1 -eq 0 ]; then
+    %{_sbindir}/update-alternatives --remove roff.7.gz %{_mandir}/man7/roff.%{name}.7.gz >/dev/null 2>&1 || :
+fi
+
+%postun
+if [ $1 -ge 1 ]; then
+    if [ "$(readlink %{_sysconfdir}/alternatives/roff.7.gz)" == "%{_mandir}/man7/roff.%{name}.7.gz" ]; then
+        %{_sbindir}/update-alternatives --set roff.7.gz %{_mandir}/man7/roff.%{name}.7.gz >/dev/null 2>&1 || :
+    fi
+fi
+
+%pre base
+# remove alternativized files if they are not symlinks
+[ -L %{_bindir}/soelim ] || %{__rm} -f %{_bindir}/soelim >/dev/null 2>&1 || :
+[ -L %{_mandir}/man1/soelim.1.gz ] || %{__rm} -f %{_mandir}/man1/soelim.1.gz >/dev/null 2>&1 || :
+
+%post base
+# set up the alternatives files
+%{_sbindir}/update-alternatives --install %{_bindir}/soelim soelim %{_bindir}/soelim.%{name} 300 \
+    --slave %{_mandir}/man1/soelim.1.gz soelim.1.gz %{_mandir}/man1/soelim.%{name}.1.gz \
+    >/dev/null 2>&1 || :
+
+%preun base
+if [ $1 -eq 0 ]; then
+    %{_sbindir}/update-alternatives --remove soelim %{_bindir}/soelim.%{name} >/dev/null 2>&1 || :
+fi
+
+%postun base
+if [ $1 -ge 1 ]; then
+    if [ "$(readlink %{_sysconfdir}/alternatives/soelim)" == "%{_bindir}/soelim.%{name}" ]; then
+        %{_sbindir}/update-alternatives --set soelim %{_bindir}/soelim.%{name} >/dev/null 2>&1 || :
+    fi
 fi

 %files
 # data
+%{_datadir}/%{name}/%{version}/font/devcp1047/
 %{_datadir}/%{name}/%{version}/font/devdvi/
 %{_datadir}/%{name}/%{version}/font/devlbp/
 %{_datadir}/%{name}/%{version}/font/devlj4/
@ -195,6 +241,7 @@ fi
 %{_datadir}/%{name}/%{version}/tmac/s.tmac
 %{_datadir}/%{name}/%{version}/tmac/spdf.tmac
 %{_datadir}/%{name}/%{version}/tmac/trace.tmac
+%{_datadir}/%{name}/%{version}/tmac/zh.tmac
 # programs
 %{_bindir}/addftinfo
 %{_bindir}/eqn2graph
@ -242,6 +289,7 @@ fi
 %{_mandir}/man1/gindxbib.*
 # groff processor documentation
 %{_mandir}/man5/*
+%ghost %{_mandir}/man7/roff.7*
 %{_mandir}/man7/*
 %{_infodir}/groff.info*

@ -289,7 +337,6 @@ fi
 %{_datadir}/%{name}/%{version}/tmac/hyphen.sv
 %{_datadir}/%{name}/%{version}/tmac/hyphen.us
 %{_datadir}/%{name}/%{version}/tmac/hyphenex.cs
-%{_datadir}/%{name}/%{version}/tmac/hyphenex.det
 %{_datadir}/%{name}/%{version}/tmac/hyphenex.us
 %{_datadir}/%{name}/%{version}/tmac/ja.tmac
 %{_datadir}/%{name}/%{version}/tmac/latin1.tmac
@ -301,6 +348,7 @@ fi
 %{_datadir}/%{name}/%{version}/tmac/mdoc.tmac
 %{_datadir}/%{name}/%{version}/tmac/mdoc/
 %{_datadir}/%{name}/%{version}/tmac/papersize.tmac
+%{_datadir}/%{name}/%{version}/tmac/pdfpic.tmac
 %{_datadir}/%{name}/%{version}/tmac/pic.tmac
 %{_datadir}/%{name}/%{version}/tmac/ps.tmac
 %{_datadir}/%{name}/%{version}/tmac/psatk.tmac
@ -326,7 +374,8 @@ fi
 %{_bindir}/post-grohtml
 %{_bindir}/pre-grohtml
 %{_bindir}/preconv
-%{_bindir}/soelim
+%ghost %{_bindir}/soelim
+%{_bindir}/soelim.%{name}
 %{_bindir}/tbl
 %{_bindir}/troff
 %{_mandir}/man1/eqn.*
@ -337,7 +386,8 @@ fi
 %{_mandir}/man1/nroff.*
 %{_mandir}/man1/pic.*
 %{_mandir}/man1/preconv.*
-%{_mandir}/man1/soelim.*
+%ghost %{_mandir}/man1/soelim.1*
+%{_mandir}/man1/soelim.%{name}.*
 %{_mandir}/man1/tbl.*
 %{_mandir}/man1/troff.*
 # compatibility symlinks
@ -430,17 +480,66 @@ fi
 %doc %{_pkgdocdir}/pdf/

 %changelog
-* Wed Dec 05 2018 Nikola Forró <nforro@redhat.com> - 1.22.3-18
- Fix also SHELLCHECK_WARNING
-  related: #1602530
+* Mon Oct 11 2021 Nikola Forró <nforro@redhat.com> - 1.22.4-10
+- Fix several important Covscan defects
+  resolves: #1938735

-* Wed Nov 28 2018 Nikola Forró <nforro@redhat.com> - 1.22.3-17
- Fix important Covscan defects
-  resolves: #1602530
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.22.4-9
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Wed Nov 28 2018 Nikola Forró <nforro@redhat.com> - 1.22.3-16
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.22.4-8
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Mar 17 2021 Nikola Forró <nforro@redhat.com> - 1.22.4-7
+- Make psutils a weak dependency
+
+* Mon Feb 22 2021 Nikola Forró <nforro@redhat.com> - 1.22.4-6
+- Add psutils as a runtime dependency (needed for groff -Thtml)
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Nov 03 2020 Nikola Forró <nforro@redhat.com> - 1.22.4-4
+- Move pdfpic.tmac to groff-base
+  resolves: #1888370
+
+* Fri Oct 02 2020 Nikola Forró <nforro@redhat.com> - 1.22.4-3
+- Use make macros
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Mar 05 2020 Nikola Forró <nforro@redhat.com> - 1.22.4-1
+- Update to version 1.22.4
+  resolves: #1808072
+
+* Sun Mar 01 2020 Nikola Forró <nforro@redhat.com> - 1.22.3-24
+- Fix %pre scriptlets
+
+* Fri Feb 28 2020 Nikola Forró <nforro@redhat.com> - 1.22.3-23
+- Fix upgrades from non-alternativized versions
+
+* Wed Feb 26 2020 Nikola Forró <nforro@redhat.com> - 1.22.3-22
+- Use alternatives for soelim and roff.7
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Nov 28 2018 Nikola Forró <nforro@redhat.com> - 1.22.3-18
 - Add missing "bundled(gnulib)" provides
-  resolves: #1654251
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Nikola Forró <nforro@redhat.com> - 1.22.3-16
+- Remove install-info from scriptlets

 * Tue Feb 27 2018 Nikola Forró <nforro@redhat.com> - 1.22.3-15
 - Add unowned directories to groff-base and groff-perl
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/groff-1.22.3-coverity.patch
+++ b/groff-1.22.3-coverity.patch
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (groff-1.22.3.tar.gz) = c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
				`@ -0,0 +1 @@`
				`2ce4ab107e3fab1414fef2c5b5312f562a4e4d35 SOURCES/groff-1.22.4.tar.gz`
				`@ -1 +0,0 @@`
				`SHA512 (groff-1.22.3.tar.gz) = c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c`