From e090aff5a29ccf3731d78c6b9b3a47461e1482ac5fb0f4aac33a6bd545c27c1d Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Mon, 27 Jun 2011 12:59:56 +0000
Subject: [PATCH] - update to 1.21 a bugfix release   * use new
 groff_1.21-6.debian.diff   * refresh libexecdir and pdfroff patch - fix
 FATE#311297: Get rid of SuSEconfig.groff   * removed

OBS-URL: https://build.opensuse.org/package/show/M17N/groff?expand=0&rev=19
---
 SuSEconfig.groff                              |  70 ---
 groff-1.20.1.tar.bz2                          |   3 -
 ...44.patch => groff-1.21-CVE-2009-5044.patch |  33 +-
 ...tch => groff-1.21-groffer-libexecdir.patch |  18 +-
 groff-1.21.tar.gz                             |   3 +
 groff.changes                                 |   9 +
 groff.spec                                    |  20 +-
 ...10.debian.diff => groff_1.21-6.debian.diff | 460 +++++-------------
 gxditview.changes                             |   7 +
 gxditview.spec                                |  15 +-
 sysconfig.suseconfig-groff                    |  20 -
 11 files changed, 182 insertions(+), 476 deletions(-)
 delete mode 100644 SuSEconfig.groff
 delete mode 100644 groff-1.20.1.tar.bz2
 rename groff-1.20.1-CVE-2009-5044.patch => groff-1.21-CVE-2009-5044.patch (71%)
 rename groff-1.20.1-groffer-libexecdir.patch => groff-1.21-groffer-libexecdir.patch (81%)
 create mode 100644 groff-1.21.tar.gz
 rename groff_1.20.1-10.debian.diff => groff_1.21-6.debian.diff (69%)
 delete mode 100644 sysconfig.suseconfig-groff

diff --git a/SuSEconfig.groff b/SuSEconfig.groff
deleted file mode 100644
index 772d357..0000000
--- a/SuSEconfig.groff
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (c) 1998 S.u.S.E. Gmbh Fuerth, Germany.
-#               2002 SuSE Linux AG, Nuernberg, Germany.
-#
-# please send bugfixes or comments to <feedback@suse.de>
-#
-# Authors: Werner Fink, <werner@suse.de>
-#          Mike Fabian <mfabian@suse.de>
-
-# only one of UID and USER must be set correctly
-if test "$UID" != 0 -a "$USER" != root; then
-    echo "You must be root to start $0."
-    exit 1
-fi
-
-test -f $ROOT/etc/sysconfig/suseconfig || {
-    echo "No /etc/sysconfig/suseconfig found." && exit 1 ;
-}
-. $ROOT/etc/sysconfig/suseconfig
-
-test -f /lib/YaST/SuSEconfig.functions || {
-        echo "ERROR - can not find /lib/YaST/SuSEconfig.functions!!"
-        echo "This should not happen.  Exit..."
-        exit 1
-}
-. /lib/YaST/SuSEconfig.functions
-
-test -n "$UPDATE_GROFF_CONF" -a "$UPDATE_GROFF_CONF" = "no" && {
-    echo "Warning: UPDATE_GROFF_CONF is deprecated and might be removed in future"
-    echo "SuSEconfig.groff no longer rewrites user modified /etc/papersize"
-}
-
-test -n "$UPDATE_GROFF_CONF" -a "$UPDATE_GROFF_CONF" = "yes" || exit 0
-
-function get_paper () {
-    (
-	. /etc/sysconfig/language &> /dev/null
-	read h w r < <(LANG=$RC_LANG LC_ALL=$RC_LC_ALL LC_PAPER=$RC_LC_PAPER locale -k LC_PAPER)
-	case "$h" in
-	    height=297) echo a4	    ;;
-	    *)		echo letter ;;
-	esac
-    )
-}
-
-# first get the paper size from the locale information
-PAPER_SIZE=$(get_paper)
-
-# if GROFF_PAGESIZE is set, it overrides the locale information:
-if [ -n "$GROFF_PAGESIZE" ] ; then
-    echo "Warning: GROFF_PAGESIZE is deprecated and might be removed in future"
-    echo "Use RC_LANG or RC_LC_PAPER in /etc/sysconfig/language"
-    echo "or write the value to /etc/papersize, it will not be overwritten"
-    # make GROFF_PAGESIZE lower case only:
-    GROFF_PAGESIZE=$( echo $GROFF_PAGESIZE | tr '[:upper:]' '[:lower:]' )
-    case $GROFF_PAGESIZE in
-	a4|letter)
-	    PAPER_SIZE=$GROFF_PAGESIZE
-	;;
-	*)
-            echo "illegal value of GROFF_PAGESIZE, using 'a4' instead."
-            PAPER_SIZE=a4
-        ;;
-    esac
-fi
-
-echo "$PAPER_SIZE" > /etc/papersize.SuSEconfig
-check_md5_and_move /etc/papersize 
-
-exit 0
diff --git a/groff-1.20.1.tar.bz2 b/groff-1.20.1.tar.bz2
deleted file mode 100644
index 472c672..0000000
--- a/groff-1.20.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ae1a46220aa94aaa229111057a56515293f1f3dfb471a29037b992025c11d9c
-size 2842467
diff --git a/groff-1.20.1-CVE-2009-5044.patch b/groff-1.21-CVE-2009-5044.patch
similarity index 71%
rename from groff-1.20.1-CVE-2009-5044.patch
rename to groff-1.21-CVE-2009-5044.patch
index 46886fa..eb788f0 100644
--- a/groff-1.20.1-CVE-2009-5044.patch
+++ b/groff-1.21-CVE-2009-5044.patch
@@ -1,11 +1,24 @@
-Index: groff-1.20.1/contrib/pdfmark/pdfroff.sh
+---
+ contrib/pdfmark/pdfroff.sh |   22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+Index: groff-1.21/contrib/pdfmark/pdfroff.sh
 ===================================================================
---- groff-1.20.1.orig/contrib/pdfmark/pdfroff.sh	2011-06-09 10:41:29.000000000 +0200
-+++ groff-1.20.1/contrib/pdfmark/pdfroff.sh	2011-06-09 10:54:58.208448083 +0200
-@@ -145,14 +145,16 @@
- 
-   GROFF_TMPDIR=${WRKDIR}
- 
+--- groff-1.21.orig/contrib/pdfmark/pdfroff.sh	2010-12-31 08:33:09.000000000 +0100
++++ groff-1.21/contrib/pdfmark/pdfroff.sh	2011-06-27 13:13:32.807924590 +0200
+@@ -157,7 +157,7 @@
+   # as default), and schedule removal of only the temporary files.
+   #
+     GROFF_TMPDIR=${TMPDIR}
+-    trap "rm -f ${GROFF_TMPDIR}/pdf$$.*" 0
++    trap "rm -f ${GROFF_TMPDIR}/*" 0
+   fi
+   #
+   # In the case of abnormal termination events, we force an exit
+@@ -168,14 +168,16 @@
+   #
+   trap "exit 1" 1 2 3 13 15
+ #
 -  WRKFILE=${GROFF_TMPDIR}/pdf$$.tmp
 +  WRKFILE=`mktemp --tmpdir="${GROFF_TMPDIR}" pdfXXXXXXXXXX.tmp`
  #
@@ -24,7 +37,7 @@ Index: groff-1.20.1/contrib/pdfmark/pdfroff.sh
  #
  # Initialise 'groff' format control settings,
  # to discriminate table of contents and document body formatting passes.
-@@ -305,7 +307,7 @@
+@@ -328,7 +330,7 @@
                 ;;
  
               --stylesheet)
@@ -33,7 +46,7 @@ Index: groff-1.20.1/contrib/pdfmark/pdfroff.sh
                 ;;
  
  	     --no-toc-relocation)
-@@ -338,7 +340,7 @@
+@@ -361,7 +363,7 @@
  #     so set up a mechanism to achieve this, for ALL 'groff' passes.
  #
        - | -i*)
@@ -42,7 +55,7 @@ Index: groff-1.20.1/contrib/pdfmark/pdfroff.sh
  	   test "$1" = "-" && INPUT_FILES="$INPUT_FILES $1" \
  	     || GROFF_STYLE="$GROFF_STYLE $1" 
  	   ;;
-@@ -410,8 +412,8 @@
+@@ -433,8 +435,8 @@
  # or if no input files are specified, then we need to capture STDIN,
  # so we can replay it into each 'groff' processing pass.
  #
diff --git a/groff-1.20.1-groffer-libexecdir.patch b/groff-1.21-groffer-libexecdir.patch
similarity index 81%
rename from groff-1.20.1-groffer-libexecdir.patch
rename to groff-1.21-groffer-libexecdir.patch
index e8e5d91..7d2012d 100644
--- a/groff-1.20.1-groffer-libexecdir.patch
+++ b/groff-1.21-groffer-libexecdir.patch
@@ -1,7 +1,7 @@
-Index: groff-1.20.1/contrib/groffer/Makefile.sub
+Index: groff-1.21/contrib/groffer/Makefile.sub
 ===================================================================
---- groff-1.20.1.orig/contrib/groffer/Makefile.sub	2009-01-09 15:25:52.000000000 +0100
-+++ groff-1.20.1/contrib/groffer/Makefile.sub	2010-08-27 11:46:36.946469881 +0200
+--- groff-1.21.orig/contrib/groffer/Makefile.sub	2010-12-31 08:33:09.000000000 +0100
++++ groff-1.21/contrib/groffer/Makefile.sub	2011-06-27 13:10:49.646150367 +0200
 @@ -63,7 +63,7 @@
  GROFFER_PERL_=`echo $(GROFFER_PERL) | sed 's|$(srcdir)/perl/||g'`
  GROFFER_SHELL_=`echo $(GROFFER_SHELL) | sed 's|$(srcdir)/shell||g'`
@@ -38,11 +38,11 @@ Index: groff-1.20.1/contrib/groffer/Makefile.sub
  
  ########################################################################
  # Emacs settings
-Index: groff-1.20.1/Makefile.in
+Index: groff-1.21/Makefile.in
 ===================================================================
---- groff-1.20.1.orig/Makefile.in	2010-08-27 11:44:59.000000000 +0200
-+++ groff-1.20.1/Makefile.in	2010-08-27 12:38:22.358157037 +0200
-@@ -137,6 +137,9 @@
+--- groff-1.21.orig/Makefile.in	2011-06-27 13:10:49.595148562 +0200
++++ groff-1.21/Makefile.in	2011-06-27 13:10:49.647150402 +0200
+@@ -139,6 +139,9 @@
  libdir=@libdir@
  libprogramdir=$(libdir)/groff
  
@@ -51,8 +51,8 @@ Index: groff-1.20.1/Makefile.in
 +
  # `datasubdir' says where to install platform-independent data files.
  datadir=@datadir@
- dataprogramdir=$(datadir)/groff
-@@ -732,7 +735,7 @@
+ datarootdir=@datarootdir@
+@@ -786,7 +789,7 @@
  	fi; \
  	test -d $@ || $(mkinstalldirs) $@; \
  	cd $@; \
diff --git a/groff-1.21.tar.gz b/groff-1.21.tar.gz
new file mode 100644
index 0000000..0e37136
--- /dev/null
+++ b/groff-1.21.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:344e6af5480e7ab4ec51e2a2ed10acd69ba3e062d285b6d5f6d49fb5ed2f9f7a
+size 3863837
diff --git a/groff.changes b/groff.changes
index d6d8451..62c7c52 100644
--- a/groff.changes
+++ b/groff.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 27 11:14:25 UTC 2011 - mvyskocil@suse.cz
+
+- update to 1.21 a bugfix release
+  * use new groff_1.21-6.debian.diff
+  * refresh libexecdir and pdfroff patch
+- fix FATE#311297: Get rid of SuSEconfig.groff
+  * removed
+
 -------------------------------------------------------------------
 Wed Jun  8 09:06:44 UTC 2011 - mvyskocil@suse.cz
 
diff --git a/groff.spec b/groff.spec
index 5fe4598..92cf249 100644
--- a/groff.spec
+++ b/groff.spec
@@ -21,24 +21,22 @@
 Name:           groff
 License:        BSD3c(or similar) ; GPLv2+
 Group:          Productivity/Publishing/Troff
-Version:        1.20.1
-Release:        9
+Version:        1.21
+Release:        1
 Summary:        GNU troff Document Formatting System
 Url:            http://www.gnu.org/software/groff/groff.html
-Source0:        ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.bz2
-Source1:        SuSEconfig.groff
-Source2:        sysconfig.suseconfig-groff
+Source0:        ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
 Source3:        zzz-groff.sh
 Source4:        zzz-groff.csh
 # for file in `cat series | grep -v '^#' | grep  '^[a-z]' `; do
-#    cat $file >> groff_1.20.1-10.debian.diff
+#    cat $file >> groff_1.21-6.debian.diff
 # done
-Patch0:         groff_1.20.1-10.debian.diff
+Patch0:         groff_1.21-6.debian.diff
 Patch1:         groff-1.20.1-destbufferoverflow.patch
 Patch2:         groff-1.20.1-nroff-empty-LANGUAGE.patch
-Patch3:         groff-1.20.1-groffer-libexecdir.patch
+Patch3:         groff-1.21-groffer-libexecdir.patch
 Patch4:         groff-1.20.1-deunicode.patch
-Patch5:         groff-1.20.1-CVE-2009-5044.patch
+Patch5:         groff-1.21-CVE-2009-5044.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
@@ -124,8 +122,6 @@ popd
 # SUSEconfig stuff
 %{__install} -d -m 0755 %{buildroot}/sbin/conf.d
 %{__install} -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates
-%{__install} -m 0755 %{SOURCE1} %{buildroot}/sbin/conf.d/
-%{__install} -m 0644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/
 
 %{__install} -d -m 0755 %{buildroot}%{_sysconfdir}
 echo "a4" > %{buildroot}%{_sysconfdir}/papersize
@@ -160,8 +156,6 @@ rm -rf %{buildroot}
 %config %{_sysconfdir}/profile.d/zzz-%{name}.*sh
 %{_datadir}/%{name}
 %{_libexecdir}/%{name}
-/sbin/conf.d/SuSEconfig.%{name}
-%{_localstatedir}/adm/fillup-templates/sysconfig.suseconfig-%{name}
 
 %files doc
 %defattr(-, root, root)
diff --git a/groff_1.20.1-10.debian.diff b/groff_1.21-6.debian.diff
similarity index 69%
rename from groff_1.20.1-10.debian.diff
rename to groff_1.21-6.debian.diff
index bee9635..0b30285 100644
--- a/groff_1.20.1-10.debian.diff
+++ b/groff_1.21-6.debian.diff
@@ -43,209 +43,6 @@ Index: b/contrib/groffer/shell/groffer2.sh
      if is_not_equal "$?" 0
      then
        obj _TMP_DIR rm_tree;
-Description: Fix temporary file handling vulnerabilities in pdfroff
-Origin: vendor, http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/groff/groff-1.20.1-owl-tmp.diff
-Bug-Debian: http://bugs.debian.org/538330
-Forwarded: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538330#8
-Last-Update: 2010-03-01
-
-Index: b/contrib/pdfmark/pdfroff.man
-===================================================================
---- a/contrib/pdfmark/pdfroff.man
-+++ b/contrib/pdfmark/pdfroff.man
-@@ -529,7 +529,7 @@
- .B 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
- is
-@@ -541,7 +541,8 @@
- .B 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.
-+in a subdirectory of
-+.BR /tmp .
- .
- .TP
- .B GROFF_GHOSTSCRIPT_INTERPRETER
-Index: b/contrib/pdfmark/pdfroff.sh
-===================================================================
---- a/contrib/pdfmark/pdfroff.sh
-+++ b/contrib/pdfmark/pdfroff.sh
-@@ -137,7 +137,15 @@
- #
- # Set up temporary/intermediate file locations.
- #
--  WRKFILE=${GROFF_TMPDIR=${TMPDIR-${TMP-${TEMP-"."}}}}/pdf$$.tmp
-+  MYTMPDIR=${GROFF_TMPDIR-${TMPDIR-${TMP-${TEMP-"/tmp"}}}}
-+  WRKDIR="`unset TMPDIR && mktemp -dp "$MYTMPDIR" groff-pdfroff.XXXXXXXXXX`" || exit
-+
-+  trap 'rm -rf -- "$WRKDIR"' EXIT
-+  trap 'trap - EXIT; rm -rf -- "$WRKDIR"; exit 1' HUP INT QUIT PIPE TERM
-+
-+  GROFF_TMPDIR=${WRKDIR}
-+
-+  WRKFILE=${GROFF_TMPDIR}/pdf$$.tmp
- #
-   REFCOPY=${GROFF_TMPDIR}/pdf$$.cmp
-   REFFILE=${GROFF_TMPDIR}/pdf$$.ref
-@@ -146,11 +154,6 @@
-   TC_DATA=${GROFF_TMPDIR}/pdf$$.tc
-   BD_DATA=${GROFF_TMPDIR}/pdf$$.ps
- #
--# Set a trap, to delete temporary files on exit.
--# (FIXME: may want to include other signals, in released version).
--#
--  trap "rm -f ${GROFF_TMPDIR}/pdf$$.*" 0
--#
- # Initialise 'groff' format control settings,
- # to discriminate table of contents and document body formatting passes.
- #
-Description: Use -dSAFER when calling gs from pdfroff
-Author: Colin Watson <cjwatson@debian.org>
-Bug-Debian: http://bugs.debian.org/538338
-Forwarded: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538338#8
-Last-Update: 2010-03-01
-
-Index: b/contrib/pdfmark/pdfroff.man
-===================================================================
---- a/contrib/pdfmark/pdfroff.man
-+++ b/contrib/pdfmark/pdfroff.man
-@@ -521,7 +521,7 @@
- .IP
- .I
- .ad l
--.NH gs \-dBATCH \-dQUIET \-dNOPAUSE \-sDEVICE=pdfwrite \-sOutputFile=\-
-+.NH gs \-dBATCH \-dQUIET \-dNOPAUSE \-dSAFER \-sDEVICE=pdfwrite \-sOutputFile=\-
- .ad
- .RE
- .
-Index: b/contrib/pdfmark/pdfroff.sh
-===================================================================
---- a/contrib/pdfmark/pdfroff.sh
-+++ b/contrib/pdfmark/pdfroff.sh
-@@ -600,7 +600,7 @@
-   $SAY >&2 $n "Writing PDF output ..$c"
-   if test -z "$PDFROFF_POSTPROCESSOR_COMMAND"
-   then
--    PDFROFF_POSTPROCESSOR_COMMAND="$GS -dQUIET -dBATCH -dNOPAUSE
-+    PDFROFF_POSTPROCESSOR_COMMAND="$GS -dQUIET -dBATCH -dNOPAUSE -dSAFER
-       -sDEVICE=pdfwrite -sOutputFile="${PDF_OUTPUT-"-"}
- 
-   elif test -n "$PDF_OUTPUT"
-Description: Remove unnecessary bashisms from gdiffmk
-Author: Colin Watson <cjwatson@debian.org>
-Bug-Debian: http://bugs.debian.org/547750
-Forwarded: http://lists.gnu.org/archive/html/bug-groff/2009-09/msg00003.html
-Last-Update: 2010-03-01
-
-Index: b/contrib/gdiffmk/gdiffmk.sh
-===================================================================
---- a/contrib/gdiffmk/gdiffmk.sh
-+++ b/contrib/gdiffmk/gdiffmk.sh
-@@ -21,7 +21,7 @@
- 
- cmd=$( basename $0 )
- 
--function Usage {
-+Usage () {
- 	if test "$#" -gt 0
- 	then
- 		echo >&2 "${cmd}:  $@"
-@@ -60,7 +60,7 @@
- }
- 
- 
--function Exit {
-+Exit () {
- 	exitcode=$1
- 	shift
- 	for arg
-@@ -75,7 +75,7 @@
- #
- #	Check for existence and readability of given file name.
- #	If not found or not readable, print message and exit with EXIT_CODE.
--function FileRead {
-+FileRead () {
- 	case "$2" in
- 	-)
- 		return
-@@ -97,7 +97,7 @@
- #
- #	Create the given filename if it doesn't exist.
- #	If unable to create or write, print message and exit with EXIT_CODE.
--function FileCreate {
-+FileCreate () {
- 	case "$2" in
- 	-)
- 		return
-@@ -115,7 +115,7 @@
- 	fi
- }
- 
--function WouldClobber {
-+WouldClobber () {
- 	case "$2" in
- 	-)
- 		return
-@@ -136,7 +136,7 @@
- MARK1='[['
- MARK2=']]'
- 
--function RequiresArgument {
-+RequiresArgument () {
- 	#	Process flags that take either concatenated or
- 	#	separated values.
- 	case "$1" in
-Description: Use POSIX-compliant 'trap' arguments
-Author: David Weinehall <tao@debian.org>
-Author: Colin Watson <cjwatson@debian.org>
-Forwarded: http://lists.gnu.org/archive/html/bug-groff/2010-02/msg00005.html
-Last-Update: 2010-03-01
-
-Index: b/contrib/eqn2graph/eqn2graph.sh
-===================================================================
---- a/contrib/eqn2graph/eqn2graph.sh
-+++ b/contrib/eqn2graph/eqn2graph.sh
-@@ -75,7 +75,7 @@
-     { (exit 1); exit 1; }
- fi
- 
--trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 2 15 
-+trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
- 
- # Here goes:
- # 1. Add .EQ/.EN.
-Index: b/contrib/grap2graph/grap2graph.sh
-===================================================================
---- a/contrib/grap2graph/grap2graph.sh
-+++ b/contrib/grap2graph/grap2graph.sh
-@@ -71,7 +71,7 @@
-     { (exit 1); exit 1; }
- fi
- 
--trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 2 15 
-+trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
- 
- # Here goes:
- # 1. Add .G1/.G2.
-Index: b/contrib/pic2graph/pic2graph.sh
-===================================================================
---- a/contrib/pic2graph/pic2graph.sh
-+++ b/contrib/pic2graph/pic2graph.sh
-@@ -86,7 +86,7 @@
-     { (exit 1); exit 1; }
- fi
- 
--trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 2 15 
-+trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
- 
- # Here goes:
- # 1. Wrap the input in dummy .PS/PE macros (and add possibly null .EQ/.EN)
 Description: The *2graph scripts use $RANDOM, which is bash-specific
 Author: Colin Watson <cjwatson@debian.org>
 Forwarded: no
@@ -489,89 +286,6 @@ Index: b/src/preproc/html/pre-html.cpp
    i = scanArguments(argc, argv);
    setupAntiAlias();
    checkImageDir();
-Description: Call `ec' before mapping characters
-Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/groff/main/revision/1822
-Forwarded: yes
-Last-Update: 2010-03-01
-
-Index: b/tmac/doc.tmac
-===================================================================
---- a/tmac/doc.tmac
-+++ b/tmac/doc.tmac
-@@ -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
- .
-Description: Update mdoc for newer FreeBSD and POSIX versions
-Author: Colin Watson <cjwatson@debian.org>
-Forwarded: http://lists.gnu.org/archive/html/bug-groff/2010-02/msg00007.html
-Last-Update: 2010-03-01
-
-Index: b/tmac/doc-common
-===================================================================
---- a/tmac/doc-common
-+++ b/tmac/doc-common
-@@ -504,6 +504,9 @@
- .ds doc-operating-system-FreeBSD-6.4     6.4
- .ds doc-operating-system-FreeBSD-7.0     7.0
- .ds doc-operating-system-FreeBSD-7.1     7.1
-+.ds doc-operating-system-FreeBSD-7.2     7.2
-+.ds doc-operating-system-FreeBSD-7.3     7.3
-+.ds doc-operating-system-FreeBSD-8.0     8.0
- .
- .ds doc-operating-system-Darwin-8.0.0  8.0.0
- .ds doc-operating-system-Darwin-8.1.0  8.1.0
-Index: b/tmac/doc-syms
-===================================================================
---- a/tmac/doc-syms
-+++ b/tmac/doc-syms
-@@ -637,6 +637,8 @@
- .as doc-str-St--p1003.1-2001   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
- .ds doc-str-St--p1003.1-2004   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2004
- .as doc-str-St--p1003.1-2004   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
-+.ds doc-str-St--p1003.1-2008   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008
-+.as doc-str-St--p1003.1-2008   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
- .
- .\" POSIX Part 2: Shell and Utilities
- .ds doc-str-St--p1003.2        \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2
-Index: b/tmac/groff_mdoc.man
-===================================================================
---- a/tmac/groff_mdoc.man
-+++ b/tmac/groff_mdoc.man
-@@ -870,7 +870,7 @@
- 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1,
- 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1,
- 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1,
--5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1
-+5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1, 7.2, 7.3, 8.0
- .It DragonFly
- 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0
- .It Darwin
-@@ -1974,6 +1974,8 @@
- .St -p1003.1-2001
- .It Li \-p1003.1\-2004
- .St -p1003.1-2004
-+.It Li \-p1003.1\-2008
-+.St -p1003.1-2008
- .El
- .Pp
- .
 Description: Add GFDL references to manual pages licensed under GFDL
 Author: Colin Watson <cjwatson@debian.org>
 Bug-Debian: http://bugs.debian.org/292229
@@ -642,7 +356,7 @@ Index: b/man/groff_diff.man
 ===================================================================
 --- a/man/groff_diff.man
 +++ b/man/groff_diff.man
-@@ -22,6 +22,10 @@
+@@ -23,6 +23,10 @@
  A copy of the Free Documentation License is included as a file called
  FDL in the main directory of the groff source package.
  ..
@@ -753,7 +467,7 @@ Index: b/contrib/pdfmark/pdfroff.man
 ===================================================================
 --- a/contrib/pdfmark/pdfroff.man
 +++ b/contrib/pdfmark/pdfroff.man
-@@ -783,7 +783,7 @@
+@@ -796,7 +796,7 @@
  in PDF format, in the reference guide
  .BR "\*(lqPortable Document Format Publishing with GNU Troff\*(rq" ,
  included in the installed documentation set as
@@ -786,7 +500,7 @@ Index: b/Makefile.in
 ===================================================================
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -641,7 +641,7 @@
+@@ -680,7 +680,7 @@
  	fi
  
  do=all
@@ -832,65 +546,63 @@ Index: b/src/preproc/pic/main.cpp
  #ifdef FIG_SUPPORT
    if (whole_file_flag) {
      if (optind >= argc)
-Description: Handle ditroff command `Dt' without argument gracefully
- Without this patch, grotty goes into an infinite loop if it tries to
- process:
- .
-  x T utf8
-  x res 240 24 40
-  x init
-  p1
-  Dt
-Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/groff/main/revision/1876
+Description: Add mdoc support for various BSD versions
+Author: Guillem Jover <guillem@debian.org>
+Bug-Debian: http://bugs.debian.org/629159
 Forwarded: yes
-Last-Update: 2010-05-09
+Last-Update: 2011-06-06
 
-Index: b/src/libs/libdriver/input.cpp
+Index: b/tmac/doc-common
 ===================================================================
---- a/src/libs/libdriver/input.cpp
-+++ b/src/libs/libdriver/input.cpp
-@@ -3,13 +3,13 @@
- // <groff_src_dir>/src/libs/libdriver/input.cpp
- 
- /* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005,
--                 2006, 2008, 2009
-+                 2006, 2008, 2009, 2010
-    Free Software Foundation, Inc.
- 
-    Written by James Clark (jjc@jclark.com)
-    Major rewrite 2001 by Bernd Warken (bwarken@mayn.de)
- 
--   Last update: 5 Jan 2009
-+   Last update: 9 May 2010
- 
-    This file is part of groff, the GNU roff text processing system.
- 
-@@ -790,7 +790,7 @@
-     c = get_char();
-   }
-   if (!isdigit((int) c))
--    error("integer argument expected");
-+    fatal("integer argument expected");
-   while (isdigit((int) c)) {
-     buf.append(c);
-     c = get_char();
-@@ -879,6 +879,7 @@
-       break;
-     default:
-       error("integer argument expected");
-+      done = true;
-       break;
-     }
-   }
-@@ -946,7 +947,7 @@
-     case '\n':
-     case EOF:
-       error("missing argument");
--      break;
-+      return c;
-     default:			// first essential character
-       return c;
-     }
+--- a/tmac/doc-common
++++ b/tmac/doc-common
+@@ -451,12 +451,16 @@
+ .ds doc-operating-system-NetBSD-3.0   3.0
+ .ds doc-operating-system-NetBSD-3.0.1 3.0.1
+ .ds doc-operating-system-NetBSD-3.0.2 3.0.2
++.ds doc-operating-system-NetBSD-3.0.3 3.0.3
+ .ds doc-operating-system-NetBSD-3.1   3.1
++.ds doc-operating-system-NetBSD-3.1.1 3.1.1
+ .ds doc-operating-system-NetBSD-4.0   4.0
+ .ds doc-operating-system-NetBSD-4.0.1 4.0.1
+ .ds doc-operating-system-NetBSD-5.0   5.0
+ .ds doc-operating-system-NetBSD-5.0.1 5.0.1
+ .ds doc-operating-system-NetBSD-5.0.2 5.0.2
++.ds doc-operating-system-NetBSD-5.1   5.1
++.ds doc-operating-system-NetBSD-6.0   6.0
+ .
+ .ds doc-operating-system-OpenBSD-2.0  2.0
+ .ds doc-operating-system-OpenBSD-2.1  2.1
+@@ -487,6 +491,8 @@
+ .ds doc-operating-system-OpenBSD-4.6  4.6
+ .ds doc-operating-system-OpenBSD-4.7  4.7
+ .ds doc-operating-system-OpenBSD-4.8  4.8
++.ds doc-operating-system-OpenBSD-4.9  4.9
++.ds doc-operating-system-OpenBSD-5.0  5.0
+ .
+ .ds doc-operating-system-FreeBSD-1.0     1.0
+ .ds doc-operating-system-FreeBSD-1.1     1.1
+@@ -543,6 +549,8 @@
+ .ds doc-operating-system-FreeBSD-7.3     7.3
+ .ds doc-operating-system-FreeBSD-8.0     8.0
+ .ds doc-operating-system-FreeBSD-8.1     8.1
++.ds doc-operating-system-FreeBSD-8.2     8.2
++.ds doc-operating-system-FreeBSD-9.0     9.0
+ .
+ .ds doc-operating-system-Darwin-8.0.0  8.0.0
+ .ds doc-operating-system-Darwin-8.1.0  8.1.0
+@@ -581,6 +589,11 @@
+ .ds doc-operating-system-DragonFly-2.4    2.4
+ .ds doc-operating-system-DragonFly-2.6    2.6
+ .ds doc-operating-system-DragonFly-2.8    2.8
++.ds doc-operating-system-DragonFly-2.9    2.9
++.ds doc-operating-system-DragonFly-2.9.1  2.9.1
++.ds doc-operating-system-DragonFly-2.10   2.10
++.ds doc-operating-system-DragonFly-2.10.1 2.10.1
++.ds doc-operating-system-DragonFly-2.11   2.11
+ .
+ .de Os
+ .  ds doc-command-name
 Description: Allow adding a version-independent directory to the macro path
  This allows us to put /usr/share/groff/tmac at the end of groff's macro
  path in Debian.
@@ -902,7 +614,7 @@ Index: b/Makefile.in
 ===================================================================
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -190,7 +190,11 @@
+@@ -193,7 +193,11 @@
  # directory will be always added.
  # `troffrc' and `troffrc-end' (and `eqnrc') are searched neither in the
  # current nor in the home directory.
@@ -1012,3 +724,59 @@ Index: b/src/roff/groff/groff.cpp
    if (!postdriver)
      fatal("no `postpro' command in DESC file for device `%1'", device);
    if (predriver && !zflag) {
+Description: Only emit a single backspace for bold/underline in no-SGR mode
+ less (at least) backspaces over a character at a time.
+Author: Colin Watson <cjwatson@debian.org>
+Forwarded: http://lists.gnu.org/archive/html/bug-groff/2011-01/msg00003.html
+Last-Update: 2011-01-10
+
+Index: b/src/devices/grotty/tty.cpp
+===================================================================
+--- a/src/devices/grotty/tty.cpp
++++ b/src/devices/grotty/tty.cpp
+@@ -311,11 +311,8 @@
+     if (!w)
+       warning("can't underline zero-width character");
+     else {
+-      int n = w / font::hor;
+-      for (int i = 0; i < n; i++)
+-	putchar('_');
+-      for (int j = 0; j < n; j++)
+-	putchar('\b');
++      putchar('_');
++      putchar('\b');
+     }
+   }
+   else {
+@@ -337,10 +334,8 @@
+     if (!w)
+       warning("can't print zero-width character in bold");
+     else {
+-      int n = w / font::hor;
+       put_char(c);
+-      for (int i = 0; i < n; i++)
+-	putchar('\b');
++      putchar('\b');
+     }
+   }
+   else {
+Description: Fix -mm .RD macro to use .if rather than .ie
+Author: James Avera
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/738169
+Forwarded: yes
+Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/groff/main/revision/1992
+Last-Update: 2011-03-19
+
+Index: b/contrib/mm/m.tmac
+===================================================================
+--- a/contrib/mm/m.tmac
++++ b/contrib/mm/m.tmac
+@@ -689,7 +689,7 @@
+ .rd \\$1\t
+ .br
+ .di
+-.ie !''\\$3' \{\
++.if !''\\$3' \{\
+ .	di misc*rd2
+ .	ds \\$3 "\\*[misc*rd]
+ .	br
diff --git a/gxditview.changes b/gxditview.changes
index b12c1c9..a82ce9d 100644
--- a/gxditview.changes
+++ b/gxditview.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 27 12:59:30 UTC 2011 - mvyskocil@suse.cz
+
+- update to 1.21 a bugfix release
+  * use new groff_1.21-6.debian.diff
+  * refresh libexecdir and pdfroff patch
+
 -------------------------------------------------------------------
 Wed Jun  8 09:52:07 UTC 2011 - mvyskocil@suse.cz
 
diff --git a/gxditview.spec b/gxditview.spec
index 1c75762..1675972 100644
--- a/gxditview.spec
+++ b/gxditview.spec
@@ -21,16 +21,20 @@ Name:           gxditview
 License:        MIT
 Group:          Productivity/Publishing/Troff
 AutoReqProv:    on
-Version:        1.20.1
-Release:        4
+Version:        1.21
+Release:        1
 Summary:        Ditroff Output Displayer for Groff
 Url:            http://www.gnu.org/software/groff/groff.html
-Source0:        ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.bz2
-Patch0:         groff_1.20.1-10.debian.diff
+Source0:        ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
+# for file in `cat series | grep -v '^#' | grep  '^[a-z]' `; do
+#    cat $file >> groff_1.21-6.debian.diff
+# done
+Patch0:         groff_1.21-6.debian.diff
 Patch1:         groff-1.20.1-destbufferoverflow.patch
 Patch2:         groff-1.20.1-nroff-empty-LANGUAGE.patch
-Patch3:         groff-1.20.1-groffer-libexecdir.patch
+Patch3:         groff-1.21-groffer-libexecdir.patch
 Patch4:         groff-1.20.1-deunicode.patch
+Patch5:         groff-1.21-CVE-2009-5044.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
@@ -65,6 +69,7 @@ separate package because of bootstrapping issues.
 %patch2 -p1 -b .bnc540600
 %patch3 -p1 -b .groffer-libexecdir
 %patch4 -p1 -b .deunicode
+%patch5 -p1 -b .CVE-2009-5044
 
 %build
 PATH=$PWD/src/roff/troff:$PWD/src/preproc/pic:$PWD/src/preproc/eqn:$PWD/src/preproc/tbl:$PWDsrc/preproc/refer:$PWD/src/preproc/soelim:$PATH
diff --git a/sysconfig.suseconfig-groff b/sysconfig.suseconfig-groff
deleted file mode 100644
index 556010d..0000000
--- a/sysconfig.suseconfig-groff
+++ /dev/null
@@ -1,20 +0,0 @@
-## Path:        System/SuSEconfig
-## Type:        yesno
-## Config:      groff
-## Default:     yes
-#
-# Update /etc/papersize to get page sizes for groff correct? (yes/no)
-# 
-UPDATE_GROFF_CONF="yes"
-## Type:        string(letter,legal,a4,b5)
-## Config:      groff
-## Default:     ""
-#
-# By default, SuSEconfig tries to get the correct page size
-# from your system wide locale (i.e. from the system wide value of
-# LC_PAPER, which is possibly inherited from the system wide value of LANG).
-# If you want to set a page size for groff different from that,
-# you can set GROFF_PAGESIZE to the following values
-#      letter, legal, a4, b5
-#
-GROFF_PAGESIZE=""