Hello community,
here is the log from the commit of package a2ps for openSUSE:Factory checked in at 2014-12-16 14:47:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/a2ps (Old)
and /work/SRC/openSUSE:Factory/.a2ps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "a2ps"
Changes:
--------
--- /work/SRC/openSUSE:Factory/a2ps/a2ps.changes 2014-06-25 21:20:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.a2ps.new/a2ps.changes 2014-12-16 14:47:11.000000000 +0100
@@ -1,0 +2,52 @@
+Mon Nov 10 17:00:14 UTC 2014 - sfalken@opensuse.org
+
+- Removed pkgconfig entries from Requires: section, per OBS
+ request 243897
+
+-------------------------------------------------------------------
+Thu Oct 2 02:29:06 UTC 2014 - crrodriguez@opensuse.org
+
+- Do not buildrequire xorg-x11-devel, never used.
+
+-------------------------------------------------------------------
+Wed Sep 17 14:22:42 UTC 2014 - sfalken@opensuse.org
+
+- Fixed license in .spec file to reflect upstream changing to GPLv3
+ (sr#248177)
+
+-------------------------------------------------------------------
+Wed Aug 20 02:27:55 UTC 2014 - sfalken@opensuse.org
+
+- Updated to 4.14
+ * No UTF-8 Support yet, Basically a maintenance release.
+ * GNU a2ps is now licensed under GPLv3 or later
+ * Can now be built with Modern GNU Autotools, and gcc>=3.4
+ * Numerous minor bugfixes, including:
+ * input buffer overflow
+ * IA64, PPC, and AMD64 fixes
+ * Several security issues (CVE-2004-1377)
+ * Addition of a number of new stylesheets
+ * Translations for Japanese, Dutch, and French added/updated
+- Patches rebased for 4.14 sources
+ * Added:
+ a2ps-4.14-acroread.patch
+ a2ps-4.14-linker.patch
+ a2ps-4.14-ogonkify.patch
+ a2ps-4.14-tempfile.patch
+ a2ps-4.14.diff
+ * Deleted:
+ a2ps-4.13-acroread.patch
+ a2ps-4.13-linker.patch
+ a2ps-4.13-ogonkify.patch
+ a2ps-4.13-tempfile.patch
+ a2ps-4.13.dif
+ a2ps-4.13-gv-arguments.patch
+ a2ps-4.13-nb.patch
+ a2ps-4.13-space.patch
+ * Modified:
+ CVE-2014-0466.diff
+- Deleted a2ps-4.13.tar.gz, replaced with a2ps-4.14.tar.gz
+- a2ps.spec cleanup, and updating to work with new sources.
+
+
+-------------------------------------------------------------------
Old:
----
a2ps-4.13-acroread.patch
a2ps-4.13-gv-arguments.patch
a2ps-4.13-linker.patch
a2ps-4.13-nb.patch
a2ps-4.13-ogonkify.patch
a2ps-4.13-space.patch
a2ps-4.13-tempfile.patch
a2ps-4.13.dif
a2ps-4.13b.tar.gz
New:
----
a2ps-4.14-acroread.patch
a2ps-4.14-linker.patch
a2ps-4.14-ogonkify.patch
a2ps-4.14-tempfile.patch
a2ps-4.14.diff
a2ps-4.14.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ a2ps.spec ++++++
--- /var/tmp/diff_new_pack.OEODS8/_old 2014-12-16 14:47:12.000000000 +0100
+++ /var/tmp/diff_new_pack.OEODS8/_new 2014-12-16 14:47:12.000000000 +0100
@@ -25,43 +25,40 @@
BuildRequires: gv
BuildRequires: psutils
BuildRequires: texlive-latex
-BuildRequires: xorg-x11-devel
%if %suse_version > 1220
+BuildRequires: gperf
BuildRequires: makeinfo
BuildRequires: texinfo
%endif
Url: http://www.gnu.org/software/a2ps/a2ps.html
Provides: a2ps-bin
-Requires: /bin/sed
-Requires: /usr/bin/file
-Requires: /usr/bin/iconv
-Requires: /usr/bin/w3m
-Requires: /usr/bin/wdiff
+Requires: file
Requires: ghostscript-fonts-std
+Requires: glibc
+Requires: sed
+Requires: w3m
+Requires: wdiff
Suggests: acroread gv ImageMagick psutils texinfo texlive-latex
PreReq: %{install_info_prereq}
-Version: 4.13
+Version: 4.14
Release: 0
Summary: Converts ASCII Text into PostScript
-License: GPL-2.0+
+License: GPL-3.0+
Group: Productivity/Publishing/PS
-Source: http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}b.tar.gz
+Source: http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz
Source1: a2ps-ko.po
Source2: a2ps-open
-Patch: a2ps-4.13.dif
+Patch: a2ps-4.14.diff
Patch1: a2ps-4.13-security.patch
-Patch2: a2ps-4.13-ogonkify.patch
-Patch3: a2ps-4.13-tempfile.patch
-Patch4: a2ps-4.13-space.patch
-Patch5: a2ps-4.13-nb.patch
+Patch2: a2ps-4.14-ogonkify.patch
+Patch3: a2ps-4.14-tempfile.patch
Patch6: a2ps-4.13-include.patch
-Patch7: a2ps-4.13-acroread.patch
+Patch7: a2ps-4.14-acroread.patch
Patch8: a2ps-4.13-base.patch
Patch9: a2ps-4.13-utf8.patch
Patch10: a2ps-4.13-types.patch
Patch11: a2ps-4.13-psgen.patch
-Patch12: a2ps-4.13-gv-arguments.patch
-Patch13: a2ps-4.13-linker.patch
+Patch13: a2ps-4.14-linker.patch
# PATCH-FIX-USTREAM Bug 871097 - CVE-2014-0466: a2ps: fixps does not use -dSAFER
Patch14: CVE-2014-0466.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -90,27 +87,23 @@
latin encodings are supported.
%prep
-%setup -q -n a2ps-4.13
+%setup -q -n a2ps-4.14
touch -r configure.in .ref
%patch -P 1 -p 0 -b .security
-%patch -P 2 -p 0 -b .ogonkify
-%patch -P 3 -p 1 -b .tempfile
-%patch -P 4 -p 0 -b .space
-%patch -P 5 -p 0 -b .nb
+%patch2 -p1
+%patch3 -p1
%patch -P 6 -p 1 -b .incld
%ifarch %ix86 x86_64
-%patch -P 7 -p 0 -b .acroread
+%patch7 -p1
%endif
%patch -P 8 -p 0 -b .base
%patch -P 9 -p 0 -b .utf8
%patch -P 10 -p 0 -b .types
%patch -P 11 -p 0 -b .psgen
-%patch -P 12 -p 1 -b .gvarg
-%patch -P 13 -p 0 -b .ldso
-%patch -P 14 -p 1 -b .cve140466
-%patch
+%patch13 -p1
+%patch14 -p1
+%patch -p1
cp -f %SOURCE1 po/ko.po
-rename no nb po/no.*
%build
#XXX: ugly hack; necessary??
@@ -118,7 +111,6 @@
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -funroll-loops -Wall -pipe -fstack-protector"
export LPR=lpr
export CC=gcc
- export LEX="flex -Cfe"
touch -r .ref configure.in
%configure --enable-shared --disable-static --with-pic --with-medium=LC_PAPER \
--with-encoding=LC_CTYPE
@@ -156,8 +148,8 @@
%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ABOUT-NLS FAQ ChangeLog NEWS THANKS README doc/a2ps.html
-%config /etc/a2ps-site.cfg
-%config /etc/a2ps.cfg
+%config %{_sysconfdir}/a2ps-site.cfg
+%config %{_sysconfdir}/a2ps.cfg
%{_bindir}/a2ps
%{_bindir}/a2ps-open
%{_bindir}/card
++++++ CVE-2014-0466.diff ++++++
--- /var/tmp/diff_new_pack.OEODS8/_old 2014-12-16 14:47:12.000000000 +0100
+++ /var/tmp/diff_new_pack.OEODS8/_new 2014-12-16 14:47:12.000000000 +0100
@@ -6,25 +6,27 @@
Author: Salvatore Bonaccorso
Last-Update: 2014-03-28
---- a/contrib/fixps.in
-+++ b/contrib/fixps.in
-@@ -389,7 +389,7 @@
+diff -rupN a2ps-4.14.old/contrib/fixps.in a2ps-4.14/contrib/fixps.in
+--- a2ps-4.14.old/contrib/fixps.in 2007-12-28 19:29:01.000000000 -0800
++++ a2ps-4.14/contrib/fixps.in 2014-08-06 21:11:17.114518845 -0700
+@@ -389,7 +389,7 @@ if test $task != check; then
eval "$command" ;;
gs)
$verbose "$program: making a full rewrite of the file ($gs)." >&2
-- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f "$file" ;;
-+ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f "$file" ;;
+- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
++ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
esac
)
fi
---- a/contrib/fixps.m4
-+++ b/contrib/fixps.m4
-@@ -307,7 +307,7 @@
+diff -rupN a2ps-4.14.old/contrib/fixps.m4 a2ps-4.14/contrib/fixps.m4
+--- a2ps-4.14.old/contrib/fixps.m4 2007-12-28 18:11:47.000000000 -0800
++++ a2ps-4.14/contrib/fixps.m4 2014-08-06 21:11:40.529942880 -0700
+@@ -307,7 +307,7 @@ if test $task != check; then
eval "$command" ;;
gs)
$verbose "$program: making a full rewrite of the file ($gs)." >&2
-- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f "$file" ;;
-+ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f "$file" ;;
+- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
++ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
esac
)
fi
++++++ a2ps-4.13-acroread.patch -> a2ps-4.14-acroread.patch ++++++
--- /work/SRC/openSUSE:Factory/a2ps/a2ps-4.13-acroread.patch 2011-09-23 01:51:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.a2ps.new/a2ps-4.14-acroread.patch 2014-12-16 14:47:11.000000000 +0100
@@ -1,22 +1,24 @@
---- configure.in~ 2000-02-24 18:53:03.000000000 +0100
-+++ configure.in 2006-05-19 12:31:53.000000000 +0200
-@@ -312,6 +312,8 @@
+diff -rupN a2ps-4.14.old/configure a2ps-4.14/configure
+--- a2ps-4.14.old/configure 2007-12-28 19:28:03.000000000 -0800
++++ a2ps-4.14/configure 2014-08-06 20:54:27.423260701 -0700
+@@ -32078,6 +32078,8 @@ echo "${ECHO_T}$a2_cv_com_acroread4" >&6
test "$a2_cv_com_acroread4" = yes && COM_acroread4=''
fi
+COM_acroread4=''
+
# Outputting PDF
- ad_CHECK_PROGS((distill, ps2pdf))
- test "$COM_distill$COM_ps2pdf" = "##" && COM_PS2PDF="#"
---- configure~ 2006-04-27 16:01:24.000000000 +0200
-+++ configure 2006-04-27 16:01:24.000000000 +0200
-@@ -9390,6 +9390,8 @@
+ if test "$enable_paths" = "no"; then
+ # Extract the first word of "distill", so it can be a program name with args.
+diff -rupN a2ps-4.14.old/configure.in a2ps-4.14/configure.in
+--- a2ps-4.14.old/configure.in 2007-05-01 21:35:49.000000000 -0700
++++ a2ps-4.14/configure.in 2014-08-06 20:52:42.219361561 -0700
+@@ -337,6 +337,8 @@ if test "x$COM_acroread" = x; then
test "$a2_cv_com_acroread4" = yes && COM_acroread4=''
fi
+COM_acroread4=''
+
# Outputting PDF
- if test "$enable_paths" = "no"; then
- # Extract the first word of "distill", so it can be a program name with args.
+ ad_CHECK_PROGS([distill, ps2pdf])
+ test "$COM_distill$COM_ps2pdf" = "##" && COM_PS2PDF="#"
++++++ a2ps-4.13-linker.patch -> a2ps-4.14-linker.patch ++++++
--- /work/SRC/openSUSE:Factory/a2ps/a2ps-4.13-linker.patch 2013-12-10 17:41:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.a2ps.new/a2ps-4.14-linker.patch 2014-12-16 14:47:11.000000000 +0100
@@ -1,53 +1,19 @@
---- auxdir/ltconfig
-+++ auxdir/ltconfig 2012-02-21 12:20:09.366433998 +0000
-@@ -1966,19 +1966,8 @@ linux-gnu*)
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
-- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-- file_magic_cmd=/usr/bin/file
-- file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
--
-- if test -f /lib/ld.so.1; then
-- dynamic_linker='GNU ld.so'
-- else
-- # Only the GNU ld.so supports shared libraries on MkLinux.
-- case "$host_cpu" in
-- powerpc*) dynamic_linker=no ;;
-- *) dynamic_linker='Linux ld.so' ;;
-- esac
-- fi
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU/Linux ld.so'
- ;;
-
- netbsd*)
---- auxdir/ltmain.sh
-+++ auxdir/ltmain.sh 2013-12-09 13:50:04.722735821 +0000
-@@ -1982,11 +1982,12 @@ EOF
- echo
+diff -rupN a2ps-4.14.old/auxdir/ltmain.sh a2ps-4.14/auxdir/ltmain.sh
+--- a2ps-4.14.old/auxdir/ltmain.sh 2007-11-27 13:23:09.000000000 -0800
++++ a2ps-4.14/auxdir/ltmain.sh 2014-08-06 21:06:38.888482449 -0700
+@@ -3792,11 +3792,12 @@ EOF
+ $echo
if test "X$deplibs_check_method" = "Xnone"; then
- echo "*** Warning: inter-library dependencies are not supported in this platform."
-+ echo "*** All declared inter-library dependencies are being dropped."
+ $echo "*** Warning: inter-library dependencies are not supported in this platform."
++ $echo "*** All declared inter-library dependencies are being dropped."
+ droppeddeps=yes
else
-- echo "*** Warning: inter-library dependencies are not known to be supported."
-+ deplibs=$($echo "X $deplibs" | $Xsed -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g')
+- $echo "*** Warning: inter-library dependencies are not known to be supported."
++ deplibs=$($echo "X $deplibs" | $Xsed -e 's/ -1c$//' -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g')
+ newdeplibs="$deplibs"
fi
-- echo "*** All declared inter-library dependencies are being dropped."
+- $echo "*** All declared inter-library dependencies are being dropped."
- droppeddeps=yes
fi
;;
esac
---- lib/Makefile.in
-+++ lib/Makefile.in 2013-12-09 13:54:05.318235734 +0000
-@@ -247,7 +247,7 @@ CFLAGS = @CFLAGS@
- LEXLIB = @LEXLIB@
- YLWRAP = $(top_srcdir)/auxdir/ylwrap
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -lm
- DIST_SOURCES = $(liba2ps_la_SOURCES)
- HEADERS = $(include_HEADERS) $(noinst_HEADERS)
-
++++++ a2ps-4.13-ogonkify.patch -> a2ps-4.14-ogonkify.patch ++++++
--- /work/SRC/openSUSE:Factory/a2ps/a2ps-4.13-ogonkify.patch 2011-09-23 01:51:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.a2ps.new/a2ps-4.14-ogonkify.patch 2014-12-16 14:47:11.000000000 +0100
@@ -1,56 +1,50 @@
---- ogonkify/VERSION
-+++ ogonkify/VERSION Mon May 24 19:32:17 1999
-@@ -1,2 +1,2 @@
- This is the version of `ogonkify' distributed as of
--Fri May 21 14:56:35 BST 1999
-+Mon May 24 18:32:17 BST 1999
---- ogonkify/compose.ps
-+++ ogonkify/compose.ps Mon May 24 19:30:33 1999
+diff -rupN a2ps-4.14.old/ogonkify/compose.ps a2ps-4.14/ogonkify/compose.ps
+--- a2ps-4.14.old/ogonkify/compose.ps 2007-12-28 18:09:17.000000000 -0800
++++ a2ps-4.14/ogonkify/compose.ps 2014-08-06 19:39:41.746447491 -0700
@@ -3,7 +3,7 @@
% By J. Chroboczek
%
% -- code follows this line --
-%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
++%%BeginResource: procset compose 0.8 1
% Copyright (c) 1996-1999 by J. Chroboczek
% This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -153,7 +153,8 @@
+ % GNU Public License, either version 3 of the license, or (at your
+@@ -153,7 +153,8 @@ makeCompositeDict begin
{} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
0 0 moveto
(5) stringwidth pop % newname dict w
- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
++ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
++ % newnamedict w h
3 2 roll % newname w h dict
dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/doc/ogonkify.1
-+++ ogonkify/doc/ogonkify.1 Mon May 24 19:18:21 1999
+diff -rupN a2ps-4.14.old/ogonkify/doc/ogonkify.1 a2ps-4.14/ogonkify/doc/ogonkify.1
+--- a2ps-4.14.old/ogonkify/doc/ogonkify.1 2007-02-13 08:14:07.000000000 -0800
++++ a2ps-4.14/ogonkify/doc/ogonkify.1 2014-08-06 19:44:31.584847546 -0700
@@ -1,6 +1,6 @@
.TH OGONKIFY 1 "14 May 1999" "McKornik Jr."
-.\" Time-stamp: <99/05/21 14:43:47 jec>
-+.\" Time-stamp: <99/05/24 18:18:21 jec>
++.\" Time-stamp: <14/08/06 19:40:00 swd>
.SH NAME
ogonkify \- international support for PostScript
-@@ -262,7 +262,8 @@
+@@ -262,7 +262,8 @@ or eventually
.IP
% ogonkify \-N \-CT .
Tag Table:
@@ -122,14 +120,15 @@
+Node: Reaching the author15348
End Tag Table
---- ogonkify/doc/ogonkify.texi
-+++ ogonkify/doc/ogonkify.texi Mon May 24 19:15:21 1999
+diff -rupN a2ps-4.14.old/ogonkify/doc/ogonkify.texi a2ps-4.14/ogonkify/doc/ogonkify.texi
+--- a2ps-4.14.old/ogonkify/doc/ogonkify.texi 2007-12-28 18:09:38.000000000 -0800
++++ a2ps-4.14/ogonkify/doc/ogonkify.texi 2014-08-06 19:56:17.178966101 -0700
@@ -5,11 +5,11 @@
@setchapternewpage off
@c %**end of header
-@c Time-stamp: <99/05/14 04:30:20 jec>
-+@c Time-stamp: <99/05/24 18:15:20 jec>
++@c Time-stamp: <14/08/06 19:55:00 swd>
@dircategory Printing Tools
@direntry
@@ -138,8 +137,9 @@
@end direntry
@ifinfo
---- ogonkify/ogonkify.in.in
-+++ ogonkify/ogonkify.in.in Fri Aug 31 11:41:50 2001
+diff -rupN a2ps-4.14.old/ogonkify/ogonkify.in.in a2ps-4.14/ogonkify/ogonkify.in.in
+--- a2ps-4.14.old/ogonkify/ogonkify.in.in 2007-12-28 18:05:05.000000000 -0800
++++ a2ps-4.14/ogonkify/ogonkify.in.in 2014-08-06 19:59:53.821986881 -0700
@@ -13,7 +13,7 @@
# Warning: this program is written in Perl
@@ -149,7 +149,7 @@
# Directory with the IBM Courier fonts
$IBMFONTS="@IBMFONTS@";
-@@ -237,6 +270,9 @@
+@@ -237,6 +237,9 @@ if(!$encodings{$encoding}) {
$where=0;
while(<>) {
if($where==0) {
@@ -159,7 +159,7 @@
print;
if(($doMosaic || $doMp) && /^%%EndComments/) {
$_="%%BeginProlog\n";
-@@ -252,14 +288,14 @@
+@@ -252,14 +255,14 @@ while(<>) {
for(@procsets) {
&procset($_);
}
@@ -177,255 +177,10 @@
while(($from,$to)=each %remappings) {
&remap($from,$to);
}
---- ogonkify/pcrb-o.pfa
-+++ ogonkify/pcrb-o.pfa Thu Apr 19 15:09:47 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/pcrbo-o.pfa
-+++ ogonkify/pcrbo-o.pfa Thu Apr 19 15:09:47 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/pcrr-o.pfa
-+++ ogonkify/pcrr-o.pfa Thu Apr 19 15:09:46 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/pcrro-o.pfa
-+++ ogonkify/pcrro-o.pfa Thu Apr 19 15:09:47 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/phvb-o.pfa
-+++ ogonkify/phvb-o.pfa Thu Apr 19 15:09:49 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/phvbo-o.pfa
-+++ ogonkify/phvbo-o.pfa Thu Apr 19 15:09:50 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/phvr-o.pfa
-+++ ogonkify/phvr-o.pfa Thu Apr 19 15:09:49 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/phvro-o.pfa
-+++ ogonkify/phvro-o.pfa Thu Apr 19 15:09:49 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/ptmb-o.pfa
-+++ ogonkify/ptmb-o.pfa Thu Apr 19 15:09:48 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/ptmbi-o.pfa
-+++ ogonkify/ptmbi-o.pfa Thu Apr 19 15:09:49 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/ptmr-o.pfa
-+++ ogonkify/ptmr-o.pfa Thu Apr 19 15:09:48 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
---- ogonkify/ptmri-o.pfa
-+++ ogonkify/ptmri-o.pfa Thu Apr 19 15:09:48 2001
-@@ -89,7 +89,7 @@
- % By J. Chroboczek
- %
- % -- code follows this line --
--%%BeginResource: procset compose 0.8 0
-+%%BeginResource: procset compose 0.8 1
- % Copyright (c) 1996-1999 by J. Chroboczek
- % This code may be distributed under the terms of the
- % GNU Public License, either version 2 of the license, or (at your
-@@ -239,7 +239,8 @@
- {} forall pop pop [ 5 1 roll 0 0] makefont setfont % newnamedict
- 0 0 moveto
- (5) stringwidth pop % newname dict w
-- (M) false charpath pathbbox 4 1 roll pop pop pop % newnamedict w h
-+ (M) false charpath pathbbox newpath 4 1 roll pop pop pop
-+ % newnamedict w h
- 3 2 roll % newname w h dict
-
- dup length dict dup 3 1 roll begin % newname w h newdict
+diff -rupN a2ps-4.14.old/ogonkify/VERSION a2ps-4.14/ogonkify/VERSION
+--- a2ps-4.14.old/ogonkify/VERSION 2002-03-04 10:46:26.000000000 -0800
++++ a2ps-4.14/ogonkify/VERSION 2014-08-06 19:37:39.440166595 -0700
+@@ -1,2 +1,2 @@
+ This is the version of `ogonkify' distributed as of
+-Fri May 21 14:56:35 BST 1999
++Wed Aug 6 19:37:00 PST 2014
++++++ a2ps-4.13-tempfile.patch -> a2ps-4.14-tempfile.patch ++++++
--- /work/SRC/openSUSE:Factory/a2ps/a2ps-4.13-tempfile.patch 2011-09-23 01:51:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.a2ps.new/a2ps-4.14-tempfile.patch 2014-12-16 14:47:11.000000000 +0100
@@ -1,19 +1,19 @@
---- a2ps-4.13/contrib/card.m4
-+++ a2ps-4.13/contrib/card.m4 Thu Mar 18 14:27:29 2004
-@@ -27,7 +27,6 @@
+diff -rupN a2ps-4.14.old/contrib/card.m4 a2ps-4.14/contrib/card.m4
+--- a2ps-4.14.old/contrib/card.m4 2007-12-28 18:11:47.000000000 -0800
++++ a2ps-4.14/contrib/card.m4 2014-08-06 20:08:33.925684483 -0700
+@@ -27,7 +27,6 @@ LC_ALL="${LC_ALL-C}" export LC_ALL
print_form_feeds=:
RM="/bin/rm -rf"
- tmp_dir=${TMPDIR-/tmp}/$program.$$
+ tmp_dir=`mktemp -d -t card.XXXXXX` || { echo "$program: Cannot create temporary dir!" >&2 ; exit 1; }
-tmp_file=$tmp_dir/card
success=false
verbose=:
version_short="card $card_version (@GNU_PACKAGE@ @VERSION@)"
-@@ -111,8 +110,14 @@
+@@ -111,7 +110,14 @@ if test $# = 0 && test "X$commands" = X;
fi
# Create a tmp dir and be ready to clean up
-trap "$RM $tmp_dir" 0 1 2 15
--(umask 077 && mkdir $tmp_dir) || exit 1
+if type -p mktemp > /dev/null 2>&1 ; then
+ tmp_dir="`mktemp -d ${tmp_dir}.XXXXXX`" || exit 1
+ trap "$RM $tmp_dir" 0 1 2 3 13 15
@@ -25,9 +25,10 @@
case $LC_ALL in
fr) footer="Engendré par $version_short" ;;
---- a2ps-4.13/contrib/fixnt.l
-+++ a2ps-4.13/contrib/fixnt.l Thu Mar 18 14:20:59 2004
-@@ -90,6 +90,7 @@
+diff -rupN a2ps-4.14.old/contrib/fixnt.l a2ps-4.14/contrib/fixnt.l
+--- a2ps-4.14.old/contrib/fixnt.l 2002-03-04 10:46:23.000000000 -0800
++++ a2ps-4.14/contrib/fixnt.l 2014-08-06 20:13:20.264026372 -0700
+@@ -90,6 +90,7 @@ int ifpagesv = 0;
int ifcorel = 0;
int ifendsetup = 0;
int pid;
@@ -35,20 +36,20 @@
char fontfname[255];
char adobefname[255];
char bodyfname[255];
-@@ -131,7 +132,9 @@
+@@ -131,7 +132,9 @@ const char *tmpdir;
<NORMAL>%%Page:.*\n { /* read up to first page and just output everyting */
sprintf(bodyfname, "%s/fixnt_Body_%d", tmpdir, pid);
- body = fopen(bodyfname,"w+");
-+ fd = mkstemp(bodyfname);
++ fd = fopen(bodyfname,"w+");
+ if (fd == -1) abort();
+ body = fdopen(fd,"w+");
fprintf(body,"%s",yytext);
BEGIN BODY;
}
-@@ -143,7 +146,9 @@
- <BODY>[/]Adobe_WinNT_Driver_Gfx[ ]175[ ]dict[ ]dup[ ]begin.*\n {
- /* Adobe Stuff */
+@@ -142,7 +145,9 @@ const char *tmpdir;
+
+ <BODY>[/]Adobe_WinNT_Driver_Gfx[ ]175[ ]dict[ ]dup[ ]begin.*\n { /* Adobe Stuff */
sprintf(adobefname, "%s/fixnt_Adobe_%d", tmpdir, pid);
- adobe = fopen(adobefname,"w+");
+ fd = mkstemp(adobefname);
@@ -57,8 +58,8 @@
fprintf(adobe,"%s",yytext);
BEGIN ADOBE;
}
-@@ -170,7 +175,9 @@
- <BODY>(NTPSOct95[ ]){0,1}[/]FontSV[ ]save[ ](put|def).*\n {
+@@ -169,7 +174,9 @@ const char *tmpdir;
+ <BODY>(NTPSOct95[ ]){0,1}[/]FontSV[ ]save[ ](put|def).*\n { ;
/* font definitions from here on */
sprintf(fontfname, "%s/fixnt_Font_%d", tmpdir, pid);
- font = fopen(fontfname,"w+");
@@ -68,9 +69,10 @@
fprintf(font,"%s",yytext);
BEGIN FONT;
}
---- a2ps-4.13/contrib/fixps.m4
-+++ a2ps-4.13/contrib/fixps.m4 Thu Mar 18 14:30:48 2004
-@@ -101,15 +101,24 @@
+diff -rupN a2ps-4.14.old/contrib/fixps.m4 a2ps-4.14/contrib/fixps.m4
+--- a2ps-4.14.old/contrib/fixps.m4 2007-12-28 18:11:47.000000000 -0800
++++ a2ps-4.14/contrib/fixps.m4 2014-08-06 20:18:34.234875842 -0700
+@@ -101,12 +101,23 @@ case $# in
exit 1;;
esac
@@ -95,83 +97,25 @@
+ # Temp dir. Get ready not to leave junk (if not debugging)
+ trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
+ fi
-+ (umask 077 && mkdir $tmpdir) || exit 1
++ (umask 077 && mkdir $tmpdir) || exit 1
fi
--
--mkdir $tmpdir
- fixps_sed=$tmpdir/fixps.sed
- # If printing from stdin, save into a tmp file
---- a2ps-4.13/contrib/pdiff.m4
-+++ a2ps-4.13/contrib/pdiff.m4 Thu Mar 18 14:20:59 2004
-@@ -20,7 +20,6 @@
- diff_options='-u'
- file=
- output=
--tmpdir=/tmp/$program.$$
- verbose=echo
- wdiff_prog=${WDIFF:-wdiff}
- wdiff_options='-w[wd- -x-wd] -y{wd+ -z+wd}'
---- a2ps-4.13/contrib/psmandup.m4
-+++ a2ps-4.13/contrib/psmandup.m4 Thu Mar 18 14:32:22 2004
-@@ -22,7 +22,7 @@
- message=
- psselect=${PSSELECT:-psselect}
- psset=${PSSET:-psset}
--tmpdir=/tmp/$program.$$
-+tmpdir=${TMPDIR-/tmp}/$program.$$
-
- # These two must be kept in synch. They are opposed.
- verbose=echo
-@@ -95,15 +95,25 @@
- exit 1;;
- esac
-
--if test -n "$debug"; then
-- # Set -x now if debugging
-- set -x
-+if type -p mktemp > /dev/null 2>&1 ; then
-+ tmpdir="`mktemp -d ${tmpdir}.XXXXXX`" || exit 1
-+ if test -n "$debug"; then
-+ # Set -x now if debugging
-+ set -x
-+ else
-+ # Temp dir. Get ready not to leave junk (if not debugging)
-+ trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
-+ fi
- else
-- # Temp dir. Get ready not to leave junk (if not debugging)
-- trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
-+ if test -n "$debug"; then
-+ # Set -x now if debugging
-+ set -x
-+ else
-+ # Temp dir. Get ready not to leave junk (if not debugging)
-+ trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
-+ fi
-+ (umask 077 && mkdir $tmpdir) || exit 1
- fi
--
--mkdir $tmpdir
-
- # If printing from stdin, save into a tmp file
- if test $file = '-'; then
---- a2ps-4.13/contrib/psset.m4
-+++ a2ps-4.13/contrib/psset.m4 Thu Mar 18 14:33:31 2004
-@@ -20,7 +20,6 @@
+ fixps_sed=$tmpdir/fixps.sed
+diff -rupN a2ps-4.14.old/contrib/psset.m4 a2ps-4.14/contrib/psset.m4
+--- a2ps-4.14.old/contrib/psset.m4 2007-12-28 18:11:47.000000000 -0800
++++ a2ps-4.14/contrib/psset.m4 2014-08-06 20:28:09.587478128 -0700
+@@ -20,7 +20,6 @@ output=-
pagedevices= # `;' separated list of `key:value'
quiet=: # i.e., verbose
- tmpdir=${TMPDIR:-/tmp}/$program.$$
+ tmpdir=`mktemp -d -t psset.XXXXXX` || { echo "$program: Cannot create temporary dir!" >&2 ; exit 1; }
-sedscript=$tmpdir/psset.sed
# The version/usage strings
version="$program 1.3 (@GNU_PACKAGE@ @VERSION@)
-@@ -106,15 +105,26 @@
+@@ -106,13 +105,26 @@ case $# in
exit 1;;
esac
--mkdir $tmpdir
--
-if test -n "$debug"; then
- # Set -x now if debugging
- set -x
@@ -200,9 +144,10 @@
# Well, if there is nothing to do, just do nothing.
if test -z "$pagedevices"; then
---- a2ps-4.13/contrib/texi2dvi4a2ps
-+++ a2ps-4.13/contrib/texi2dvi4a2ps Thu Mar 18 14:34:56 2004
-@@ -198,13 +198,21 @@
+diff -rupN a2ps-4.14.old/contrib/texi2dvi4a2ps a2ps-4.14/contrib/texi2dvi4a2ps
+--- a2ps-4.14.old/contrib/texi2dvi4a2ps 2007-12-28 17:58:11.000000000 -0800
++++ a2ps-4.14/contrib/texi2dvi4a2ps 2014-08-06 20:34:41.870692018 -0700
+@@ -197,9 +197,20 @@ case $# in
;;
esac
@@ -217,33 +162,12 @@
+ trap "cd / && rm -rf $tmpdir" 0 1 2 3 13 15
+ fi
+else
-+ # Prepare the temporary directory. Remove it at exit, unless debugging.
-+ if test -z "$debug"; then
++ # Prepare the temporary directory. Remove it at exit, unless debugging
++ if test -x "$debug"; then
+ trap "cd / && rm -rf $tmpdir" 0 1 2 3 13 15
+ fi
+ # Create the temporary directory with strict rights
+ (umask 077 && mkdir $tmpdir) || exit 1
fi
--
--# Create the temporary directory with strict rights
--(umask 077 && mkdir $tmpdir) || exit 1
# Prepare the tools we might need. This may be extra work in some
- # cases, but improves the readibility of the script.
---- a2ps-4.13/contrib/emacs/elisp-comp
-+++ a2ps-4.13/contrib/emacs/elisp-comp Thu Mar 18 14:36:40 2004
-@@ -35,8 +35,12 @@
- EMACS=emacs
- fi
-
-- tempdir=elc.$$
-- mkdir $tempdir
-+ if type -p mktemp > /dev/null 2>&1 ; then
-+ tempdir="`mktemp -d elc.XXXXXX`" || exit 1
-+ else
-+ tempdir=elc.$$
-+ mkdir $tempdir || exit 1
-+ fi
- cp $* $tempdir
- cd $tempdir
-
++++++ a2ps-4.14.diff ++++++
++++ 717 lines (skipped)
++++++ a2ps-4.13b.tar.gz -> a2ps-4.14.tar.gz ++++++
++++ 278386 lines of diff (skipped)