Hello community, here is the log from the commit of package groff for openSUSE:Factory checked in at 2015-02-06 10:52:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/groff (Old) and /work/SRC/openSUSE:Factory/.groff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "groff" Changes: -------- --- /work/SRC/openSUSE:Factory/groff/groff-full.changes 2014-12-22 12:52:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.groff.new/groff-full.changes 2015-02-06 10:52:59.000000000 +0100 @@ -1,0 +2,45 @@ +Wed Feb 4 10:30:49 UTC 2015 - [email protected] + +- Version bump to latest release 1.22.3: + * X11 resources for `gxditview', which were previously installed in + /usr/X11/lib/X11/app-defaults no matter which `prefix' was set, are + now installed in appresdir=$prefix/lib/X11/app-defaults. If + `appresdir' is not a standard X11 resource directory, the environment + variable XFILESEARCHPATH should be set to this path. The standard + default directories depends on the system `libXt'. + * This new preprocessor (contributed by Bernd Warken) allows embedding of + code for GNU LilyPond (http://www.lilypond.org), a music typesetter. The + data gets automatically processed and embedded as EPS images. + * Bernd Warken contributed a new preprocessor to handle Perl code that can + be evaluated and then processed by groff. + * Another preprocessor from Bernd Warken to pretty-print Pinyin syllables + like `guo2wang2' as `guówáng'. + * The pdfroff utility script now activates its `--no-toc-relocation' option + by default, unless a request similar to: + .if !\n[PHASE] .tm pdfroff-option:set toc_relocation=enabled + is invoked during input file processing; (`.if !\n[PHASE] ...' ensures + that the effect of the `.tm' request is restricted to the document setup + phase of processing, as pdfroff sets it to 1 or 2 in the output phase, + but leaves it unset in the setup phase). + The bundled `spdf.tmac' macro package, which implicitly activates + `-mpdfmark' for `ms' macro users, ensures that TOC relocation is + appropriately enabled, when the `.TC' macro is invoked. + * The -mom macro package now has full support for eqn, pic, and tbl, as well + as captioning and labelling of pdf images and preprocessor output. Lists + of Figures, Equations, and Tables can now be autogenerated. PDF_IMAGE has + a new FRAME option. + * A French introduction to the -me macro package has been added (file + `meintro_fr.me'). + * In -mdoc, command %C is now available, providing a city or place + reference. +- Refreshed patches: + * groff-1.21-CVE-2009-5081.patch + * groff-1.21-groffer-libexecdir.patch + * groff-force-locale-usage.patch +- Replaced patches: + * deleted groff_1.22.2-2.debian.diff + * added groff_1.22.3-1.debian.diff +- New patches: + * groff-multi-thread.patch + +------------------------------------------------------------------- groff.changes: same change Old: ---- groff-1.22.2.tar.gz groff-1.22.2.tar.gz.sig groff_1.22.2-2.debian.diff New: ---- groff-1.22.3.tar.gz groff-1.22.3.tar.gz.sig groff-multi-thread.patch groff_1.22.3-1.debian.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ groff-full.spec ++++++ --- /var/tmp/diff_new_pack.OF1Sfw/_old 2015-02-06 10:53:01.000000000 +0100 +++ /var/tmp/diff_new_pack.OF1Sfw/_new 2015-02-06 10:53:01.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package groff-full +# spec file for package groff # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,13 @@ # -##### WARNING: please do not edit this auto generated spec file. Use the groff.spec! ##### %global groff_base_only 0 - +%if %{groff_base_only} +Name: groff +%else Name: groff-full -Version: 1.22.2 +%endif +Version: 1.22.3 Release: 0 Summary: GNU troff Document Formatting System License: BSD-3-Clause and GPL-2.0+ @@ -37,7 +39,9 @@ # done ##remove a part related to src/preproc/html/pre-html.cpp - see bnc#755533 # filterdiff -x 'src/preproc/html/pre-html.cpp' foo > groff_1.22.2-2.debian.diff -Patch0: groff_1.22.2-2.debian.diff +##remove Debian package string for openSUSE package string +##delete the papersize /etc settings patch +Patch0: groff_1.22.3-1.debian.diff Patch1: groff-1.20.1-destbufferoverflow.patch Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch Patch3: groff-1.21-groffer-libexecdir.patch @@ -55,43 +59,38 @@ # change the papersize definition to force the locale usage # it can be supressed by /etc/papersize if needed Patch10: groff-force-locale-usage.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-UPSTREAM fix build with multiple threads ; taken from upstream +Patch11: groff-multi-thread.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: gcc-c++ -%if 0%{suse_version} > 1220 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1220 BuildRequires: makeinfo %endif - %if %{groff_base_only} Recommends: groff-full %else BuildRequires: ghostscript-library -%if 0%{suse_version} > 1220 -BuildRequires: gpg-offline -%endif BuildRequires: groff BuildRequires: netpbm BuildRequires: psutils # for gxditview and X fontx BuildRequires: xorg-x11-devel - +# for pre-grohtml and pdfroff +Requires: ghostscript-library +# requires the -base package +Requires: groff = %{version} +Requires: netpbm +Requires: psutils +Requires(pre): %{install_info_prereq} Provides: jgroff = %{version}-%{release} Provides: normal-groff = %{version}-%{release} Obsoletes: jgroff < %{version} # X fonts were moved back Provides: groff-devx = %{version}-%{release} Obsoletes: groff-devx <= 1.21 -# requires the -base package -Requires: groff = %{version} -Requires(pre): %install_info_prereq -# for pre-grohtml and pdfroff -Requires: ghostscript-library -Requires: netpbm -Requires: psutils %endif - %if %{groff_base_only} %description The groff package is a stripped-down package containing the necessary @@ -101,7 +100,6 @@ install the groff-full package. %else #groff_base_only - %description The groff-full package provides aditional tools excluded from base groff package, like grohtml, X fonts et. all. @@ -109,8 +107,8 @@ Groff is used to "compile" man pages stored in groff or nroff format for different output devices, for example, displaying to a screen or in PostScript(tm) format for printing on a PostScript(tm) printer. Most -programs store their man pages in either /usr/share/man/ or -/usr/X11R6/man/. +programs store their man pages in either %{_mandir}/ or +%{_prefix}/X11R6/man/. %package -n groff-doc Summary: HTML documentation and examples for groff @@ -124,8 +122,8 @@ Groff is used to "compile" man pages stored in groff or nroff format for different output devices, for example, displaying to a screen or in PostScript(tm) format for printing on a PostScript(tm) printer. Most -programs store their man pages in either /usr/share/man/ or -/usr/X11R6/man/. +programs store their man pages in either %{_mandir}/ or +%{_prefix}/X11R6/man/. %package -n gxditview Summary: Ditroff Output Displayer for Groff @@ -133,9 +131,9 @@ Requires: groff-full = %{version} # bnc#668254 Supplements: packageand(groff:xorg-x11-libX11) -Conflicts: jgxdview Provides: gxdview = %{version}-%{release} Obsoletes: gxdview < %{version} +Conflicts: jgxdview %description -n gxditview This version of xditview is called gxditview and has some extensions @@ -145,13 +143,6 @@ %endif #groff_base_only %prep -%if ! %{groff_base_only} -%if 0%{suse_version} > 1220 -# we do a verification on non-base package in order to not add more dependencies to Base:build ... -%gpg_verify %{SOURCE1} -%endif -%endif - %setup -q -n groff-%{version} %patch0 -p1 -b .debian %patch1 @@ -162,11 +153,9 @@ %patch6 -p1 -b .CVE-2009-5080 %patch7 -p1 %patch8 -p1 -b .locale -%patch9 -p1 -b .locale +%patch9 -p1 -b .locale2 %patch10 -p1 -b .force-locale - -#from patch7 -rm doc/groff.info-2.orig +%patch11 -b .multithread %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 @@ -175,37 +164,25 @@ GROFF_FONT_PATH=$PWD GROFF_TMAC_PATH=$PWD/tmac:$PWD/src/roff/troff export PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH -# -#libtoolize --force -#autoreconf --force --install -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIE" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIE" +export CFLAGS="%{optflags} -fno-strict-aliasing -fPIE" +export CXXFLAGS="%{optflags} -fno-strict-aliasing -fPIE" export LDFLAGS="-pie" -%{configure} \ +%configure \ --with-appresdir=%{_datadir}/X11/app-defaults \ --with-grofferdir=%{_libexecdir}/groff/groffer - -#ulimit -c unlimited make %{?_smp_mflags} -%if ! %{groff_base_only} -#pushd doc -# make %{?_smp_mflags} -# makeinfo groff.texinfo -#popd -%endif - %install %if %{groff_base_only} -install -d -m 0755 %{buildroot}%{_bindir} -install -d -m 0755 %{buildroot}%{_mandir}/man1 -install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/ -install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/font/ -install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ -install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ -install -d -m 0755 %{buildroot}%{_datadir}/%{name}/site-tmac/ + install -d -m 0755 %{buildroot}%{_bindir} + install -d -m 0755 %{buildroot}%{_mandir}/man1 + install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/ + install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/font/ + install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ + install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ + install -d -m 0755 %{buildroot}%{_datadir}/%{name}/site-tmac/ %else - %{makeinstall} docdir=%{_defaultdocdir}/groff + make DESTDIR=%{buildroot} install %{?_smp_mflags} docdir=%{_defaultdocdir}/groff %endif ### see Debian's groff-base.install.in ### @@ -230,10 +207,10 @@ done %if %{groff_base_only} -# datadir -install -m 0644 src/utils/indxbib/eign %{buildroot}%{_datadir}/%{name}/%{version}/ + # datadir + install -m 0644 src/utils/indxbib/eign %{buildroot}%{_datadir}/%{name}/%{version}/ %else -rm %{buildroot}%{_datadir}/groff/%{version}/eign + rm %{buildroot}%{_datadir}/groff/%{version}/eign %endif for FONT in devascii devlatin1 devps devutf8; do @@ -302,15 +279,15 @@ %if %{groff_base_only} -%{__ln_s} -f current %{buildroot}%{_datadir}/%{name}/%{version} +ln -s -f current %{buildroot}%{_datadir}/%{name}/%{version} # compat symlinks -%{__ln_s} -f eqn %{buildroot}%{_bindir}/geqn -%{__ln_s} -f tbl %{buildroot}%{_bindir}/gtbl +ln -s -f eqn %{buildroot}%{_bindir}/geqn +ln -s -f tbl %{buildroot}%{_bindir}/gtbl # install profiles to disable the use of ANSI colour sequences by default: -%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/profile.d -%{__install} -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/ +install -d -m 0755 %{buildroot}/%{_sysconfdir}/profile.d +install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/ %endif #groff_base_only @@ -339,6 +316,17 @@ %dir %{_datadir}/groff/%{version} %dir %{_libexecdir}/groff %doc %{_docdir}/groff +%dir %{_libdir}/groff +%dir %{_libdir}/groff/glilypond +%{_libdir}/groff/glilypond/args.pl +%{_libdir}/groff/glilypond/oop_fh.pl +%{_libdir}/groff/glilypond/subs.pl +%dir %{_libdir}/groff/gpinyin +%{_libdir}/groff/gpinyin/subs.pl +%{_libdir}/groff/groff_opts_no_arg.txt +%{_libdir}/groff/groff_opts_with_arg.txt +%dir %{_libdir}/groff/grog +%{_libdir}/groff/grog/subs.pl %exclude %{_docdir}/groff/html %exclude %{_docdir}/groff/examples %doc %{_infodir}/groff* @@ -346,6 +334,7 @@ %exclude %{_mandir}/man1/gxditview.1* %{_bindir}/* %exclude %{_bindir}/gxditview +%dir %{_datadir}/groff %{_datadir}/groff/%{version}/font %{_datadir}/groff/%{version}/oldfont %{_datadir}/groff/%{version}/pic ++++++ groff.spec ++++++ --- /var/tmp/diff_new_pack.OF1Sfw/_old 2015-02-06 10:53:01.000000000 +0100 +++ /var/tmp/diff_new_pack.OF1Sfw/_new 2015-02-06 10:53:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package groff # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,12 @@ %global groff_base_only 1 - +%if %{groff_base_only} Name: groff -Version: 1.22.2 +%else +Name: groff-full +%endif +Version: 1.22.3 Release: 0 Summary: GNU troff Document Formatting System License: BSD-3-Clause and GPL-2.0+ @@ -36,7 +39,9 @@ # done ##remove a part related to src/preproc/html/pre-html.cpp - see bnc#755533 # filterdiff -x 'src/preproc/html/pre-html.cpp' foo > groff_1.22.2-2.debian.diff -Patch0: groff_1.22.2-2.debian.diff +##remove Debian package string for openSUSE package string +##delete the papersize /etc settings patch +Patch0: groff_1.22.3-1.debian.diff Patch1: groff-1.20.1-destbufferoverflow.patch Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch Patch3: groff-1.21-groffer-libexecdir.patch @@ -54,43 +59,38 @@ # change the papersize definition to force the locale usage # it can be supressed by /etc/papersize if needed Patch10: groff-force-locale-usage.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-UPSTREAM fix build with multiple threads ; taken from upstream +Patch11: groff-multi-thread.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: gcc-c++ -%if 0%{suse_version} > 1220 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1220 BuildRequires: makeinfo %endif - %if %{groff_base_only} Recommends: groff-full %else BuildRequires: ghostscript-library -%if 0%{suse_version} > 1220 -BuildRequires: gpg-offline -%endif BuildRequires: groff BuildRequires: netpbm BuildRequires: psutils # for gxditview and X fontx BuildRequires: xorg-x11-devel - +# for pre-grohtml and pdfroff +Requires: ghostscript-library +# requires the -base package +Requires: groff = %{version} +Requires: netpbm +Requires: psutils +Requires(pre): %{install_info_prereq} Provides: jgroff = %{version}-%{release} Provides: normal-groff = %{version}-%{release} Obsoletes: jgroff < %{version} # X fonts were moved back Provides: groff-devx = %{version}-%{release} Obsoletes: groff-devx <= 1.21 -# requires the -base package -Requires: groff = %{version} -Requires(pre): %install_info_prereq -# for pre-grohtml and pdfroff -Requires: ghostscript-library -Requires: netpbm -Requires: psutils %endif - %if %{groff_base_only} %description The groff package is a stripped-down package containing the necessary @@ -100,7 +100,6 @@ install the groff-full package. %else #groff_base_only - %description The groff-full package provides aditional tools excluded from base groff package, like grohtml, X fonts et. all. @@ -108,8 +107,8 @@ Groff is used to "compile" man pages stored in groff or nroff format for different output devices, for example, displaying to a screen or in PostScript(tm) format for printing on a PostScript(tm) printer. Most -programs store their man pages in either /usr/share/man/ or -/usr/X11R6/man/. +programs store their man pages in either %{_mandir}/ or +%{_prefix}/X11R6/man/. %package -n groff-doc Summary: HTML documentation and examples for groff @@ -123,8 +122,8 @@ Groff is used to "compile" man pages stored in groff or nroff format for different output devices, for example, displaying to a screen or in PostScript(tm) format for printing on a PostScript(tm) printer. Most -programs store their man pages in either /usr/share/man/ or -/usr/X11R6/man/. +programs store their man pages in either %{_mandir}/ or +%{_prefix}/X11R6/man/. %package -n gxditview Summary: Ditroff Output Displayer for Groff @@ -132,9 +131,9 @@ Requires: groff-full = %{version} # bnc#668254 Supplements: packageand(groff:xorg-x11-libX11) -Conflicts: jgxdview Provides: gxdview = %{version}-%{release} Obsoletes: gxdview < %{version} +Conflicts: jgxdview %description -n gxditview This version of xditview is called gxditview and has some extensions @@ -144,13 +143,6 @@ %endif #groff_base_only %prep -%if ! %{groff_base_only} -%if 0%{suse_version} > 1220 -# we do a verification on non-base package in order to not add more dependencies to Base:build ... -%gpg_verify %{SOURCE1} -%endif -%endif - %setup -q -n groff-%{version} %patch0 -p1 -b .debian %patch1 @@ -161,11 +153,9 @@ %patch6 -p1 -b .CVE-2009-5080 %patch7 -p1 %patch8 -p1 -b .locale -%patch9 -p1 -b .locale +%patch9 -p1 -b .locale2 %patch10 -p1 -b .force-locale - -#from patch7 -rm doc/groff.info-2.orig +%patch11 -b .multithread %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 @@ -174,37 +164,25 @@ GROFF_FONT_PATH=$PWD GROFF_TMAC_PATH=$PWD/tmac:$PWD/src/roff/troff export PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH -# -#libtoolize --force -#autoreconf --force --install -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIE" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIE" +export CFLAGS="%{optflags} -fno-strict-aliasing -fPIE" +export CXXFLAGS="%{optflags} -fno-strict-aliasing -fPIE" export LDFLAGS="-pie" -%{configure} \ +%configure \ --with-appresdir=%{_datadir}/X11/app-defaults \ --with-grofferdir=%{_libexecdir}/groff/groffer - -#ulimit -c unlimited make %{?_smp_mflags} -%if ! %{groff_base_only} -#pushd doc -# make %{?_smp_mflags} -# makeinfo groff.texinfo -#popd -%endif - %install %if %{groff_base_only} -install -d -m 0755 %{buildroot}%{_bindir} -install -d -m 0755 %{buildroot}%{_mandir}/man1 -install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/ -install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/font/ -install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ -install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ -install -d -m 0755 %{buildroot}%{_datadir}/%{name}/site-tmac/ + install -d -m 0755 %{buildroot}%{_bindir} + install -d -m 0755 %{buildroot}%{_mandir}/man1 + install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/ + install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/font/ + install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ + install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ + install -d -m 0755 %{buildroot}%{_datadir}/%{name}/site-tmac/ %else - %{makeinstall} docdir=%{_defaultdocdir}/groff + make DESTDIR=%{buildroot} install %{?_smp_mflags} docdir=%{_defaultdocdir}/groff %endif ### see Debian's groff-base.install.in ### @@ -229,10 +207,10 @@ done %if %{groff_base_only} -# datadir -install -m 0644 src/utils/indxbib/eign %{buildroot}%{_datadir}/%{name}/%{version}/ + # datadir + install -m 0644 src/utils/indxbib/eign %{buildroot}%{_datadir}/%{name}/%{version}/ %else -rm %{buildroot}%{_datadir}/groff/%{version}/eign + rm %{buildroot}%{_datadir}/groff/%{version}/eign %endif for FONT in devascii devlatin1 devps devutf8; do @@ -301,15 +279,15 @@ %if %{groff_base_only} -%{__ln_s} -f current %{buildroot}%{_datadir}/%{name}/%{version} +ln -s -f current %{buildroot}%{_datadir}/%{name}/%{version} # compat symlinks -%{__ln_s} -f eqn %{buildroot}%{_bindir}/geqn -%{__ln_s} -f tbl %{buildroot}%{_bindir}/gtbl +ln -s -f eqn %{buildroot}%{_bindir}/geqn +ln -s -f tbl %{buildroot}%{_bindir}/gtbl # install profiles to disable the use of ANSI colour sequences by default: -%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/profile.d -%{__install} -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/ +install -d -m 0755 %{buildroot}/%{_sysconfdir}/profile.d +install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/ %endif #groff_base_only @@ -338,6 +316,17 @@ %dir %{_datadir}/groff/%{version} %dir %{_libexecdir}/groff %doc %{_docdir}/groff +%dir %{_libdir}/groff +%dir %{_libdir}/groff/glilypond +%{_libdir}/groff/glilypond/args.pl +%{_libdir}/groff/glilypond/oop_fh.pl +%{_libdir}/groff/glilypond/subs.pl +%dir %{_libdir}/groff/gpinyin +%{_libdir}/groff/gpinyin/subs.pl +%{_libdir}/groff/groff_opts_no_arg.txt +%{_libdir}/groff/groff_opts_with_arg.txt +%dir %{_libdir}/groff/grog +%{_libdir}/groff/grog/subs.pl %exclude %{_docdir}/groff/html %exclude %{_docdir}/groff/examples %doc %{_infodir}/groff* @@ -345,6 +334,7 @@ %exclude %{_mandir}/man1/gxditview.1* %{_bindir}/* %exclude %{_bindir}/gxditview +%dir %{_datadir}/groff %{_datadir}/groff/%{version}/font %{_datadir}/groff/%{version}/oldfont %{_datadir}/groff/%{version}/pic ++++++ groff-1.21-CVE-2009-5081.patch ++++++ --- /var/tmp/diff_new_pack.OF1Sfw/_old 2015-02-06 10:53:01.000000000 +0100 +++ /var/tmp/diff_new_pack.OF1Sfw/_new 2015-02-06 10:53:01.000000000 +0100 @@ -1,60 +1,17 @@ -Index: groff-1.21/contrib/groffer/perl/groffer.pl +Index: groff-1.22.3/contrib/pdfmark/pdfroff.man =================================================================== ---- groff-1.21.orig/contrib/groffer/perl/groffer.pl 2010-12-31 08:33:09.000000000 +0100 -+++ groff-1.21/contrib/groffer/perl/groffer.pl 2011-09-22 14:23:55.756494935 +0200 -@@ -1380,7 +1380,7 @@ - ######################################################################## - - sub main_temp { -- my $template = 'groffer_' . "$$" . '_XXXX'; -+ my $template = 'groffer_' . "$$" . '_XXXXXXXXXX'; - foreach ($ENV{'GROFF_TMPDIR'}, $ENV{'TMPDIR'}, $ENV{'TMP'}, $ENV{'TEMP'}, - $ENV{'TEMPDIR'}, File::Spec->catfile($ENV{'HOME'}, 'tmp')) { - if ($_ && -d $_ && -w $_) { -@@ -1411,12 +1411,12 @@ - - # further argument: SUFFIX => '.sh' - if ($Debug{'KEEP'}) { -- ($fh_cat, $tmp_cat) = tempfile(',cat_XXXX', DIR => $tmpdir); -- ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXX', DIR => $tmpdir); -+ ($fh_cat, $tmp_cat) = tempfile(',cat_XXXXXXXXXX', DIR => $tmpdir); -+ ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXXXXXXXX', DIR => $tmpdir); - } else { -- ($fh_cat, $tmp_cat) = tempfile(',cat_XXXX', UNLINK => 1, -+ ($fh_cat, $tmp_cat) = tempfile(',cat_XXXXXXXXXX', UNLINK => 1, - DIR => $tmpdir); -- ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXX', UNLINK => 1, -+ ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXXXXXXXX', UNLINK => 1, - DIR => $tmpdir); - } - } # main_temp() -Index: groff-1.21/contrib/groffer/perl/roff2.pl -=================================================================== ---- groff-1.21.orig/contrib/groffer/perl/roff2.pl 2010-12-31 08:33:09.000000000 +0100 -+++ groff-1.21/contrib/groffer/perl/roff2.pl 2011-09-22 14:23:55.783495865 +0200 -@@ -124,7 +124,7 @@ - last; - } - } -- my $template = $Name . '_XXXX'; -+ my $template = $Name . '_XXXXXXXXXX'; - my ($fh, $stdin); - if ($tempdir) { - ($fh, $stdin) = tempfile($template, UNLINK => 1, DIR => $tempdir) || -Index: groff-1.21/contrib/pdfmark/pdfroff.man -=================================================================== ---- groff-1.21.orig/contrib/pdfmark/pdfroff.man 2011-09-22 14:15:22.000000000 +0200 -+++ groff-1.21/contrib/pdfmark/pdfroff.man 2011-09-22 14:23:55.792496177 +0200 -@@ -529,7 +529,7 @@ +--- groff-1.22.3.orig/contrib/pdfmark/pdfroff.man ++++ groff-1.22.3/contrib/pdfmark/pdfroff.man +@@ -555,7 +555,7 @@ defaults to .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 @@ +@@ -568,7 +568,8 @@ and .B TEMP are considered in turn, as possible temporary file repositories. If none of these are set, then temporary files are created @@ -64,11 +21,11 @@ . .TP .B GROFF_GHOSTSCRIPT_INTERPRETER -Index: groff-1.21/doc/fixinfo.sh +Index: groff-1.22.3/doc/fixinfo.sh =================================================================== ---- groff-1.21.orig/doc/fixinfo.sh 2010-12-31 08:33:09.000000000 +0100 -+++ groff-1.21/doc/fixinfo.sh 2011-09-22 14:23:55.795496280 +0200 -@@ -21,7 +21,9 @@ +--- groff-1.22.3.orig/doc/fixinfo.sh ++++ groff-1.22.3/doc/fixinfo.sh +@@ -22,7 +22,9 @@ # groff.texinfo macro code. Hopefully, a new texinfo version makes it # unnecessary. @@ -79,12 +36,12 @@ cat $1 | sed ' 1 { -Index: groff-1.21/doc/groff.info-2 +Index: groff-1.22.3/doc/groff.info-2 =================================================================== ---- groff-1.21.orig/doc/groff.info-2 2010-12-31 08:33:12.000000000 +0100 -+++ groff-1.21/doc/groff.info-2 2011-09-22 14:23:55.798496383 +0200 -@@ -1918,9 +1918,9 @@ - +--- groff-1.22.3.orig/doc/groff.info-2 ++++ groff-1.22.3/doc/groff.info-2 +@@ -1697,9 +1697,9 @@ not there, 'groff' would not know when t + 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[$$] @@ -95,12 +52,12 @@ + .sy rm timefile\n[$$] \nH:\nM:\nS - Note that this works by having the `perl' script (run by `sy') -Index: groff-1.21/doc/groff.texinfo + Note that this works by having the 'perl' script (run by 'sy') +Index: groff-1.22.3/doc/groff.texinfo =================================================================== ---- groff-1.21.orig/doc/groff.texinfo 2010-12-31 08:33:09.000000000 +0100 -+++ groff-1.21/doc/groff.texinfo 2011-09-22 14:23:55.803496556 +0200 -@@ -13568,9 +13568,9 @@ +--- groff-1.22.3.orig/doc/groff.texinfo ++++ groff-1.22.3/doc/groff.texinfo +@@ -13736,9 +13736,9 @@ into a document: @pindex perl @Example .sy perl -e 'printf ".nr H %d\\n.nr M %d\\n.nr S %d\\n",\ @@ -113,11 +70,11 @@ \nH:\nM:\nS @endExample -Index: groff-1.21/gendef.sh +Index: groff-1.22.3/gendef.sh =================================================================== ---- groff-1.21.orig/gendef.sh 2010-12-31 08:33:08.000000000 +0100 -+++ groff-1.21/gendef.sh 2011-09-22 14:23:55.804496590 +0200 -@@ -34,11 +34,9 @@ +--- groff-1.22.3.orig/gendef.sh ++++ groff-1.22.3/gendef.sh +@@ -33,11 +33,9 @@ do #define $def" done @@ -132,7 +89,7 @@ sed -e 's/=/ /' >$t <<EOF $defs -@@ -46,8 +44,6 @@ +@@ -45,8 +43,6 @@ EOF test -r $file && cmp -s $t $file || cp $t $file @@ -141,11 +98,11 @@ exit 0 # eof -Index: groff-1.21/src/roff/groff/pipeline.c +Index: groff-1.22.3/src/roff/groff/pipeline.c =================================================================== ---- groff-1.21.orig/src/roff/groff/pipeline.c 2010-12-31 08:33:08.000000000 +0100 -+++ groff-1.21/src/roff/groff/pipeline.c 2011-09-22 14:23:55.804496590 +0200 -@@ -378,6 +378,7 @@ +--- groff-1.22.3.orig/src/roff/groff/pipeline.c ++++ groff-1.22.3/src/roff/groff/pipeline.c +@@ -376,6 +376,7 @@ int run_pipeline(int ncommands, char *** /* Don't use `tmpnam' here: Microsoft's implementation yields unusable file names if current directory is on network share with read-only root. */ @@ -153,3 +110,46 @@ tmpfiles[0] = tempnam(tmpdir, NULL); tmpfiles[1] = tempnam(tmpdir, NULL); +Index: groff-1.22.3/contrib/groffer/main_subs.pl +=================================================================== +--- groff-1.22.3.orig/contrib/groffer/main_subs.pl ++++ groff-1.22.3/contrib/groffer/main_subs.pl +@@ -1239,7 +1239,7 @@ sub main_temp { + our $fh_stdin; + our $tmp_cat; + our $tmp_stdin; +- my $template = 'groffer_' . "$$" . '_XXXX'; ++ my $template = 'groffer_' . "$$" . '_XXXXXXXXXX'; + 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 { + + # further argument: SUFFIX => '.sh' + if ($Debug{'KEEP'}) { +- ($fh_cat, $tmp_cat) = tempfile(',cat_XXXX', DIR => $tmpdir); +- ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXX', DIR => $tmpdir); ++ ($fh_cat, $tmp_cat) = tempfile(',cat_XXXXXXXXXX', DIR => $tmpdir); ++ ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXXXXXXXX', DIR => $tmpdir); + } else { +- ($fh_cat, $tmp_cat) = tempfile(',cat_XXXX', UNLINK => 1, ++ ($fh_cat, $tmp_cat) = tempfile(',cat_XXXXXXXXXX', UNLINK => 1, + DIR => $tmpdir); +- ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXX', UNLINK => 1, ++ ($fh_stdin, $tmp_stdin) = tempfile(',stdin_XXXXXXXXXX', UNLINK => 1, + DIR => $tmpdir); + } + } # main_temp() +Index: groff-1.22.3/contrib/groffer/roff2.pl +=================================================================== +--- groff-1.22.3.orig/contrib/groffer/roff2.pl ++++ groff-1.22.3/contrib/groffer/roff2.pl +@@ -123,7 +123,7 @@ if ($Has_Groffer) { + last; + } + } +- my $template = $Name . '_XXXX'; ++ my $template = $Name . '_XXXXXXXXXX'; + my ($fh, $stdin); + if ($tempdir) { + ($fh, $stdin) = tempfile($template, UNLINK => 1, DIR => $tempdir) || ++++++ groff-1.21-groffer-libexecdir.patch ++++++ --- /var/tmp/diff_new_pack.OF1Sfw/_old 2015-02-06 10:53:01.000000000 +0100 +++ /var/tmp/diff_new_pack.OF1Sfw/_new 2015-02-06 10:53:01.000000000 +0100 @@ -1,30 +1,32 @@ -Index: groff-1.22.2/contrib/groffer/Makefile.sub +Index: groff-1.22.3/contrib/groffer/Makefile.sub =================================================================== ---- groff-1.22.2.orig/contrib/groffer/Makefile.sub -+++ groff-1.22.2/contrib/groffer/Makefile.sub -@@ -73,7 +73,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL - sed -f "$(SH_DEPS_SED_SCRIPT)" \ - -e "s|@g@|$(g)|g" \ +--- groff-1.22.3.orig/contrib/groffer/Makefile.sub ++++ groff-1.22.3/contrib/groffer/Makefile.sub +@@ -57,7 +57,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_REST) + sed -f "$(SH_DEPS_SED_SCRIPT)" \ + -e "s|@g@|$(g)|g" \ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ - -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ + -e "s|@libexecdir@|$(DESTDIR)$(libexecdir)|g" \ -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \ -e "s|@VERSION@|$(version)$(revision)|g" \ -e "$(SH_SCRIPT_SED_CMD)" \ -@@ -138,7 +138,7 @@ uninstall_sub: - for f in $(GROFFER_PERL_) $(GROFFER_SHELL_) version.sh; do \ - $(RM) $(DESTDIR)$(groffer_dir)/$$f; \ - done -- -rmdir $(DESTDIR)$(libdir)/groff/groffer -+ -rmdir $(DESTDIR)$(libexecdir)/groff/groffer +@@ -96,8 +96,8 @@ uninstall_sub: + -for f in $(GROFFER_PERL) version.sh; do \ + $(RM) $(DESTDIR)$(groffer_dir)/$$f;\ + done +- -test -d $(DESTDIR)$(libdir)/groff/groffer && \ +- rmdir $(DESTDIR)$(libdir)/groff/groffer ++ -test -d $(DESTDIR)$(libexecdir)/groff/groffer && \ ++ rmdir $(DESTDIR)$(libexecdir)/groff/groffer + ######################################################################## - # Emacs settings -Index: groff-1.22.2/Makefile.in +Index: groff-1.22.3/Makefile.in =================================================================== ---- groff-1.22.2.orig/Makefile.in -+++ groff-1.22.2/Makefile.in -@@ -139,6 +139,9 @@ bindir=@bindir@ +--- groff-1.22.3.orig/Makefile.in ++++ groff-1.22.3/Makefile.in +@@ -138,6 +138,9 @@ bindir=@bindir@ libdir=@libdir@ libprogramdir=$(libdir)/groff @@ -34,7 +36,7 @@ # `datasubdir' says where to install platform-independent data files. datadir=@datadir@ datarootdir=@datarootdir@ -@@ -811,7 +814,7 @@ $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): +@@ -907,7 +910,7 @@ $(INCDIRS) $(PROGDEPDIRS) $(SHPROGDIRS) fi; \ test -d $@ || $(mkinstalldirs) $@; \ cd $@; \ ++++++ groff-1.22.2.tar.gz -> groff-1.22.3.tar.gz ++++++ ++++ 156005 lines of diff (skipped) ++++++ groff-force-locale-usage.patch ++++++ --- /var/tmp/diff_new_pack.OF1Sfw/_old 2015-02-06 10:53:02.000000000 +0100 +++ /var/tmp/diff_new_pack.OF1Sfw/_new 2015-02-06 10:53:02.000000000 +0100 @@ -1,63 +1,64 @@ -Index: groff-1.21/font/devdvi/Makefile.sub +Index: groff-1.22.3/font/devdvi/Makefile.sub =================================================================== ---- groff-1.21.orig/font/devdvi/Makefile.sub 2011-09-29 10:18:51.000000000 +0200 -+++ groff-1.21/font/devdvi/Makefile.sub 2011-09-29 10:20:09.299489369 +0200 -@@ -16,8 +16,8 @@ +--- groff-1.22.3.orig/font/devdvi/Makefile.sub ++++ groff-1.22.3/font/devdvi/Makefile.sub +@@ -43,9 +43,9 @@ MOSTLYCLEANADD=DESC DESC: DESC.in cat $(srcdir)/DESC.in >DESC if test "$(PAGE)" = A4; then \ -- echo "papersize /etc/papersize a4" >>DESC; \ -+ echo "papersize /etc/papersize locale a4" >>DESC; \ +- echo "papersize a4" >>DESC; \ ++ echo "papersize locale a4" >>DESC; \ else \ -- echo "papersize /etc/papersize letter" >>DESC; \ -+ echo "papersize /etc/papersize locale letter" >>DESC; \ +- echo "papersize letter" >>DESC; \ ++ echo "papersize locale letter" >>DESC; \ fi test -z '$(DVIPRINT)' || echo print '$(DVIPRINT)' >>DESC -Index: groff-1.21/font/devlbp/Makefile.sub + +Index: groff-1.22.3/font/devlbp/Makefile.sub =================================================================== ---- groff-1.21.orig/font/devlbp/Makefile.sub 2011-09-29 10:18:51.000000000 +0200 -+++ groff-1.21/font/devlbp/Makefile.sub 2011-09-29 10:20:25.060031676 +0200 -@@ -13,9 +13,9 @@ - -rm -f DESC - cat $(srcdir)/DESC.in >>DESC +--- groff-1.22.3.orig/font/devlbp/Makefile.sub ++++ groff-1.22.3/font/devlbp/Makefile.sub +@@ -39,9 +39,9 @@ MOSTLYCLEANADD=DESC + DESC: DESC.in + cat $(srcdir)/DESC.in >DESC if test "$(PAGE)" = A4; then \ -- echo "papersize /etc/papersize a4" >>DESC; \ -+ echo "papersize /etc/papersize locale a4" >>DESC; \ +- echo "papersize a4" >>DESC; \ ++ echo "papersize locale a4" >>DESC; \ else \ -- echo "papersize /etc/papersize letter" >>DESC; \ -+ echo "papersize /etc/papersize locale letter" >>DESC; \ +- echo "papersize letter" >>DESC; \ ++ echo "papersize locale letter" >>DESC; \ fi test -z '$(LBPPRINT)' || echo print '$(LBPPRINT)' >>DESC -Index: groff-1.21/font/devlj4/Makefile.sub +Index: groff-1.22.3/font/devlj4/Makefile.sub =================================================================== ---- groff-1.21.orig/font/devlj4/Makefile.sub 2011-09-29 10:18:51.000000000 +0200 -+++ groff-1.21/font/devlj4/Makefile.sub 2011-09-29 10:20:35.332386890 +0200 -@@ -30,9 +30,9 @@ +--- groff-1.22.3.orig/font/devlj4/Makefile.sub ++++ groff-1.22.3/font/devlj4/Makefile.sub +@@ -58,9 +58,9 @@ DESC: DESC.in echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>DESC cat $(srcdir)/DESC.in >>DESC if test "$(PAGE)" = A4; then \ -- echo "papersize /etc/papersize a4" >>DESC; \ -+ echo "papersize /etc/papersize locale a4" >>DESC; \ +- echo "papersize a4" >>DESC; \ ++ echo "papersize locale a4" >>DESC; \ else \ -- echo "papersize /etc/papersize letter" >>DESC; \ -+ echo "papersize /etc/papersize locale letter" >>DESC; \ +- echo "papersize letter" >>DESC; \ ++ echo "papersize locale letter" >>DESC; \ fi test -z '$(LJ4PRINT)' || echo print '$(LJ4PRINT)' >>DESC -Index: groff-1.21/font/devps/Makefile.sub +Index: groff-1.22.3/font/devps/Makefile.sub =================================================================== ---- groff-1.21.orig/font/devps/Makefile.sub 2011-09-29 10:18:51.000000000 +0200 -+++ groff-1.21/font/devps/Makefile.sub 2011-09-29 10:20:45.194727208 +0200 -@@ -40,9 +40,9 @@ +--- groff-1.22.3.orig/font/devps/Makefile.sub ++++ groff-1.22.3/font/devps/Makefile.sub +@@ -65,9 +65,9 @@ DESC: DESC.in cat $(srcdir)/DESC.in >DESC echo broken $(BROKEN_SPOOLER_FLAGS) >>DESC if test "$(PAGE)" = A4; then \ -- echo "papersize /etc/papersize a4" >>DESC; \ -+ echo "papersize /etc/papersize locale a4" >>DESC; \ +- echo "papersize a4" >>DESC; \ ++ echo "papersize locale a4" >>DESC; \ else \ -- echo "papersize /etc/papersize letter" >>DESC; \ -+ echo "papersize /etc/papersize locale letter" >>DESC; \ +- echo "papersize letter" >>DESC; \ ++ echo "papersize locale letter" >>DESC; \ fi test -z '$(PSPRINT)' || echo print '$(PSPRINT)' >>DESC ++++++ groff-multi-thread.patch ++++++ Index: Makefile.in =================================================================== --- Makefile.in.orig +++ Makefile.in @@ -903,6 +903,8 @@ $(GNULIBDIRS): FORCE $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \ esac +$(SHPROGDIRS): $(PROGDEPDIRS) + $(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(SHPROGDIRS) $(INCDIRS) $(PROGDEPDIRS) $(SHPROGDIRS) $(OTHERDIRS): FORCE ++++++ groff_1.22.2-2.debian.diff -> groff_1.22.3-1.debian.diff ++++++ ++++ 904 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/groff/groff_1.22.2-2.debian.diff ++++ and /work/SRC/openSUSE:Factory/.groff.new/groff_1.22.3-1.debian.diff -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
