diff --git a/CVE-2014-0466.diff b/CVE-2014-0466.diff index 82858ee..18c5fb7 100644 --- a/CVE-2014-0466.diff +++ b/CVE-2014-0466.diff @@ -6,25 +6,27 @@ Bug-Debian: http://bugs.debian.org/742902 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 diff --git a/a2ps-4.13-acroread.patch b/a2ps-4.13-acroread.patch deleted file mode 100644 index 3447665..0000000 --- a/a2ps-4.13-acroread.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.in~ 2000-02-24 18:53:03.000000000 +0100 -+++ configure.in 2006-05-19 12:31:53.000000000 +0200 -@@ -312,6 +312,8 @@ - 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 @@ - 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. diff --git a/a2ps-4.13-gv-arguments.patch b/a2ps-4.13-gv-arguments.patch deleted file mode 100644 index eaff9d5..0000000 --- a/a2ps-4.13-gv-arguments.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a2ps-4.13/etc/a2ps_cfg.in -+++ a2ps-4.13/etc/a2ps_cfg.in 2011-10-21 16:07:46.000000000 +0000 -@@ -220,8 +220,8 @@ - # Either GV (prefered) or Ghostview will be used as the "display" printer - # We give -dNOPLATFONTS so that real fonts are used - # (Strange results appear with Ogonkify's fonts for instance). --@COM_ghostview@Variable: ghostview @ghostview@ -arguments -dNOPLATFONTS --@COM_gv@Variable: ghostview @gv@ -antialias -arguments -dNOPLATFONTS -+@COM_ghostview@Variable: ghostview @ghostview@ -arguments=-dNOPLATFONTS -+@COM_gv@Variable: ghostview @gv@ -antialias -arguments=-dNOPLATFONTS - - # Used for the `pdf' printer. - # Use as `#{ps2pdf} INPUT OUTPUT'. diff --git a/a2ps-4.13-linker.patch b/a2ps-4.13-linker.patch deleted file mode 100644 index 2905cd9..0000000 --- a/a2ps-4.13-linker.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- 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 - 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." -+ 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') -+ newdeplibs="$deplibs" - fi -- 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) - diff --git a/a2ps-4.13-nb.patch b/a2ps-4.13-nb.patch deleted file mode 100644 index 9197bf4..0000000 --- a/a2ps-4.13-nb.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.in -+++ configure.in -@@ -18,7 +18,7 @@ - AC_SUBST(GNU_PACKAGE) - - # Available translations --ALL_LINGUAS="ca cs da de es et fr it ko nl no pl pt ru sl sv tr" -+ALL_LINGUAS="ca cs da de es et fr it ko nl nb pl pt ru sl sv tr" - - ## --------------------- ## - ## Checks for programs. ## ---- configure -+++ configure -@@ -900,7 +900,7 @@ - EOF - - # Available translations --ALL_LINGUAS="ca cs da de es et fr it ko nl no pl pt ru sl sv tr" -+ALL_LINGUAS="ca cs da de es et fr it ko nl nb pl pt ru sl sv tr" - - ## --------------------- ## - ## Checks for programs. ## diff --git a/a2ps-4.13-ogonkify.patch b/a2ps-4.13-ogonkify.patch deleted file mode 100644 index c459b65..0000000 --- a/a2ps-4.13-ogonkify.patch +++ /dev/null @@ -1,431 +0,0 @@ ---- 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 -@@ -3,7 +3,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 -@@ -153,7 +153,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/doc/ogonkify.1 -+++ ogonkify/doc/ogonkify.1 Mon May 24 19:18:21 1999 -@@ -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> - - .SH NAME - ogonkify \- international support for PostScript -@@ -262,7 +262,8 @@ - .IP - % ogonkify \-N \-CT -+@c Time-stamp: <99/05/24 18:15:20 jec> - - @dircategory Printing Tools - @direntry --* ogonkify: (ogonkify). Ogonkify -+* ogonkify: (ogonkify). Ogonkify - @end direntry - - @ifinfo ---- ogonkify/ogonkify.in.in -+++ ogonkify/ogonkify.in.in Fri Aug 31 11:41:50 2001 -@@ -13,7 +13,7 @@ - # Warning: this program is written in Perl - - $PROGNAME='ogonkify'; --$VERSION='v. 0.7.0 by J. Chroboczek'; -+$VERSION='v. 0.7.1 by J. Chroboczek'; - - # Directory with the IBM Courier fonts - $IBMFONTS="@IBMFONTS@"; -@@ -237,6 +270,9 @@ - $where=0; - while(<>) { - if($where==0) { -+ if($doNetscape && /^%%Title:/) { -+ $_="%%Title: \n"; -+ } - print; - if(($doMosaic || $doMp) && /^%%EndComments/) { - $_="%%BeginProlog\n"; -@@ -252,14 +288,14 @@ - for(@procsets) { - &procset($_); - } -- for(@downloadFonts) { -- &downloadFont($_); -- } - if($eurify) { - for(@standardFont) { - &eurifyFont($_); - } - } -+ for(@downloadFonts) { -+ &downloadFont($_); -+ } - 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 --git a/a2ps-4.13-space.patch b/a2ps-4.13-space.patch deleted file mode 100644 index c7bff59..0000000 --- a/a2ps-4.13-space.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- src/select.c -+++ src/select.c Sat Aug 21 12:05:31 2004 -@@ -131,6 +131,36 @@ - return 1; - } - -+/* escapes the name of a file so that the shell groks it in 'single' q.marks. -+ The resulting pointer has to be free()ed when not longer used. */ -+char * -+shell_escape(const char *fn) -+{ -+ size_t len = 0; -+ const char *inp; -+ char *retval, *outp; -+ -+ for(inp = fn; *inp; ++inp) -+ switch(*inp) -+ { -+ case '\'': len += 4; break; -+ default: len += 1; break; -+ } -+ -+ outp = retval = malloc(len + 1); -+ if(!outp) -+ return NULL; /* perhaps one should do better error handling here */ -+ for(inp = fn; *inp; ++inp) -+ switch(*inp) -+ { -+ case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break; -+ default: *outp++ = *inp; break; -+ } -+ *outp = 0; -+ -+ return retval; -+} -+ - /* What says file about the type of a file (result is malloc'd). NULL - if could not be run. */ - -@@ -144,11 +174,15 @@ - if (IS_EMPTY (job->file_command)) - return NULL; - -+ filename = shell_escape(filename); -+ if(filename == NULL) -+ return NULL; - /* Call file(1) with the correct option */ -- command = ALLOCA (char, (2 -+ command = ALLOCA (char, (4 - + strlen (job->file_command) - + ustrlen (filename))); -- sprintf (command, "%s %s", job->file_command, (const char *) filename); -+ sprintf (command, "%s '%s'", job->file_command, (const char *) filename); -+ free(filename); - message (msg_tool, (stderr, "Reading pipe: `%s'\n", command)); - file_out = popen (command, "r"); - diff --git a/a2ps-4.13.dif b/a2ps-4.13.dif deleted file mode 100644 index 387a631..0000000 --- a/a2ps-4.13.dif +++ /dev/null @@ -1,1443 +0,0 @@ ---- .pkgextract -+++ .pkgextract 2006-02-23 12:05:17.000000000 +0000 -@@ -0,0 +1,9 @@ -+patch -p0 -s --suffix=.ogon < ../a2ps-4.13-ogonkify.patch -+patch -p0 -s --suffix=.secu < ../a2ps-4.13-security.patch -+patch -p1 -s --suffix=.tmpf < ../a2ps-4.13-tempfile.patch -+patch -p0 -s --suffix=.spac < ../a2ps-4.13-space.patch -+patch -p0 -s --suffix=.nb < ../a2ps-4.13-nb.patch -+patch -p1 -s --suffix=.incl < ../a2ps-4.13-include.patch -+patch -p0 -s --suffix=.acro < ../a2ps-4.13-acroread.patch -+patch -p0 -s --suffix=.base < ../a2ps-4.13-base.patch -+patch -p0 -s --suffix=.utf8 < ../a2ps-4.13-utf8.patch ---- configure -+++ configure 2006-02-23 12:05:17.000000000 +0000 -@@ -8448,8 +8448,9 @@ echo "configure:8448: checking for PostS - # Try to find some PostScript fonts. - # Find out if ghostscript is installed - ac_psfont_path= --for ac_dir in /usr/local/ghostscript/fonts \ -- /usr/local/share/ghostscript/fonts; -+for ac_dir in /usr/share/ghostscript/fonts \ -+ /usr/X11R6/lib/X11/fonts/Type1/ \ -+ /usr/X11R6/lib/X11/fonts/latin2/Type1/ ; - do - if test "cd $ac_dir 2>/dev/null && echo *.afm"; then - ac_psfont_path="$ac_psfont_path:$ac_dir"; ---- configure.in -+++ configure.in 2006-05-19 10:34:39.000000000 +0000 -@@ -197,8 +197,9 @@ AC_MSG_CHECKING(for PostScript fonts pat - # Try to find some PostScript fonts. - # Find out if ghostscript is installed - ac_psfont_path= --for ac_dir in /usr/local/ghostscript/fonts \ -- /usr/local/share/ghostscript/fonts; -+for ac_dir in /usr/share/ghostscript/fonts \ -+ /usr/X11R6/lib/X11/fonts/Type1/ \ -+ /usr/X11R6/lib/X11/fonts/latin2/Type1/ ; - do - if test "cd $ac_dir 2>/dev/null && echo *.afm"; then - ac_psfont_path="$ac_psfont_path:$ac_dir"; ---- afm/fonts.map -+++ afm/fonts.map 2006-02-23 12:05:17.000000000 +0000 -@@ -43,6 +43,14 @@ Bookman-Demi pbkd - Bookman-DemiItalic pbkdi - Bookman-Light pbkl - Bookman-LightItalic pbkli -+CenturySchL-Bold c059016l -+CenturySchL-BoldItal c059036l -+CenturySchL-Ital c059033l -+CenturySchL-Roma c059013l -+CharterBT-Bold bchb -+CharterBT-BoldItalic bchbi -+CharterBT-Italic bchri -+CharterBT-Roman bchr - Courier pcrr - Courier-Bold pcrb - Courier-Bold-Comp pcrb-c -@@ -55,6 +63,9 @@ Courier-Oblique pcrro - Courier-Oblique-Comp pcrro-c - Courier-Oblique-Ogonki pcrro-o - Courier-Ogonki pcrr-o -+Cyrillic fcyr -+Cyrillic-Italic fcyri -+Dingbats d050000l - Helvetica phvr - Helvetica-Bold phvb - Helvetica-Bold-Comp phvb-c -@@ -75,11 +86,25 @@ NewCenturySchlbk-Bold pncb - NewCenturySchlbk-BoldItalic pncbi - NewCenturySchlbk-Italic pncri - NewCenturySchlbk-Roman pncr -+NimbusMonL-Bold n022004l -+NimbusMonL-BoldObli n022024l -+NimbusMonL-Regu n022003l -+NimbusMonL-ReguObli n022023l -+NimbusRomNo n021003l -+NimbusSanL-Bold n019004l -+NimbusSanL-BoldCond n019044l -+NimbusSanL-BoldCondItal n019064l -+NimbusSanL-BoldItal n019024l -+NimbusSanL-Regu n019003l -+NimbusSanL-ReguCond n019043l -+NimbusSanL-ReguCondItal n019063l -+NimbusSanL-ReguItal n019023l - PCFont pcfont - Palatino-Bold pplb - Palatino-BoldItalic pplbi - Palatino-Italic pplri - Palatino-Roman pplr -+StandardSymL s050000l - Symbol psyr - Times-Bold ptmb - Times-Bold-Comp ptmb-c -@@ -93,5 +118,20 @@ Times-Italic-Ogonki ptmri-o - Times-Roman ptmr - Times-Roman-Comp ptmr-c - Times-Roman-Ogonki ptmr-o -+URWAntiquaT-RegularCondensed u003043t -+URWBookmanL-DemiBold b018015l -+URWBookmanL-DemiBoldItal b018035l -+URWBookmanL-Ligh b018012l -+URWBookmanL-LighItal b018032l -+URWChanceryL-MediItal z003034l -+URWGothicL-Book a010013l -+URWGothicL-BookObli a010033l -+URWGothicL-Demi a010015l -+URWGothicL-DemiObli a010035l -+URWGroteskT-Bold u004006t -+URWPalladioL-Bold p052004l -+URWPalladioL-BoldItal p052024l -+URWPalladioL-Ital p052023l -+URWPalladioL-Roma p052003l - ZapfChancery-MediumItalic pzcmi - ZapfDingbats pzdr ---- afm/pcrb.afm -+++ afm/pcrb.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 633 - XHeight 487 - Descender -257 - Ascender 674 --StartCharMetrics 260 -+StartCharMetrics 261 - C 32 ; WX 600 ; N space ; B 500 -100 700 100 ; - C 33 ; WX 600 ; N exclam ; B 170 -65 430 689 ; - C 34 ; WX 600 ; N quotedbl ; B 66 254 534 663 ; -@@ -255,6 +255,7 @@ C -1 ; WX 600 ; N onehalf ; B -70 -65 67 - C -1 ; WX 600 ; N onequarter ; B -70 -50 670 674 ; - C -1 ; WX 600 ; N onesuperior ; B 100 140 500 674 ; - C -1 ; WX 600 ; N otilde ; B -8 -65 608 657 ; -+C -1 ; WX 600 ; N Euro ; B -69 -50 673 633 ; - C -1 ; WX 600 ; N overscore ; B -92 489 692 689 ; - C -1 ; WX 600 ; N plusminus ; B -8 -50 608 610 ; - C -1 ; WX 600 ; N prescription ; B -37 -50 669 633 ; -@@ -279,7 +280,7 @@ C -1 ; WX 600 ; N yacute ; B -29 -257 62 - C -1 ; WX 600 ; N ydieresis ; B -29 -257 629 631 ; - C -1 ; WX 600 ; N zcaron ; B 35 -50 569 695 ; - EndCharMetrics --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 0 146 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 0 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 0 146 ; -@@ -336,6 +337,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 0 14 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 0 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 0 146 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 0 146 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; - EndComposites ---- afm/pcrbo.afm -+++ afm/pcrbo.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 633 - XHeight 487 - Descender -257 - Ascender 674 --StartCharMetrics 260 -+StartCharMetrics 261 - C 32 ; WX 600 ; N space ; B 500 -100 700 100 ; - C 33 ; WX 600 ; N exclam ; B 197 -65 549 689 ; - C 34 ; WX 600 ; N quotedbl ; B 171 254 654 663 ; -@@ -255,6 +255,7 @@ C -1 ; WX 600 ; N onehalf ; B -14 -65 72 - C -1 ; WX 600 ; N onequarter ; B -14 -50 741 674 ; - C -1 ; WX 600 ; N onesuperior ; B 151 140 551 674 ; - C -1 ; WX 600 ; N otilde ; B 34 -65 656 657 ; -+C -1 ; WX 600 ; N Euro ; B -58 -50 776 633 ; - C -1 ; WX 600 ; N overscore ; B 33 489 817 689 ; - C -1 ; WX 600 ; N plusminus ; B 3 -50 677 610 ; - C -1 ; WX 600 ; N prescription ; B -26 -50 680 633 ; -@@ -279,7 +280,7 @@ C -1 ; WX 600 ; N yacute ; B -62 -257 71 - C -1 ; WX 600 ; N ydieresis ; B -62 -257 711 631 ; - C -1 ; WX 600 ; N zcaron ; B 46 -50 651 695 ; - EndCharMetrics --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 0 146 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 0 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 0 146 ; -@@ -336,6 +337,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 0 14 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 0 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 0 146 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 0 146 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; - EndComposites ---- afm/pcrr.afm -+++ afm/pcrr.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 583 - XHeight 437 - Descender -207 - Ascender 624 --StartCharMetrics 260 -+StartCharMetrics 261 - C 32 ; WX 600 ; N space ; B 560 -40 640 40 ; - C 33 ; WX 600 ; N exclam ; B 240 -5 360 639 ; - C 34 ; WX 600 ; N quotedbl ; B 126 314 474 603 ; -@@ -255,6 +255,7 @@ C -1 ; WX 600 ; N onehalf ; B -10 -20 61 - C -1 ; WX 600 ; N onequarter ; B -10 -20 610 624 ; - C -1 ; WX 600 ; N onesuperior ; B 160 200 440 624 ; - C -1 ; WX 600 ; N otilde ; B 52 -35 548 597 ; -+C -1 ; WX 600 ; N Euro ; B -9 -20 613 583 ; - C -1 ; WX 600 ; N overscore ; B -32 559 632 639 ; - C -1 ; WX 600 ; N plusminus ; B 52 -20 548 550 ; - C -1 ; WX 600 ; N prescription ; B 23 -20 609 583 ; -@@ -279,7 +280,7 @@ C -1 ; WX 600 ; N yacute ; B 31 -207 569 - C -1 ; WX 600 ; N ydieresis ; B 31 -207 569 571 ; - C -1 ; WX 600 ; N zcaron ; B 95 -20 509 645 ; - EndCharMetrics --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 0 146 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 0 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 0 146 ; -@@ -336,6 +337,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 0 14 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 0 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 0 146 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 0 146 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; - EndComposites ---- afm/pcrro.afm -+++ afm/pcrro.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 583 - XHeight 437 - Descender -207 - Ascender 624 --StartCharMetrics 260 -+StartCharMetrics 261 - C 32 ; WX 600 ; N space ; B 560 -40 640 40 ; - C 33 ; WX 600 ; N exclam ; B 257 -5 483 639 ; - C 34 ; WX 600 ; N quotedbl ; B 231 314 594 603 ; -@@ -255,6 +255,7 @@ C -1 ; WX 600 ; N onehalf ; B 46 -20 665 - C -1 ; WX 600 ; N onequarter ; B 46 -20 681 624 ; - C -1 ; WX 600 ; N onesuperior ; B 211 200 491 624 ; - C -1 ; WX 600 ; N otilde ; B 91 -35 597 597 ; -+C -1 ; WX 600 ; N Euro ; B -5 -20 718 583 ; - C -1 ; WX 600 ; N overscore ; B 95 559 759 639 ; - C -1 ; WX 600 ; N plusminus ; B 56 -20 617 550 ; - C -1 ; WX 600 ; N prescription ; B 27 -20 613 583 ; -@@ -279,7 +280,7 @@ C -1 ; WX 600 ; N yacute ; B -4 -207 653 - C -1 ; WX 600 ; N ydieresis ; B -4 -207 653 571 ; - C -1 ; WX 600 ; N zcaron ; B 99 -20 593 645 ; - EndCharMetrics --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 0 146 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 0 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 0 146 ; -@@ -336,6 +337,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 0 14 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 0 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 0 146 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 0 146 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; - EndComposites ---- afm/phvb.afm -+++ afm/phvb.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 729 - XHeight 542 - Descender -219 - Ascender 729 --StartCharMetrics 228 -+StartCharMetrics 229 - C 32 ; WX 278 ; N space ; B 0 0 0 0 ; - C 33 ; WX 333 ; N exclam ; B 112 0 262 729 ; - C 34 ; WX 474 ; N quotedbl ; B 50 470 424 729 ; -@@ -231,6 +231,7 @@ C -1 ; WX 834 ; N onehalf ; B 30 -20 803 - C -1 ; WX 834 ; N onequarter ; B 30 -20 804 715 ; - C -1 ; WX 333 ; N onesuperior ; B 46 284 247 709 ; - C -1 ; WX 611 ; N otilde ; B 35 -23 569 729 ; -+C -1 ; WX 833 ; N Euro ; B 66 0 776 729 ; - C -1 ; WX 584 ; N plusminus ; B 40 0 544 674 ; - C -1 ; WX 737 ; N registered ; B -14 -20 751 745 ; - C -1 ; WX 556 ; N scaron ; B 29 -23 520 745 ; -@@ -370,7 +371,7 @@ KPX y period -74 - KPX y comma -74 - EndKernPairs - EndKernData --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 191 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 83 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 191 ; -@@ -427,6 +428,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 200 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 146 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 222 191 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 139 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 197 191 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 111 0 ; - EndComposites ---- afm/phvbo.afm -+++ afm/phvbo.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 729 - XHeight 542 - Descender -219 - Ascender 729 --StartCharMetrics 228 -+StartCharMetrics 229 - C 32 ; WX 278 ; N space ; B 0 0 0 0 ; - C 33 ; WX 333 ; N exclam ; B 112 0 417 729 ; - C 34 ; WX 474 ; N quotedbl ; B 177 470 579 729 ; -@@ -231,6 +231,7 @@ C -1 ; WX 834 ; N onehalf ; B 120 -20 87 - C -1 ; WX 834 ; N onequarter ; B 151 -20 846 715 ; - C -1 ; WX 333 ; N onesuperior ; B 169 284 398 709 ; - C -1 ; WX 611 ; N otilde ; B 82 -23 639 729 ; -+C -1 ; WX 833 ; N Euro ; B 66 0 931 729 ; - C -1 ; WX 584 ; N plusminus ; B 40 0 639 674 ; - C -1 ; WX 737 ; N registered ; B 55 -20 837 745 ; - C -1 ; WX 556 ; N scaron ; B 60 -23 597 745 ; -@@ -368,7 +369,7 @@ KPX y period -37 - KPX y comma -37 - EndKernPairs - EndKernData --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 187 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 83 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 187 ; -@@ -425,6 +426,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 139 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 222 187 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 139 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 194 187 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 111 0 ; - EndComposites ---- afm/phvr.afm -+++ afm/phvr.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 729 - XHeight 525 - Descender -219 - Ascender 729 --StartCharMetrics 228 -+StartCharMetrics 229 - C 32 ; WX 278 ; N space ; B 0 0 0 0 ; - C 33 ; WX 278 ; N exclam ; B 124 0 208 729 ; - C 34 ; WX 355 ; N quotedbl ; B 52 462 305 708 ; -@@ -231,6 +231,7 @@ C -1 ; WX 834 ; N onehalf ; B 30 -21 804 - C -1 ; WX 834 ; N onequarter ; B 30 -21 804 709 ; - C -1 ; WX 333 ; N onesuperior ; B 60 284 219 709 ; - C -1 ; WX 556 ; N otilde ; B 36 -23 510 716 ; -+C -1 ; WX 833 ; N Euro ; B 75 0 761 729 ; - C -1 ; WX 584 ; N plusminus ; B 40 0 544 618 ; - C -1 ; WX 737 ; N registered ; B -13 -23 751 741 ; - C -1 ; WX 500 ; N scaron ; B 34 -24 459 740 ; -@@ -374,7 +375,7 @@ KPX y period -74 - KPX y comma -74 - EndKernPairs - EndKernData --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 199 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 83 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 199 ; -@@ -431,6 +432,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 200 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 117 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 222 199 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 111 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 167 199 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 111 0 ; - EndComposites ---- afm/phvro.afm -+++ afm/phvro.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 729 - XHeight 525 - Descender -219 - Ascender 729 --StartCharMetrics 228 -+StartCharMetrics 229 - C 32 ; WX 278 ; N space ; B 0 0 0 0 ; - C 33 ; WX 278 ; N exclam ; B 124 0 363 729 ; - C 34 ; WX 355 ; N quotedbl ; B 177 462 455 708 ; -@@ -231,6 +231,7 @@ C -1 ; WX 834 ; N onehalf ; B 116 -21 86 - C -1 ; WX 834 ; N onequarter ; B 147 -21 836 709 ; - C -1 ; WX 333 ; N onesuperior ; B 184 284 370 709 ; - C -1 ; WX 556 ; N otilde ; B 80 -23 583 716 ; -+C -1 ; WX 833 ; N Euro ; B 75 0 916 729 ; - C -1 ; WX 584 ; N plusminus ; B 40 0 621 618 ; - C -1 ; WX 737 ; N registered ; B 55 -23 836 741 ; - C -1 ; WX 500 ; N scaron ; B 61 -24 547 740 ; -@@ -367,7 +368,7 @@ KPX y period -74 - KPX y comma -74 - EndKernPairs - EndKernData --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 204 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 83 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 204 ; -@@ -424,6 +425,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 111 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 222 204 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 111 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 167 204 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 111 0 ; - EndComposites ---- afm/ptmb.afm -+++ afm/ptmb.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 681 - XHeight 460 - Descender -210 - Ascender 670 --StartCharMetrics 228 -+StartCharMetrics 229 - C 32 ; WX 250 ; N space ; B 0 0 0 0 ; - C 33 ; WX 333 ; N exclam ; B 84 -18 248 690 ; - C 34 ; WX 555 ; N quotedbl ; B 67 371 425 690 ; -@@ -231,6 +231,7 @@ C -1 ; WX 750 ; N onehalf ; B 30 -18 720 - C -1 ; WX 750 ; N onequarter ; B 30 -18 720 690 ; - C -1 ; WX 300 ; N onesuperior ; B 24 276 275 690 ; - C -1 ; WX 500 ; N otilde ; B 25 -18 473 671 ; -+C -1 ; WX 944 ; N Euro ; B 21 0 914 681 ; - C -1 ; WX 570 ; N plusminus ; B 50 0 520 600 ; - C -1 ; WX 747 ; N registered ; B 16 -17 730 690 ; - C -1 ; WX 389 ; N scaron ; B 29 -17 359 690 ; -@@ -393,7 +394,7 @@ KPX y period -55 - KPX y comma -55 - EndKernPairs - EndKernData --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 167 219 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 55 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 111 219 ; -@@ -450,6 +451,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 111 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 222 219 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 83 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 187 219 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 76 0 ; - EndComposites ---- afm/ptmbi.afm -+++ afm/ptmbi.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 662 - XHeight 458 - Descender -203 - Ascender 682 --StartCharMetrics 228 -+StartCharMetrics 229 - C 32 ; WX 250 ; N space ; B 0 0 0 0 ; - C 33 ; WX 389 ; N exclam ; B 66 -13 367 676 ; - C 34 ; WX 555 ; N quotedbl ; B 142 367 549 693 ; -@@ -231,6 +231,7 @@ C -1 ; WX 750 ; N onehalf ; B 30 0 720 6 - C -1 ; WX 750 ; N onequarter ; B 30 0 720 676 ; - C -1 ; WX 300 ; N onesuperior ; B 17 270 283 676 ; - C -1 ; WX 500 ; N otilde ; B 27 -13 508 648 ; -+C -1 ; WX 889 ; N Euro ; B -29 -12 907 662 ; - C -1 ; WX 570 ; N plusminus ; B 33 0 537 665 ; - C -1 ; WX 747 ; N registered ; B 23 -18 723 676 ; - C -1 ; WX 389 ; N scaron ; B 16 -13 465 683 ; -@@ -377,7 +378,7 @@ KPX y period -37 - KPX y comma -37 - EndKernPairs - EndKernData --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 204 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 28 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 111 204 ; -@@ -434,6 +435,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 111 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 194 204 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 83 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 167 204 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 83 0 ; - EndComposites ---- afm/ptmi.afm -+++ afm/ptmi.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 660 - XHeight 446 - Descender -206 - Ascender 684 --StartCharMetrics 228 -+StartCharMetrics 229 - C 32 ; WX 250 ; N space ; B 0 0 0 0 ; - C 33 ; WX 333 ; N exclam ; B 46 -10 296 670 ; - C 34 ; WX 420 ; N quotedbl ; B 107 442 402 673 ; -@@ -231,6 +231,7 @@ C -1 ; WX 750 ; N onehalf ; B 30 -15 720 - C -1 ; WX 750 ; N onequarter ; B 30 -15 720 684 ; - C -1 ; WX 300 ; N onesuperior ; B 43 274 277 683 ; - C -1 ; WX 500 ; N otilde ; B 27 -13 476 639 ; -+C -1 ; WX 833 ; N Euro ; B -24 0 850 660 ; - C -1 ; WX 675 ; N plusminus ; B 85 0 589 645 ; - C -1 ; WX 760 ; N registered ; B 40 -22 719 672 ; - C -1 ; WX 389 ; N scaron ; B 16 -14 450 669 ; -@@ -389,7 +390,7 @@ KPX y period -55 - KPX y comma -55 - EndKernPairs - EndKernData --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 111 227 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 28 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 83 227 ; -@@ -446,6 +447,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 181 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 76 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 221 227 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 89 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 80 227 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 29 0 ; - EndComposites ---- afm/ptmr.afm -+++ afm/ptmr.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -17,7 +17,7 @@ CapHeight 662 - XHeight 448 - Descender -217 - Ascender 682 --StartCharMetrics 228 -+StartCharMetrics 229 - C 32 ; WX 250 ; N space ; B 0 0 0 0 ; - C 33 ; WX 333 ; N exclam ; B 109 -14 224 676 ; - C 34 ; WX 408 ; N quotedbl ; B 70 445 337 685 ; -@@ -231,6 +231,7 @@ C -1 ; WX 750 ; N onehalf ; B 30 -14 720 - C -1 ; WX 750 ; N onequarter ; B 30 -14 720 676 ; - C -1 ; WX 300 ; N onesuperior ; B 58 270 242 676 ; - C -1 ; WX 500 ; N otilde ; B 30 -10 470 638 ; -+C -1 ; WX 889 ; N Euro ; B 19 0 871 662 ; - C -1 ; WX 564 ; N plusminus ; B 30 0 534 612 ; - C -1 ; WX 760 ; N registered ; B 43 -14 718 676 ; - C -1 ; WX 389 ; N scaron ; B 39 -10 351 674 ; -@@ -382,7 +383,7 @@ KPX y period -65 - KPX y comma -65 - EndKernPairs - EndKernData --StartComposites 58 -+StartComposites 59 - CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 214 ; - CC zcaron 2 ; PCC z 0 0 ; PCC caron 55 0 ; - CC Scaron 2 ; PCC S 0 0 ; PCC caron 111 214 ; -@@ -439,6 +440,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 - CC ntilde 2 ; PCC n 0 0 ; PCC tilde 83 0 ; - CC Otilde 2 ; PCC O 0 0 ; PCC tilde 194 214 ; - CC otilde 2 ; PCC o 0 0 ; PCC tilde 83 0 ; -+CC Euro 2 ; PCC C 0 0 ; PCC equal 0 0 ; - CC Aring 2 ; PCC A 0 0 ; PCC ring 194 214 ; - CC aring 2 ; PCC a 0 0 ; PCC ring 55 0 ; - EndComposites ---- contrib/emacs/a2ps.el -+++ contrib/emacs/a2ps.el 2006-02-23 12:05:17.000000000 +0000 -@@ -44,7 +44,7 @@ - ;; a2ps-compile-regexp - - ;;path to the a2ps program --(defvar a2ps-program "/usr/local/bin/a2ps") -+(defvar a2ps-program "/usr/bin/a2ps") - - ;;thank god for make-regexp.el! - (defvar a2ps-font-lock-keywords ---- doc/Makefile.in -+++ doc/Makefile.in 2006-02-23 12:05:17.000000000 +0000 -@@ -1,4 +1,4 @@ --# Makefile.in generated automatically by automake 1.4a from Makefile.am -+# Makefile.in generated automatically by automake 1.4 from Makefile.am - - # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation -@@ -10,6 +10,7 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - -+ - SHELL = @SHELL@ - - srcdir = @srcdir@ -@@ -45,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_FLAG = - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -57,8 +57,6 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -- --@SET_MAKE@ - host_alias = @host_alias@ - host_triplet = @host@ - AMDEP = @AMDEP@ -@@ -130,7 +128,6 @@ file_prog = @file_prog@ - l = @l@ - lispdir = @lispdir@ - -- - info_TEXINFOS = a2ps.texi regex.texi - - TEXI2DVI = $(top_srcdir)/contrib/texi2dvi4a2ps -@@ -141,23 +138,19 @@ xa2ps = $(top_builddir)/src/a2ps - defs = $(top_builddir)/tests/defs - A2PS = a2ps - --generated_texinfos = \ --encoding.texi prologue.texi sheets.texi translators.texi -+generated_texinfos = encoding.texi prologue.texi sheets.texi translators.texi - - - MAINTAINERCLEANFILES = $(generated_texinfos) - --EXTRA_DIST = $(generated_texinfos) .a2psrc translators.txt \ --make-authors.pl translators.pl -+EXTRA_DIST = $(generated_texinfos) .a2psrc translators.txt make-authors.pl translators.pl - - - usdvi = $(PACKAGE)-$(VERSION).us.dvi - a4dvi = $(PACKAGE)-$(VERSION).a4.dvi --subdir = doc - mkinstalldirs = $(SHELL) $(top_srcdir)/auxdir/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = --DIST_SOURCES = - TEXINFO_TEX = $(top_srcdir)/auxdir/texinfo.tex - INFO_DEPS = a2ps.info regex.info - DVIS = a2ps.dvi regex.dvi -@@ -165,8 +158,9 @@ TEXINFOS = a2ps.texi regex.texi - DIST_COMMON = Makefile.am Makefile.in stamp-vti version.texi - - --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -+TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: -@@ -218,7 +212,7 @@ DVIPS = dvips - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - - .texi.dvi: -- TEXINPUTS=$(top_srcdir)/auxdir:$$TEXINPUTS \ -+ TEXINPUTS=$(top_srcdir)/auxdir/texinfo.tex:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< - - .texi: -@@ -237,7 +231,7 @@ DVIPS = dvips - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - - .texinfo.dvi: -- TEXINPUTS=$(top_srcdir)/auxdir:$$TEXINPUTS \ -+ TEXINPUTS=$(top_srcdir)/auxdir/texinfo.tex:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< - - .txi.info: -@@ -246,7 +240,7 @@ DVIPS = dvips - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - - .txi.dvi: -- TEXINPUTS=$(top_srcdir)/auxdir:$$TEXINPUTS \ -+ TEXINPUTS=$(top_srcdir)/auxdir/texinfo.tex:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< - - .txi: -@@ -262,7 +256,7 @@ install-info-am: $(INFO_DEPS) - @list='$(INFO_DEPS)'; \ - for file in $$list; do \ - d=$(srcdir); \ -- for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ -+ for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ - if test -f $$d/$$ifile; then \ - echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \ - $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ -@@ -281,26 +275,24 @@ install-info-am: $(INFO_DEPS) - uninstall-info: - $(PRE_UNINSTALL) - @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ -- list='$(INFO_DEPS)'; \ -- for file in $$list; do \ -- echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \ -- install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \ -- done; \ -- else :; fi -+ ii=yes; \ -+ else ii=; fi; \ -+ list='$(INFO_DEPS)'; \ -+ for file in $$list; do \ -+ test -z "$ii" \ -+ || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ -+ done - @$(NORMAL_UNINSTALL) -- @list='$(INFO_DEPS)'; \ -+ list='$(INFO_DEPS)'; \ - for file in $$list; do \ -- (if cd $(DESTDIR)$(infodir); then \ -- echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \ -- rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \ -- else :; fi); \ -+ (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ - done - - dist-info: $(INFO_DEPS) - list='$(INFO_DEPS)'; \ - for base in $$list; do \ - d=$(srcdir); \ -- for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \ -+ for file in `cd $$d && eval echo $$base*`; do \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ -@@ -308,14 +300,13 @@ dist-info: $(INFO_DEPS) - done - - mostlyclean-aminfo: -- -rm -f a2ps.aux a2ps.cp a2ps.cps a2ps.dvi a2ps.fn a2ps.fns a2ps.pgs \ -- a2ps.ky a2ps.kys a2ps.ps a2ps.log a2ps.pg a2ps.toc a2ps.tp \ -- a2ps.tps a2ps.vr a2ps.vrs a2ps.op a2ps.tr a2ps.cv a2ps.cn \ -- a2ps.cm a2ps.ov regex.aux regex.cp regex.cps regex.dvi \ -- regex.fn regex.fns regex.pgs regex.ky regex.kys regex.ps \ -- regex.log regex.pg regex.toc regex.tp regex.tps regex.vr \ -- regex.vrs regex.op regex.tr regex.cv regex.cn regex.cm \ -- regex.ov -+ -rm -f a2ps.aux a2ps.cp a2ps.cps a2ps.dvi a2ps.fn a2ps.fns a2ps.ky \ -+ a2ps.kys a2ps.ps a2ps.log a2ps.pg a2ps.toc a2ps.tp a2ps.tps \ -+ a2ps.vr a2ps.vrs a2ps.op a2ps.tr a2ps.cv a2ps.cn regex.aux \ -+ regex.cp regex.cps regex.dvi regex.fn regex.fns regex.ky \ -+ regex.kys regex.ps regex.log regex.pg regex.toc regex.tp \ -+ regex.tps regex.vr regex.vrs regex.op regex.tr regex.cv \ -+ regex.cn - - clean-aminfo: - -@@ -334,11 +325,18 @@ TAGS: - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -+subdir = doc -+ - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pR $$d/$$file $(distdir); \ -+ cp -pr $$/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -@@ -368,7 +366,7 @@ uninstall: uninstall-am - all-am: Makefile $(INFO_DEPS) - all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install -+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(infodir) - -@@ -382,7 +380,6 @@ distclean-generic: - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - - maintainer-clean-generic: -- -rm -f Makefile.in - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - mostlyclean-am: mostlyclean-vti mostlyclean-aminfo mostlyclean-generic - -@@ -393,7 +390,6 @@ clean-am: clean-vti clean-aminfo clean- - clean: clean-am - - distclean-am: distclean-vti distclean-aminfo distclean-generic clean-am -- -rm -f libtool - - distclean: distclean-am - -@@ -409,8 +405,8 @@ install-info-am uninstall-info mostlycle - clean-aminfo maintainer-clean-aminfo tags distdir info-am info dvi-am \ - dvi check check-am installcheck-am installcheck install-exec-am \ - install-exec install-data-am install-data install-am install \ --uninstall-am uninstall all-redirect all-am all install-strip \ --installdirs mostlyclean-generic distclean-generic clean-generic \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ - maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - ---- doc/a2ps.texi -+++ doc/a2ps.texi 2006-02-23 12:05:17.000000000 +0000 -@@ -6182,7 +6182,7 @@ Error related questions. - @subsection Why Does it Print Nothing? - - @quotation --@i{@pack{} works OK, but the printer prints nothing.} -+@pack{} @i{works OK, but the printer prints nothing.} - @end quotation - - There are two ways that printing can fail: silently, or with a -@@ -6311,7 +6311,7 @@ If it is incorrect, ask for help around - @subsection Why Does it Say my File is Binary? - - @quotation --@i{@pack{} complains that my file is binary though it is not.} -+@pack{} @i{complains that my file is binary though it is not.} - @end quotation - - There are several reasons that can cause @pack{} to consider a file is ---- encoding/encoding.map -+++ encoding/encoding.map 2006-02-23 12:05:17.000000000 +0000 -@@ -84,6 +84,10 @@ iso15 iso15 - latin9 iso15 - latin0 iso15 - iso-8859-15 iso15 -+# Handle ASCII as simple ISO 8859-1 -+ansi_x3.4-1968 iso15 -+# Workaround wich may help for UTF-8 -+utf-8 iso15 - - ######################################################################## - # Other encodings ---- etc/Makefile.in -+++ etc/Makefile.in 2006-02-23 12:05:17.000000000 +0000 -@@ -297,7 +297,7 @@ uninstall-local: - - # Building the correct a2ps.cfg - a2ps.cfg: a2ps_cfg Makefile -- sed "s!@libpath@!$(libpath)!" a2ps_cfg > a2ps.cfg -+ sed "s!@libpath@!$(libpath)!;s!@psfontpath@!$(PSFONT_PATH)!" a2ps_cfg > a2ps.cfg - - # Building a time stamp to know the version. - README: README.in Makefile ---- etc/a2ps_cfg.in -+++ etc/a2ps_cfg.in 2010-08-17 11:16:45.035125629 +0000 -@@ -43,26 +43,56 @@ - # (Must be defined before --medium) # - ################################################################# - # Medium: name, width height [llx lly urx ury] --Medium: A3 842 1190 --Medium: A4 595 842 --Medium: A5 420 595 --Medium: B4 729 1032 --Medium: B5 516 729 --Medium: Letter 612 792 --Medium: Legal 612 1008 --Medium: Tabloid 792 1224 --Medium: Ledger 1224 792 --Medium: Statement 396 612 --Medium: Executive 540 720 --Medium: Folio 612 936 --Medium: Quarto 610 780 --Medium: 10x14 720 1008 -+Medium: A3 842 1190 -+Medium: A4 595 842 -+Medium: A5 420 595 -+Medium: B4 729 1032 -+Medium: B5 516 729 -+Medium: Letter 612 792 -+Medium: Legal 612 1008 -+Medium: Tabloid 792 1224 -+Medium: Ledger 1224 792 -+Medium: Statement 396 612 -+Medium: Executive 540 720 -+Medium: Folio 612 936 -+Medium: Quarto 610 780 -+Medium: 10x14 720 1008 -+ -+# Define ghostscript page names and their sizes -+Medium: letter 612 792 -+Medium: note 540 720 -+Medium: legal 612 1008 -+Medium: a0 2380 3368 -+Medium: a1 1684 2380 -+Medium: a2 1190 1684 -+Medium: a3 842 1190 -+Medium: a4 595 842 -+Medium: a5 421 595 -+Medium: a6 297 421 -+Medium: a7 210 297 -+Medium: a8 148 210 -+Medium: a9 105 148 -+Medium: a10 74 105 -+Medium: b0 2836 4008 -+Medium: b1 2004 2836 -+Medium: b2 1418 2004 -+Medium: b3 1002 1418 -+Medium: b4 709 1002 -+Medium: b5 501 709 -+Medium: archE 2592 3456 -+Medium: archD 1728 2592 -+Medium: archC 1296 1728 -+Medium: archB 864 1296 -+Medium: archA 648 864 -+Medium: flsa 612 936 -+Medium: flse 612 936 -+Medium: halfletter 396 612 -+Medium: 11x17 792 1224 -+Medium: ledger 1224 792 - - # Desk Jet users: bigger margins --Medium: A4dj 595 842 24 50 571 818 --Medium: Letterdj 612 792 24 40 588 768 -- -- -+Medium: A4dj 595 842 24 50 571 818 -+Medium: Letterdj 612 792 24 40 588 768 - - ################################################################# - # 2) Path to the a2ps resource # -@@ -72,7 +102,7 @@ LibraryPath: @libpath@ - - # It may be useful to extend it so that a2ps can see some - # TeX or X11 resources: it likes AFM files and PF[AB] files. --#AppendLibraryPath: foo -+AppendLibraryPath: @psfontpath@ - - - ################################################################# -@@ -190,8 +220,9 @@ Variable: del.metapost \ - # Either GV (prefered) or Ghostview will be used as the "display" printer - # We give -dNOPLATFONTS so that real fonts are used - # (Strange results appear with Ogonkify's fonts for instance). --@COM_ghostview@Variable: ghostview @ghostview@ -arguments=-dNOPLATFONTS --@COM_gv@Variable: ghostview @gv@ -antialias -arguments=-dNOPLATFONTS -+##@COM_ghostview@Variable: ghostview @ghostview@ -arguments=-dNOPLATFONTS -+#@COM_gv@Variable: ghostview @gv@ -antialias -arguments=-dNOPLATFONTS -+Variable: ghostview a2ps-open - - # Used for the `pdf' printer. - # Use as `#{ps2pdf} INPUT OUTPUT'. -@@ -267,31 +298,16 @@ Delegation: utf8 utf8:plain iconv -c -f - @COM_PSUTILS@@COM_dvips@ fi - - ########## HTML files --# Pass HTML to Netscape, hoping that there is an Netscape running... --# Tricks: --# 1. Netscape can't output on stdout, hence use a tmp file (#f0) --# 2. openfile refuses relative paths, so prepend cwd (%d) when relative --# 3. remote 'openfile' -remote 'saveas' is bad, because it is handled --# asynchronously, and the output can correspond to a previously --# loaded page (not that of openfile). So run Netscape twice. --# 4. It asks the user if s/he wants to replace an existing output file, --# so rm before. --@COM_PSUTILS@Delegation: Netscape html:ps \ --@COM_PSUTILS@ rm -f #f0; \ --@COM_PSUTILS@ if echo '$f' | grep '^/' >/dev/null 2>&1; then \ --@COM_PSUTILS@ ${NETSCAPE:-netscape} -noraise -remote 'openfile($f)'; \ --@COM_PSUTILS@ else \ --@COM_PSUTILS@ ${NETSCAPE:-netscape} -noraise -remote 'openfile(%d/$f)'; \ --@COM_PSUTILS@ fi && \ --@COM_PSUTILS@ ${NETSCAPE:-netscape} -noraise -remote 'saveas(#f0,postscript)' && \ --@COM_PSUTILS@ #{del.psselect} #f0 | #{del.psnup} -+# Pass HTML to w3m, hoping that there is an installed w3m... -+@COM_PSUTILS@Delegation: w3m html:ps \ -+@COM_PSUTILS@ ${W3M:-w3m} -dump '$f' | #{del.a2ps} - - ########## MetaFont / MetaPost files - Delegation: MetaFont mf:ps \ -- #{del.metafont} && #{dvips} $N.dvi | #{psnup} -+ #{del.metafont} && #{dvips} $N.dvi | #{del.psnup} - - Delegation: MetaPost mp:ps \ -- #{del.metapost} && #{dvips} $N.dvi | #{psnup} -+ #{del.metapost} && #{dvips} $N.dvi | #{del.psnup} - - ########## PDF files - # Delegated to pdf2ps, GS 5.50 ---- lib/jobs.c -+++ lib/jobs.c 2006-02-23 12:05:17.000000000 +0000 -@@ -134,10 +134,19 @@ a2ps_job_new (void) - - /* Set the NLS on */ - setlocale (LC_TIME, ""); --#ifdef HAVE_LC_MESSAGES -+#ifdef LC_MESSAGES - setlocale (LC_MESSAGES, ""); - #endif - setlocale (LC_CTYPE, ""); -+#ifdef LC_PAPER -+ setlocale (LC_PAPER, ""); -+#endif -+ -+#ifdef LC_NUMERIC -+ /* We use international numbering format for e.g. -+ --font-size and writing PostScript code */ -+ setlocale (LC_NUMERIC, "POSIX"); -+#endif - - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); ---- lib/metaseq.c -+++ lib/metaseq.c 2006-02-23 12:05:17.000000000 +0000 -@@ -205,7 +205,7 @@ grow_user_string_obstack (struct obstack - int justification = 1; - - /* Format string. */ -- for (i = 0; str[i] != '\0'; i++) -+ for (i = 0; str != NULL && str[i] != '\0'; i++) - { - int type; - ---- lib/options.c -+++ lib/options.c 2006-02-23 12:05:17.000000000 +0000 -@@ -54,10 +54,14 @@ - #include "argv.h" - #include "quotearg.h" - #include "filalign.h" -+#include -+#include - - #define MAN_LINES 66 /* no lines for a man */ - extern char *program_name; -+#ifndef _GNU_SOURCE - extern const char *program_invocation_name; -+#endif - - /* - * Hooks used -@@ -545,6 +549,16 @@ a2ps_handle_options (a2ps_job * job, int - break; - - case 'M': /* select a medium */ -+#ifdef LC_PAPER -+ if (!strcasecmp("LC_PAPER", optarg)) -+ { -+ unsigned int paperheight = (unsigned int)nl_langinfo(_NL_PAPER_HEIGHT); -+ if (paperheight && paperheight == 279) -+ optarg = xstrdup("letter"); -+ else -+ optarg = xstrdup("a4"); -+ } -+#endif - xstrcpy (job->medium_request, optarg); - break; - -@@ -647,6 +661,14 @@ a2ps_handle_options (a2ps_job * job, int - break; - - case 'X': /* change the encoding scheme */ -+ if (!strcasecmp("LC_CTYPE", optarg)) -+ { -+ char * codeset = nl_langinfo(_NL_CTYPE_CODESET_NAME); -+ if (codeset && !strncasecmp(codeset, "iso", 3)) -+ optarg = xstrdup(codeset); -+ else -+ optarg = xstrdup("ISO-8859-15"); -+ } - /* Since there can be -X in the config files, and because - * the encoding.map has not been read yet (because to read - * encoding.map, one has to know the lib path, and to know ---- lib/path-concat.c -+++ lib/path-concat.c 2006-02-23 12:05:17.000000000 +0000 -@@ -21,17 +21,15 @@ - # include - #endif - --#ifndef HAVE_MEMPCPY --# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N))) --#endif -- - #include - #if HAVE_STRING_H - # include - #endif - #include - --char *malloc (); -+#if !defined(HAVE_MEMPCPY) && !defined(mempcpy) -+# define mempcpy(D, S, N) ((void *) ((char *) memcpy ((D), (S), (N)) + (N))) -+#endif - - #ifndef DIRECTORY_SEPARATOR - # define DIRECTORY_SEPARATOR '/' ---- lib/printlen.c -+++ lib/printlen.c 2006-02-23 12:05:17.000000000 +0000 -@@ -28,14 +28,15 @@ Foundation, Inc., 59 Temple Place - Suit - unsigned long strtoul (); - - static int --int_printflen (const char *format, va_list *args) -+int_printflen (const char *format, va_list args) - { - const char *cp; - int total_width = 0; - int width = 0; - va_list ap; - -- memcpy (&ap, args, sizeof (va_list)); -+ // memcpy (&ap, args, sizeof (va_list)); -+ __va_copy(ap, args); - - for (cp = format ; *cp ; cp++) - { -@@ -99,7 +100,7 @@ int_printflen (const char *format, va_li - int - vprintflen (const char *format, va_list args) - { -- return int_printflen (format, &args); -+ return int_printflen (format, args); - } - - int ---- lib/title.c -+++ lib/title.c 2006-02-23 12:05:17.000000000 +0000 -@@ -87,11 +87,13 @@ title (stream, c, center_p, format, va_a - VA_START (args, format); - - len = vprintflen (format, args); -+ va_end(args); - if (format [strlen (format) - 1] == '\n') - len --; - if (center_p) - for (padding = 0 ; padding < 79 - len ; padding += 2) - putc (' ', stream); -+ VA_START (args, format); - # if HAVE_VPRINTF || _LIBC - vfprintf (stream, format, args); - # else ---- lib/xstrrpl.c -+++ lib/xstrrpl.c 2006-02-23 12:05:17.000000000 +0000 -@@ -22,6 +22,7 @@ - #include - #include "xstrrpl.h" - -+#undef stpcpy - extern char * stpcpy(); - - /* Perform subsitutions in string. Result is malloc'd ---- man/a2ps.1 -+++ man/a2ps.1 2006-02-23 12:05:17.000000000 +0000 -@@ -80,8 +80,8 @@ first fill (DIRECTION=) rows, or columns - predefined font sizes and layouts for 1.. 9 virtuals - .TP - \fB\-A\fR, \fB\-\-file\-align\fR=\fIMODE\fR --align separate files according to MODE (fill, rank --page, sheet, or a number) -+align separate files according to MODE (`virtual', `rank' -+`page', `sheet', or a number) - .TP - \fB\-j\fR, \fB\-\-borders\fR* - print borders around columns ---- ogonkify/Makefile.in -+++ ogonkify/Makefile.in 2006-02-23 12:05:17.000000000 +0000 -@@ -138,7 +138,7 @@ PSPROGS = allchars.ps compose.ps helper. - - @EXTENSIONS_TRUE@bin_SCRIPTS = @EXTENSIONS_TRUE@ogonkify composeglyphs - @EXTENSIONS_TRUE@ogonkify_DATA = @EXTENSIONS_TRUE@$(ENCODINGS_VECTORS) $(CREATED_FONTS) $(PSPROGS) README --@EXTENSIONS_TRUE@afm_DATA = @EXTENSIONS_TRUE@$(CREATED_AFMS) -+@EXTENSIONS_TRUE@afm_DATA = @EXTENSIONS_TRUE@$(CREATED_AFMS) $(ORIGINAL_COMP_FONTS_AFMS) - @EXTENSIONS_TRUE@fonts_DATA = @EXTENSIONS_TRUE@$(CREATED_PFAS) - - # ---- ogonkify/ogonkify.in.in -+++ ogonkify/ogonkify.in.in 2006-02-23 12:05:17.000000000 +0000 -@@ -38,7 +38,7 @@ $encoding='L2'; - 'ibmpc','IBMPCEncoding', 'mac','MacintoshEncoding', - 'HP','HPRomanEncoding'); - @standardFont= -- ('Courier', 'Courier-Oblique', 'Courier-Bold', 'Courier-BoldItalic', -+ ('Courier', 'Courier-Oblique', 'Courier-Bold', 'Courier-BoldOblique', - 'Times-Roman', 'Times-Italic', 'Times-Bold', 'Times-BoldItalic', - 'Helvetica', 'Helvetica-Oblique', 'Helvetica-Bold', - 'Helvetica-BoldOblique'); ---- ogonkify/pcrb-o.afm -+++ ogonkify/pcrb-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Courier-Bold-Ogonki - EncodingScheme StandardEncoding - FullName Courier-Bold-Ogonki Composite font - FontBBox -113 -250 749 801 --StartCharMetrics 315 -+StartCharMetrics 316 - C 32 ; WX 600 ; N space ; B 0 0 0 0 ; - C 33 ; WX 600 ; N exclam ; B 202 -15 398 572 ; - C 34 ; WX 600 ; N quotedbl ; B 135 277 465 562 ; -@@ -204,6 +204,7 @@ C -1 ; WX 600 ; N Igrave ; B 77 0 523 78 - C -1 ; WX 600 ; N brokenbar ; B 255 -175 345 675 ; - C -1 ; WX 600 ; N Oacute ; B 22 -18 578 784 ; - C -1 ; WX 600 ; N otilde ; B 30 -15 570 636 ; -+C -1 ; WX 600 ; N Euro ; B -2 0 602 562 ; - C -1 ; WX 600 ; N Yacute ; B 12 0 589 784 ; - C -1 ; WX 600 ; N Icircumflex ; B 77 0 523 780 ; - C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ; ---- ogonkify/pcrbo-o.afm -+++ ogonkify/pcrbo-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Courier-BoldOblique-Ogonki - EncodingScheme StandardEncoding - FullName Courier-BoldOblique-Ogonki Composite font - FontBBox -56 -250 868 801 --StartCharMetrics 315 -+StartCharMetrics 316 - C 32 ; WX 600 ; N space ; B 0 0 0 0 ; - C 33 ; WX 600 ; N exclam ; B 216 -15 495 572 ; - C 34 ; WX 600 ; N quotedbl ; B 212 277 584 562 ; -@@ -204,6 +204,7 @@ C -1 ; WX 600 ; N Igrave ; B 77 0 642 78 - C -1 ; WX 600 ; N brokenbar ; B 218 -175 488 675 ; - C -1 ; WX 600 ; N Oacute ; B 74 -18 645 784 ; - C -1 ; WX 600 ; N otilde ; B 71 -15 642 636 ; -+C -1 ; WX 600 ; N Euro ; B -2 0 721 562 ; - C -1 ; WX 600 ; N Yacute ; B 109 0 708 784 ; - C -1 ; WX 600 ; N Icircumflex ; B 77 0 642 780 ; - C -1 ; WX 600 ; N Atilde ; B -9 0 638 759 ; ---- ogonkify/pcrr-o.afm -+++ ogonkify/pcrr-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Courier-Ogonki - EncodingScheme StandardEncoding - FullName Courier-Ogonki Composite font - FontBBox -28 -250 628 805 --StartCharMetrics 315 -+StartCharMetrics 316 - C 32 ; WX 600 ; N space ; B 0 0 0 0 ; - C 33 ; WX 600 ; N exclam ; B 236 -15 364 572 ; - C 34 ; WX 600 ; N quotedbl ; B 187 328 413 562 ; -@@ -204,6 +204,7 @@ C -1 ; WX 600 ; N Igrave ; B 96 0 504 79 - C -1 ; WX 600 ; N brokenbar ; B 275 -175 326 675 ; - C -1 ; WX 600 ; N Oacute ; B 43 -18 557 793 ; - C -1 ; WX 600 ; N otilde ; B 62 -15 538 606 ; -+C -1 ; WX 600 ; N Euro ; B 4 0 596 562 ; - C -1 ; WX 600 ; N Yacute ; B 24 0 576 793 ; - C -1 ; WX 600 ; N Icircumflex ; B 96 0 504 775 ; - C -1 ; WX 600 ; N Atilde ; B 3 0 597 732 ; ---- ogonkify/pcrro-o.afm -+++ ogonkify/pcrro-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Courier-Oblique-Ogonki - EncodingScheme StandardEncoding - FullName Courier-Oblique-Ogonki Composite font - FontBBox -28 -250 742 805 --StartCharMetrics 315 -+StartCharMetrics 316 - C 32 ; WX 600 ; N space ; B 0 0 0 0 ; - C 33 ; WX 600 ; N exclam ; B 243 -15 464 572 ; - C 34 ; WX 600 ; N quotedbl ; B 273 328 532 562 ; -@@ -204,6 +204,7 @@ C -1 ; WX 600 ; N Igrave ; B 96 0 623 79 - C -1 ; WX 600 ; N brokenbar ; B 238 -175 469 675 ; - C -1 ; WX 600 ; N Oacute ; B 94 -18 638 793 ; - C -1 ; WX 600 ; N otilde ; B 102 -15 629 606 ; -+C -1 ; WX 600 ; N Euro ; B 4 0 715 562 ; - C -1 ; WX 600 ; N Yacute ; B 133 0 695 793 ; - C -1 ; WX 600 ; N Icircumflex ; B 96 0 623 775 ; - C -1 ; WX 600 ; N Atilde ; B 3 0 656 732 ; ---- ogonkify/phvb-o.afm -+++ ogonkify/phvb-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Helvetica-Bold-Ogonki - EncodingScheme StandardEncoding - FullName Helvetica-Bold-Ogonki Composite font - FontBBox -173 -221 1003 936 --StartCharMetrics 285 -+StartCharMetrics 286 - C 32 ; WX 278 ; N space ; B 0 0 0 0 ; - C 33 ; WX 333 ; N exclam ; B 112 0 262 729 ; - C 34 ; WX 474 ; N quotedbl ; B 50 470 424 729 ; -@@ -219,6 +219,7 @@ C -1 ; WX 834 ; N onehalf ; B 30 -20 803 - C -1 ; WX 834 ; N onequarter ; B 30 -20 804 715 ; - C -1 ; WX 333 ; N onesuperior ; B 46 284 247 709 ; - C -1 ; WX 611 ; N otilde ; B 35 -23 569 729 ; -+C -1 ; WX 833 ; N Euro ; B 66 0 776 729 ; - C -1 ; WX 584 ; N plusminus ; B 40 0 544 674 ; - C -1 ; WX 737 ; N registered ; B -14 -20 751 745 ; - C -1 ; WX 556 ; N scaron ; B 29 -23 520 745 ; ---- ogonkify/phvbo-o.afm -+++ ogonkify/phvbo-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Helvetica-BoldOblique-Ogonki - EncodingScheme StandardEncoding - FullName Helvetica-BoldOblique-Ogonki Composite font - FontBBox -177 -221 1107 936 --StartCharMetrics 285 -+StartCharMetrics 286 - C 32 ; WX 278 ; N space ; B 0 0 0 0 ; - C 33 ; WX 333 ; N exclam ; B 112 0 417 729 ; - C 34 ; WX 474 ; N quotedbl ; B 177 470 579 729 ; -@@ -219,6 +219,7 @@ C -1 ; WX 834 ; N onehalf ; B 120 -20 87 - C -1 ; WX 834 ; N onequarter ; B 151 -20 846 715 ; - C -1 ; WX 333 ; N onesuperior ; B 169 284 398 709 ; - C -1 ; WX 611 ; N otilde ; B 82 -23 639 729 ; -+C -1 ; WX 833 ; N Euro ; B 66 0 931 729 ; - C -1 ; WX 584 ; N plusminus ; B 40 0 639 674 ; - C -1 ; WX 737 ; N registered ; B 55 -20 837 745 ; - C -1 ; WX 556 ; N scaron ; B 60 -23 597 745 ; ---- ogonkify/phvr-o.afm -+++ ogonkify/phvr-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Helvetica-Ogonki - EncodingScheme StandardEncoding - FullName Helvetica-Ogonki Composite font - FontBBox -174 -220 1001 944 --StartCharMetrics 285 -+StartCharMetrics 286 - C 32 ; WX 278 ; N space ; B 0 0 0 0 ; - C 33 ; WX 278 ; N exclam ; B 124 0 208 729 ; - C 34 ; WX 355 ; N quotedbl ; B 52 462 305 708 ; -@@ -219,6 +219,7 @@ C -1 ; WX 834 ; N onehalf ; B 30 -21 804 - C -1 ; WX 834 ; N onequarter ; B 30 -21 804 709 ; - C -1 ; WX 333 ; N onesuperior ; B 60 284 219 709 ; - C -1 ; WX 556 ; N otilde ; B 36 -23 510 716 ; -+C -1 ; WX 833 ; N Euro ; B 75 0 761 729 ; - C -1 ; WX 584 ; N plusminus ; B 40 0 544 618 ; - C -1 ; WX 737 ; N registered ; B -13 -23 751 741 ; - C -1 ; WX 500 ; N scaron ; B 34 -24 459 740 ; ---- ogonkify/phvro-o.afm -+++ ogonkify/phvro-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Helvetica-Oblique-Ogonki - EncodingScheme StandardEncoding - FullName Helvetica-Oblique-Ogonki Composite font - FontBBox -178 -220 1108 944 --StartCharMetrics 285 -+StartCharMetrics 286 - C 32 ; WX 278 ; N space ; B 0 0 0 0 ; - C 33 ; WX 278 ; N exclam ; B 124 0 363 729 ; - C 34 ; WX 355 ; N quotedbl ; B 177 462 455 708 ; -@@ -219,6 +219,7 @@ C -1 ; WX 834 ; N onehalf ; B 116 -21 86 - C -1 ; WX 834 ; N onequarter ; B 147 -21 836 709 ; - C -1 ; WX 333 ; N onesuperior ; B 184 284 370 709 ; - C -1 ; WX 556 ; N otilde ; B 80 -23 582 716 ; -+C -1 ; WX 833 ; N Euro ; B 75 0 916 729 ; - C -1 ; WX 584 ; N plusminus ; B 40 0 621 618 ; - C -1 ; WX 737 ; N registered ; B 55 -23 836 741 ; - C -1 ; WX 500 ; N scaron ; B 61 -24 547 740 ; ---- ogonkify/ptmb-o.afm -+++ ogonkify/ptmb-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Times-Bold-Ogonki - EncodingScheme StandardEncoding - FullName Times-Bold-Ogonki Composite font - FontBBox -172 -256 1008 965 --StartCharMetrics 285 -+StartCharMetrics 286 - C 32 ; WX 250 ; N space ; B 0 0 0 0 ; - C 33 ; WX 333 ; N exclam ; B 84 -18 248 690 ; - C 34 ; WX 555 ; N quotedbl ; B 67 371 425 690 ; -@@ -219,6 +219,7 @@ C -1 ; WX 750 ; N onehalf ; B 30 -18 720 - C -1 ; WX 750 ; N onequarter ; B 30 -18 720 690 ; - C -1 ; WX 300 ; N onesuperior ; B 24 276 275 690 ; - C -1 ; WX 500 ; N otilde ; B 25 -18 473 671 ; -+C -1 ; WX 944 ; N Euro ; B 21 0 914 681 ; - C -1 ; WX 570 ; N plusminus ; B 50 0 520 600 ; - C -1 ; WX 747 ; N registered ; B 16 -17 730 690 ; - C -1 ; WX 389 ; N scaron ; B 29 -17 359 690 ; ---- ogonkify/ptmbi-o.afm -+++ ogonkify/ptmbi-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Times-BoldItalic-Ogonki - EncodingScheme StandardEncoding - FullName Times-BoldItalic-Ogonki Composite font - FontBBox -168 -232 1014 894 --StartCharMetrics 285 -+StartCharMetrics 286 - C 32 ; WX 250 ; N space ; B 0 0 0 0 ; - C 33 ; WX 389 ; N exclam ; B 66 -13 367 676 ; - C 34 ; WX 555 ; N quotedbl ; B 142 367 549 693 ; -@@ -219,6 +219,7 @@ C -1 ; WX 750 ; N onehalf ; B 30 0 720 6 - C -1 ; WX 750 ; N onequarter ; B 30 0 720 676 ; - C -1 ; WX 300 ; N onesuperior ; B 17 270 283 676 ; - C -1 ; WX 500 ; N otilde ; B 27 -13 507 648 ; -+C -1 ; WX 889 ; N Euro ; B -29 -12 907 662 ; - C -1 ; WX 570 ; N plusminus ; B 33 0 537 665 ; - C -1 ; WX 747 ; N registered ; B 23 -18 723 676 ; - C -1 ; WX 389 ; N scaron ; B 16 -13 465 683 ; ---- ogonkify/ptmr-o.afm -+++ ogonkify/ptmr-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Times-Roman-Ogonki - EncodingScheme StandardEncoding - FullName Times-Roman-Ogonki Composite font - FontBBox -168 -218 1000 898 --StartCharMetrics 285 -+StartCharMetrics 286 - C 32 ; WX 250 ; N space ; B 0 0 0 0 ; - C 33 ; WX 333 ; N exclam ; B 130 -9 238 676 ; - C 34 ; WX 408 ; N quotedbl ; B 77 431 331 676 ; -@@ -167,6 +167,7 @@ C -1 ; WX 444 ; N egrave ; B 25 -10 424 - C -1 ; WX 300 ; N twosuperior ; B 1 270 296 676 ; - C -1 ; WX 444 ; N eacute ; B 25 -10 424 678 ; - C -1 ; WX 500 ; N otilde ; B 29 -10 470 638 ; -+C -1 ; WX 889 ; N Euro ; B 12 0 863 662 ; - C -1 ; WX 722 ; N Aacute ; B 15 0 706 890 ; - C -1 ; WX 500 ; N ocircumflex ; B 29 -10 470 674 ; - C -1 ; WX 500 ; N yacute ; B 14 -218 475 678 ; ---- ogonkify/ptmri-o.afm -+++ ogonkify/ptmri-o.afm 2006-02-23 12:05:17.000000000 +0000 -@@ -5,7 +5,7 @@ FontName Times-Italic-Ogonki - EncodingScheme StandardEncoding - FullName Times-Italic-Ogonki Composite font - FontBBox -169 -217 1010 883 --StartCharMetrics 285 -+StartCharMetrics 286 - C 32 ; WX 250 ; N space ; B 0 0 0 0 ; - C 33 ; WX 333 ; N exclam ; B 39 -11 302 667 ; - C 34 ; WX 420 ; N quotedbl ; B 144 421 432 666 ; -@@ -167,6 +167,7 @@ C -1 ; WX 444 ; N egrave ; B 31 -11 412 - C -1 ; WX 300 ; N twosuperior ; B 33 271 324 676 ; - C -1 ; WX 444 ; N eacute ; B 31 -11 459 664 ; - C -1 ; WX 500 ; N otilde ; B 27 -11 496 624 ; -+C -1 ; WX 833 ; N Euro ; B -18 0 873 653 ; - C -1 ; WX 611 ; N Aacute ; B -51 0 564 876 ; - C -1 ; WX 500 ; N ocircumflex ; B 27 -11 468 661 ; - C -1 ; WX 444 ; N yacute ; B -24 -206 459 664 ; ---- src/main.c -+++ src/main.c 2006-02-23 12:05:17.000000000 +0000 -@@ -56,6 +56,7 @@ - #include "signame.h" - #include "long-options.h" - #include "version-etc.h" -+#include - - /* From basename.c */ - char *base_name PARAMS ((const char *path)); -@@ -102,7 +103,9 @@ enum behavior behavior = b_ps; - defined twice, see lib/confg.gperf, handling of `Options:'. */ - - char *program_name; -+#ifndef _GNU_SOURCE - const char *program_invocation_name; -+#endif - - /* Stores the data of liba2ps. */ - -@@ -925,6 +928,7 @@ int - main (int argc, char *argv[]) - { - int argn; -+ char *locale; - - /* Architecture specific initialization. */ - #ifdef __EMX__ -@@ -941,10 +945,20 @@ Copyright (c) 1995-2000 Akim Demaille, M - - /* Set the NLS on */ - setlocale (LC_TIME, ""); --#ifdef HAVE_LC_MESSAGES -+#ifdef LC_MESSAGES - setlocale (LC_MESSAGES, ""); - #endif - setlocale (LC_CTYPE, ""); -+#ifdef LC_PAPER -+ setlocale (LC_PAPER, ""); -+#endif -+ locale = setlocale (LC_ALL, ""); -+ -+#ifdef LC_NUMERIC -+ /* We use international numbering format for e.g. -+ --font-size and writing PostScript code */ -+ setlocale (LC_NUMERIC, "POSIX"); -+#endif - - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); diff --git a/a2ps-4.13b.tar.gz b/a2ps-4.13b.tar.gz deleted file mode 100644 index 1811c0a..0000000 --- a/a2ps-4.13b.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4d2ac6f09f44eeb82621530b1970afe88fd97cfe82da43b61069800d0c06d12 -size 1944289 diff --git a/a2ps-4.14-acroread.patch b/a2ps-4.14-acroread.patch new file mode 100644 index 0000000..21da2c4 --- /dev/null +++ b/a2ps-4.14-acroread.patch @@ -0,0 +1,24 @@ +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 + 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 + ad_CHECK_PROGS([distill, ps2pdf]) + test "$COM_distill$COM_ps2pdf" = "##" && COM_PS2PDF="#" diff --git a/a2ps-4.14-linker.patch b/a2ps-4.14-linker.patch new file mode 100644 index 0000000..a31e9cd --- /dev/null +++ b/a2ps-4.14-linker.patch @@ -0,0 +1,19 @@ +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." ++ droppeddeps=yes + else +- $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." +- droppeddeps=yes + fi + ;; + esac diff --git a/a2ps-4.14-ogonkify.patch b/a2ps-4.14-ogonkify.patch new file mode 100644 index 0000000..8f883da --- /dev/null +++ b/a2ps-4.14-ogonkify.patch @@ -0,0 +1,186 @@ +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 + % Copyright (c) 1996-1999 by J. Chroboczek + % This code may be distributed under the terms of the + % 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 + 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/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: <14/08/06 19:40:00 swd> + + .SH NAME + ogonkify \- international support for PostScript +@@ -262,7 +262,8 @@ or eventually + .IP + % ogonkify \-N \-CT . + +  + Tag Table: +-Node: Top276 +-Node: License866 +-Node: Using Ogonkify2161 +-Node: Ghostscript2602 +-Node: Standard Applications3086 +-Node: a2ps3571 +-Node: genscript4003 +-Node: Adding new characters5548 +-Node: Composite background6146 +-Node: AFM files9661 +-Node: Generated fonts10868 +-Node: Composite usage12867 +-Node: Composite example14413 +-Node: Reaching the author15327 ++Node: Top297 ++Node: License887 ++Node: Using Ogonkify2182 ++Node: Ghostscript2623 ++Node: Standard Applications3107 ++Node: a2ps3592 ++Node: genscript4024 ++Node: Adding new characters5569 ++Node: Composite background6167 ++Node: AFM files9682 ++Node: Generated fonts10889 ++Node: Composite usage12888 ++Node: Composite example14434 ++Node: Reaching the author15348 +  + End Tag Table +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: <14/08/06 19:55:00 swd> + + @dircategory Printing Tools + @direntry +-* ogonkify: (ogonkify). Ogonkify ++* ogonkify: (ogonkify). Ogonkify + @end direntry + + @ifinfo +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 + + $PROGNAME='ogonkify'; +-$VERSION='v. 0.7.0 by J. Chroboczek'; ++$VERSION='v. 0.7.1 by J. Chroboczek'; + + # Directory with the IBM Courier fonts + $IBMFONTS="@IBMFONTS@"; +@@ -237,6 +237,9 @@ if(!$encodings{$encoding}) { + $where=0; + while(<>) { + if($where==0) { ++ if($doNetscape && /^%%Title:/) { ++ $_="%%Title: \n"; ++ } + print; + if(($doMosaic || $doMp) && /^%%EndComments/) { + $_="%%BeginProlog\n"; +@@ -252,14 +255,14 @@ while(<>) { + for(@procsets) { + &procset($_); + } +- for(@downloadFonts) { +- &downloadFont($_); +- } + if($eurify) { + for(@standardFont) { + &eurifyFont($_); + } + } ++ for(@downloadFonts) { ++ &downloadFont($_); ++ } + while(($from,$to)=each %remappings) { + &remap($from,$to); + } +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 diff --git a/a2ps-4.13-tempfile.patch b/a2ps-4.14-tempfile.patch similarity index 57% rename from a2ps-4.13-tempfile.patch rename to a2ps-4.14-tempfile.patch index fb0a4e5..4a74e80 100644 --- a/a2ps-4.13-tempfile.patch +++ b/a2ps-4.14-tempfile.patch @@ -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; %%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 @@ - [/]Adobe_WinNT_Driver_Gfx[ ]175[ ]dict[ ]dup[ ]begin.*\n { - /* Adobe Stuff */ +@@ -142,7 +145,9 @@ const char *tmpdir; + + [/]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 @@ - (NTPSOct95[ ]){0,1}[/]FontSV[ ]save[ ](put|def).*\n { +@@ -169,7 +174,9 @@ const char *tmpdir; + (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 @@ +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 - diff --git a/a2ps-4.14.diff b/a2ps-4.14.diff new file mode 100644 index 0000000..8408d06 --- /dev/null +++ b/a2ps-4.14.diff @@ -0,0 +1,717 @@ +diff -rupN a2ps-4.14.old/afm/fontsmap a2ps-4.14/afm/fontsmap +--- a2ps-4.14.old/afm/fontsmap 2007-12-28 17:52:50.000000000 -0800 ++++ a2ps-4.14/afm/fontsmap 2014-08-06 22:05:06.973897332 -0700 +@@ -47,6 +47,14 @@ Bookman-Demi pbkd + Bookman-DemiItalic pbkdi + Bookman-Light pbkl + Bookman-LightItalic pbkli ++CenturySchL-Bold c059016l ++CenturySchL-BoldItal c059036l ++CenturySchL-Ital c059033l ++CenturySchL-Roma c059013l ++CharterBT-Bold bchb ++CharterBT-BoldItalic bchbi ++CharterBT-Italic bchri ++CharterBT-Roman bchr + Courier pcrr + Courier-Bold pcrb + Courier-Bold-Ogonki pcrb-o +@@ -55,6 +63,9 @@ Courier-BoldOblique-Ogonki pcrbo-o + Courier-Oblique pcrro + Courier-Oblique-Ogonki pcrro-o + Courier-Ogonki pcrr-o ++Cyrillic fcyr ++Cyrillic-Italic fcyri ++Dingbats d050000l + Helvetica phvr + Helvetica-Bold phvb + Helvetica-Bold-Ogonki phvb-o +@@ -71,11 +82,25 @@ NewCenturySchlbk-Bold pncb + NewCenturySchlbk-BoldItalic pncbi + NewCenturySchlbk-Italic pncri + NewCenturySchlbk-Roman pncr ++NimbusMonL-Bold n022004l ++NimbusMonL-BoldObli n022024l ++NimbusMonL-Regu n022003l ++NimbusMonL-ReguObli n022023l ++NimbusRomNo n021003l ++NimbusSanL-Bold n019004l ++NimbusSanL-BoldCond n019044l ++NimbusSanL-BoldCondItal n019064l ++NimbusSanL-BoldItal n019024l ++NimbusSanL-Regu n019003l ++NimbusSanL-ReguCond n019043l ++NimbusSanL-ReguCondItal n019063l ++NimbusSanL-ReguItal n019023l + PCFont pcfont + Palatino-Bold pplb + Palatino-BoldItalic pplbi + Palatino-Italic pplri + Palatino-Roman pplr ++StandardSymL s050000l + Symbol psyr + Times-Bold ptmb + Times-Bold-Ogonki ptmb-o +@@ -85,5 +110,20 @@ Times-Italic ptmi + Times-Italic-Ogonki ptmri-o + Times-Roman ptmr + Times-Roman-Ogonki ptmr-o ++URWAntiquaT-RegularCondensed u003043t ++URWBookmanL-DemiBold b018015l ++URWBookmanL-DemiBoldItal b018035l ++URWBookmanL-Ligh b018012l ++URWBookmanL-LighItal b018032l ++URWChanceryL-MediItal z003034l ++URWGothicL-Book a010013l ++URWGothicL-BookObli a010033l ++URWGothicL-Demi a010015l ++URWGothicL-DemiObli a010035l ++URWGroteskT-Bold u004006t ++URWPalladioL-Bold p052004l ++URWPalladioL-BoldItal p052024l ++URWPalladioL-Ital p052023l ++URWPalladioL-Roma p052003l + ZapfChancery-MediumItalic pzcmi + ZapfDingbats pzdr +diff -rupN a2ps-4.14.old/afm/pcrb.afm a2ps-4.14/afm/pcrb.afm +--- a2ps-4.14.old/afm/pcrb.afm 2007-09-19 17:01:46.000000000 -0700 ++++ a2ps-4.14/afm/pcrb.afm 2014-08-06 22:08:42.880800508 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 30 0 594 79 + C -1 ; WX 600 ; N rcommaaccent ; B 47 -250 580 454 ; + C -1 ; WX 600 ; N Ntilde ; B 8 -12 610 759 ; + C -1 ; WX 600 ; N otilde ; B 30 -15 570 636 ; ++C -1 ; WX 600 ; N Euro ; B -69 -50 673 633 ; + C -1 ; WX 600 ; N Rcommaaccent ; B 24 -250 599 562 ; + C -1 ; WX 600 ; N Lcommaaccent ; B 39 -250 578 562 ; + C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ; +diff -rupN a2ps-4.14.old/afm/pcrbo.afm a2ps-4.14/afm/pcrbo.afm +--- a2ps-4.14.old/afm/pcrbo.afm 2007-09-19 17:01:46.000000000 -0700 ++++ a2ps-4.14/afm/pcrbo.afm 2014-08-06 22:10:02.365238052 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 30 0 664 79 + C -1 ; WX 600 ; N rcommaaccent ; B 47 -250 655 454 ; + C -1 ; WX 600 ; N Ntilde ; B 8 -12 730 759 ; + C -1 ; WX 600 ; N otilde ; B 71 -15 643 636 ; ++C -1 ; WX 600 ; N Euro ; B -58 -50 776 633 ; + C -1 ; WX 600 ; N Rcommaaccent ; B 24 -250 617 562 ; + C -1 ; WX 600 ; N Lcommaaccent ; B 39 -250 636 562 ; + C -1 ; WX 600 ; N Atilde ; B -9 0 669 759 ; +diff -rupN a2ps-4.14.old/afm/pcrr.afm a2ps-4.14/afm/pcrr.afm +--- a2ps-4.14.old/afm/pcrr.afm 2007-09-19 17:01:46.000000000 -0700 ++++ a2ps-4.14/afm/pcrr.afm 2014-08-06 22:11:03.645344292 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 43 0 574 80 + C -1 ; WX 600 ; N rcommaaccent ; B 60 -250 559 441 ; + C -1 ; WX 600 ; N Ntilde ; B 7 -13 593 729 ; + C -1 ; WX 600 ; N otilde ; B 62 -15 538 606 ; ++C -1 ; WX 600 ; N Euro ; B -9 -20 613 583 ; + C -1 ; WX 600 ; N Rcommaaccent ; B 38 -250 588 562 ; + C -1 ; WX 600 ; N Lcommaaccent ; B 47 -250 554 562 ; + C -1 ; WX 600 ; N Atilde ; B 3 0 597 729 ; +diff -rupN a2ps-4.14.old/afm/pcrro.afm a2ps-4.14/afm/pcrro.afm +--- a2ps-4.14.old/afm/pcrro.afm 2007-09-19 17:01:46.000000000 -0700 ++++ a2ps-4.14/afm/pcrro.afm 2014-08-06 22:12:02.009356448 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 600 ; N Dcaron ; B 43 0 645 80 + C -1 ; WX 600 ; N rcommaaccent ; B 60 -250 636 441 ; + C -1 ; WX 600 ; N Ntilde ; B 7 -13 712 729 ; + C -1 ; WX 600 ; N otilde ; B 102 -15 629 606 ; ++C -1 ; WX 600 ; N Euro ; B -5 -20 718 583 ; + C -1 ; WX 600 ; N Rcommaaccent ; B 38 -250 598 562 ; + C -1 ; WX 600 ; N Lcommaaccent ; B 47 -250 607 562 ; + C -1 ; WX 600 ; N Atilde ; B 3 0 655 729 ; +diff -rupN a2ps-4.14.old/afm/phvb.afm a2ps-4.14/afm/phvb.afm +--- a2ps-4.14.old/afm/phvb.afm 2007-09-19 17:01:46.000000000 -0700 ++++ a2ps-4.14/afm/phvb.afm 2014-08-06 22:14:23.764816837 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 76 0 685 93 + C -1 ; WX 389 ; N rcommaaccent ; B 64 -228 373 546 ; + C -1 ; WX 722 ; N Ntilde ; B 69 0 654 923 ; + C -1 ; WX 611 ; N otilde ; B 34 -14 578 737 ; ++C -1 ; WX 883 ; N Euro ; B 66 0 776 729 ; + C -1 ; WX 722 ; N Rcommaaccent ; B 76 -228 677 718 ; + C -1 ; WX 611 ; N Lcommaaccent ; B 76 -228 583 718 ; + C -1 ; WX 722 ; N Atilde ; B 20 0 702 923 ; +diff -rupN a2ps-4.14.old/afm/phvbo.afm a2ps-4.14/afm/phvbo.afm +--- a2ps-4.14.old/afm/phvbo.afm 2007-09-19 17:01:46.000000000 -0700 ++++ a2ps-4.14/afm/phvbo.afm 2014-08-06 22:15:49.732310374 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 76 0 777 93 + C -1 ; WX 389 ; N rcommaaccent ; B 26 -228 489 546 ; + C -1 ; WX 722 ; N Ntilde ; B 69 0 807 923 ; + C -1 ; WX 611 ; N otilde ; B 82 -14 646 737 ; ++C -1 ; WX 833 ; N Euro ; B 66 0 931 729 ; + C -1 ; WX 722 ; N Rcommaaccent ; B 76 -228 778 718 ; + C -1 ; WX 611 ; N Lcommaaccent ; B 76 -228 611 718 ; + C -1 ; WX 722 ; N Atilde ; B 20 0 741 923 ; +diff -rupN a2ps-4.14.old/afm/phvr.afm a2ps-4.14/afm/phvr.afm +--- a2ps-4.14.old/afm/phvr.afm 2007-09-19 17:01:46.000000000 -0700 ++++ a2ps-4.14/afm/phvr.afm 2014-08-06 22:16:51.732388169 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 81 0 674 92 + C -1 ; WX 333 ; N rcommaaccent ; B 77 -225 332 538 ; + C -1 ; WX 722 ; N Ntilde ; B 76 0 646 917 ; + C -1 ; WX 556 ; N otilde ; B 35 -14 521 722 ; ++C -1 ; WX 833 ; N Euro ; B 75 0 761 729 ; + C -1 ; WX 722 ; N Rcommaaccent ; B 88 -225 684 718 ; + C -1 ; WX 556 ; N Lcommaaccent ; B 76 -225 537 718 ; + C -1 ; WX 667 ; N Atilde ; B 14 0 654 917 ; +diff -rupN a2ps-4.14.old/afm/phvro.afm a2ps-4.14/afm/phvro.afm +--- a2ps-4.14.old/afm/phvro.afm 2007-09-19 17:01:47.000000000 -0700 ++++ a2ps-4.14/afm/phvro.afm 2014-08-06 22:18:06.324685586 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 81 0 764 92 + C -1 ; WX 333 ; N rcommaaccent ; B 30 -225 446 538 ; + C -1 ; WX 722 ; N Ntilde ; B 76 0 799 917 ; + C -1 ; WX 556 ; N otilde ; B 83 -14 602 722 ; ++C -1 ; WX 833 ; N Euro ; B 75 0 916 729 ; + C -1 ; WX 722 ; N Rcommaaccent ; B 88 -225 773 718 ; + C -1 ; WX 556 ; N Lcommaaccent ; B 76 -225 555 718 ; + C -1 ; WX 667 ; N Atilde ; B 14 0 699 917 ; +diff -rupN a2ps-4.14.old/afm/ptmb.afm a2ps-4.14/afm/ptmb.afm +--- a2ps-4.14.old/afm/ptmb.afm 2007-09-19 17:01:48.000000000 -0700 ++++ a2ps-4.14/afm/ptmb.afm 2014-08-06 22:19:02.986671634 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 14 0 690 91 + C -1 ; WX 444 ; N rcommaaccent ; B 29 -218 434 473 ; + C -1 ; WX 722 ; N Ntilde ; B 16 -18 701 884 ; + C -1 ; WX 500 ; N otilde ; B 25 -14 476 674 ; ++C -1 ; WX 944 ; N Euro ; B 21 0 914 681 ; + C -1 ; WX 722 ; N Rcommaaccent ; B 26 -218 715 676 ; + C -1 ; WX 667 ; N Lcommaaccent ; B 19 -218 638 676 ; + C -1 ; WX 722 ; N Atilde ; B 9 0 689 884 ; +diff -rupN a2ps-4.14.old/afm/ptmbi.afm a2ps-4.14/afm/ptmbi.afm +--- a2ps-4.14.old/afm/ptmbi.afm 2007-09-19 17:01:48.000000000 -0700 ++++ a2ps-4.14/afm/ptmbi.afm 2014-08-06 22:21:00.578719402 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B -46 0 685 8 + C -1 ; WX 389 ; N rcommaaccent ; B -67 -218 389 462 ; + C -1 ; WX 722 ; N Ntilde ; B -27 -15 748 862 ; + C -1 ; WX 500 ; N otilde ; B -3 -13 491 655 ; ++C -1 ; WX 889 ; N Euro ; B -29 -12 907 662 ; + C -1 ; WX 667 ; N Rcommaaccent ; B -29 -218 623 669 ; + C -1 ; WX 611 ; N Lcommaaccent ; B -22 -218 590 669 ; + C -1 ; WX 667 ; N Atilde ; B -67 0 593 862 ; +diff -rupN a2ps-4.14.old/afm/ptmi.afm a2ps-4.14/afm/ptmi.afm +--- a2ps-4.14.old/afm/ptmi.afm 2007-09-19 17:01:48.000000000 -0700 ++++ a2ps-4.14/afm/ptmi.afm 2014-08-06 22:21:52.639626587 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B -8 0 700 87 + C -1 ; WX 389 ; N rcommaaccent ; B -3 -217 412 441 ; + C -1 ; WX 667 ; N Ntilde ; B -20 -15 727 836 ; + C -1 ; WX 500 ; N otilde ; B 27 -11 496 624 ; ++C -1 ; WX 833 ; N Euro ; B -24 0 850 660 ; + C -1 ; WX 611 ; N Rcommaaccent ; B -13 -187 588 653 ; + C -1 ; WX 556 ; N Lcommaaccent ; B -8 -217 559 653 ; + C -1 ; WX 611 ; N Atilde ; B -51 0 566 836 ; +diff -rupN a2ps-4.14.old/afm/ptmr.afm a2ps-4.14/afm/ptmr.afm +--- a2ps-4.14.old/afm/ptmr.afm 2007-09-19 17:01:48.000000000 -0700 ++++ a2ps-4.14/afm/ptmr.afm 2014-08-06 22:22:50.515635517 -0700 +@@ -312,6 +312,7 @@ C -1 ; WX 722 ; N Dcaron ; B 16 0 685 88 + C -1 ; WX 333 ; N rcommaaccent ; B 5 -218 335 460 ; + C -1 ; WX 722 ; N Ntilde ; B 12 -11 707 850 ; + C -1 ; WX 500 ; N otilde ; B 29 -10 470 638 ; ++C -1 ; WX 889 ; N Euro ; B 19 0 871 662 ; + C -1 ; WX 667 ; N Rcommaaccent ; B 17 -198 659 662 ; + C -1 ; WX 611 ; N Lcommaaccent ; B 12 -218 598 662 ; + C -1 ; WX 722 ; N Atilde ; B 15 0 706 850 ; +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 21:32:03.896139361 -0700 +@@ -30759,8 +30759,9 @@ echo $ECHO_N "checking for PostScript fo + # Try to find some PostScript fonts. + # Find out if ghostscript is installed + ac_psfont_path= +-for ac_dir in /usr/local/ghostscript/fonts \ +- /usr/local/share/ghostscript/fonts; ++for ac_dir in /usr/share/ghostscript/fonts \ ++ /usr/X11R6/lib/X11/fonts/Type1/ \ ++ /usr/X11R6/lib/X11/fonts/latin2/Typle1/ ; + do + if test "cd $ac_dir 2>/dev/null && echo *.afm"; then + ac_psfont_path="$ac_psfont_path:$ac_dir"; +diff -rupN a2ps-4.14.old/contrib/emacs/a2ps.el a2ps-4.14/contrib/emacs/a2ps.el +--- a2ps-4.14.old/contrib/emacs/a2ps.el 2007-12-28 17:58:11.000000000 -0800 ++++ a2ps-4.14/contrib/emacs/a2ps.el 2014-08-06 22:23:41.146518510 -0700 +@@ -44,7 +44,7 @@ + ;; a2ps-compile-regexp + + ;;path to the a2ps program +-(defvar a2ps-program "/usr/local/bin/a2ps") ++(defvar a2ps-program "/usr/bin/a2ps") + + ;;thank god for make-regexp.el! + (defvar a2ps-font-lock-keywords +diff -rupN a2ps-4.14.old/encoding/encoding.map a2ps-4.14/encoding/encoding.map +--- a2ps-4.14.old/encoding/encoding.map 2007-12-28 17:39:21.000000000 -0800 ++++ a2ps-4.14/encoding/encoding.map 2014-08-06 22:30:00.355141802 -0700 +@@ -84,6 +84,10 @@ iso15 iso15 + latin9 iso15 + latin0 iso15 + iso-8859-15 iso15 ++# Handle ASCII as simple ISO 8859-1 ++ansi_x3.4-1968 iso15 ++# Workaround which may help for UTF-8 ++utf-8 iso15 + + ######################################################################## + # Other encodings +diff -rupN a2ps-4.14.old/etc/a2ps_cfg.in a2ps-4.14/etc/a2ps_cfg.in +--- a2ps-4.14.old/etc/a2ps_cfg.in 2007-12-28 17:38:58.000000000 -0800 ++++ a2ps-4.14/etc/a2ps_cfg.in 2014-08-06 22:38:22.696941149 -0700 +@@ -58,6 +58,39 @@ Medium: Folio 612 936 + Medium: Quarto 610 780 + Medium: 10x14 720 1008 + ++# Define ghostscript page names and their sizes ++Medium: letter 612 792 ++Medium: note 540 720 ++Medium: legal 612 1008 ++Medium: a0 2380 3368 ++Medium: a1 1684 2380 ++Medium: a2 1190 1684 ++Medium: a3 842 1190 ++Medium: a4 595 842 ++Medium: a5 421 595 ++Medium: a6 297 421 ++Medium: a7 210 297 ++Medium: a8 148 210 ++Medium: a9 105 148 ++Medium: a10 74 105 ++Medium: b0 2836 4008 ++Medium: b1 2004 2836 ++Medium: b2 1418 2004 ++Medium: b3 1002 1418 ++Medium: b4 709 1002 ++Medium: b5 501 709 ++Medium: archE 2592 3456 ++Medium: archD 1728 2592 ++Medium: archC 1296 1728 ++Medium: archB 864 1296 ++Medium: archA 648 864 ++Medium: flsa 612 936 ++Medium: flse 612 936 ++Medium: halfletter 396 612 ++Medium: 11x17 792 1224 ++Medium: ledger 1224 792 ++ ++ + # Desk Jet users: bigger margins + Medium: A4dj 595 842 24 50 571 792 + Medium: Letterdj 612 792 24 40 588 752 +@@ -72,7 +105,7 @@ LibraryPath: @libpath@ + + # It may be useful to extend it so that a2ps can see some + # TeX or X11 resources: it likes AFM files and PF[AB] files. +-#AppendLibraryPath: foo ++AppendLibraryPath: @psfontpath@ + + + ################################################################# +@@ -182,8 +215,9 @@ Variable: del.imagick @convert@ -page #w + # Either GV (prefered) or Ghostview will be used as the "display" printer + # We give -dNOPLATFONTS so that real fonts are used + # (Strange results appear with Ogonkify's fonts for instance). +-@COM_ghostview@Variable: ghostview @ghostview@ --arguments=-dNOPLATFONTS +-@COM_gv@Variable: ghostview @gv@ -antialias --arguments=-dNOPLATFONTS ++##@COM_ghostview@Variable: ghostview @ghostview@ --arguments=-dNOPLATFONTS ++#@COM_gv@Variable: ghostview @gv@ -antialias --arguments=-dNOPLATFONTS ++variable: ghostview a2ps-open + + # Used for the `pdf' printer. + # Use as `#{ps2pdf} INPUT OUTPUT'. +diff -rupN a2ps-4.14.old/etc/Makefile.in a2ps-4.14/etc/Makefile.in +--- a2ps-4.14.old/etc/Makefile.in 2007-12-28 19:28:07.000000000 -0800 ++++ a2ps-4.14/etc/Makefile.in 2014-08-06 22:31:53.889128113 -0700 +@@ -482,7 +482,7 @@ uninstall-local: + + # Building the correct a2ps.cfg + a2ps.cfg: a2ps_cfg Makefile +- sed "s!@libpath@!$(libpath)!" a2ps_cfg > a2ps.cfg ++ sed "s!@libpath@!$(libpath)!;s!@psfontpath@!$(PSFONT_PATH)!" a2ps_cfg > a2ps.cfg + + # Building a time stamp to know the version. + README: README.in Makefile +diff -rupN a2ps-4.14.old/lib/jobs.c a2ps-4.14/lib/jobs.c +--- a2ps-4.14.old/lib/jobs.c 2007-12-28 17:37:54.000000000 -0800 ++++ a2ps-4.14/lib/jobs.c 2014-08-06 22:41:30.490237460 -0700 +@@ -135,10 +135,18 @@ a2ps_job_new (void) + + /* Set the NLS on */ + setlocale (LC_TIME, ""); +-#ifdef HAVE_LC_MESSAGES ++#ifdef LC_MESSAGES + setlocale (LC_MESSAGES, ""); + #endif + setlocale (LC_CTYPE, ""); ++#ifdef LC_PAPER ++ setlocale (LC_PAPER, ""); ++#endif ++ ++#ifdef LC_NUMERIC ++ /* We use international numbering format for e.g. --font-size and writing PostScript code */ ++ setlocale (LC_NUMERIC, "POSIX"); ++#endif + + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); +diff -rupN a2ps-4.14.old/lib/metaseq.c a2ps-4.14/lib/metaseq.c +--- a2ps-4.14.old/lib/metaseq.c 2007-12-28 17:58:20.000000000 -0800 ++++ a2ps-4.14/lib/metaseq.c 2014-08-06 22:46:13.885218338 -0700 +@@ -205,7 +205,7 @@ grow_user_string_obstack (struct obstack + int justification = 1; + + /* Format string. */ +- for (i = 0; str[i] != '\0'; i++) ++ for (i = 0; str != NULL && str[i] != '\0'; i++) + { + int type; + +diff -rupN a2ps-4.14.old/lib/options.c a2ps-4.14/lib/options.c +--- a2ps-4.14.old/lib/options.c 2007-12-28 17:58:21.000000000 -0800 ++++ a2ps-4.14/lib/options.c 2014-08-07 07:24:59.080146157 -0700 +@@ -54,11 +54,14 @@ + #include "argv.h" + #include "quotearg.h" + #include "filalign.h" ++#include ++#include + + #define MAN_LINES 66 /* no lines for a man */ + extern char *program_name; ++#ifndef _GNU_SOURCE + extern const char *program_invocation_name; +- ++#endif + /* + * Hooks used + */ +@@ -539,6 +542,16 @@ a2ps_handle_options (a2ps_job * job, int + break; + + case 'M': /* select a medium */ ++#ifdef LC_PAPER ++ if (!strcasecmp("LC_PAPER", optarg)) ++ { ++ unsigned int paperheight = (unsigned int)nl_langinfo(_NL_PAPER_HEIGHT); ++ if (paperheight && paperheight == 279) ++ optarg = xstrdup("letter"); ++ else ++ optarg = xstrdup("a4"); ++ } ++#endif + xstrcpy (job->medium_request, optarg); + break; + +diff -rupN a2ps-4.14.old/lib/path-concat.c a2ps-4.14/lib/path-concat.c +--- a2ps-4.14.old/lib/path-concat.c 2007-12-28 17:37:54.000000000 -0800 ++++ a2ps-4.14/lib/path-concat.c 2014-08-07 07:27:19.276571665 -0700 +@@ -21,10 +21,6 @@ + # include + #endif + +-#ifndef HAVE_MEMPCPY +-# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N))) +-#endif +- + #include + #if HAVE_STRING_H + # include +@@ -32,6 +28,9 @@ + #include + + /* char *malloc (); */ ++#if !defined(HAVE_MEMPCPY) && !defined(mempcpy) ++# define mempcpy(D, S, N) ((void *) ((char *) memcpy ((D), (S), (N)) + (N))) ++#endif + + #ifndef DIRECTORY_SEPARATOR + # define DIRECTORY_SEPARATOR '/' +diff -rupN a2ps-4.14.old/lib/xstrrpl.c a2ps-4.14/lib/xstrrpl.c +--- a2ps-4.14.old/lib/xstrrpl.c 2007-12-28 17:37:54.000000000 -0800 ++++ a2ps-4.14/lib/xstrrpl.c 2014-08-07 07:29:46.837124580 -0700 +@@ -22,6 +22,7 @@ + #include + #include "xstrrpl.h" + ++#undef stpcpy + extern char * stpcpy(); + + /* Perform subsitutions in string. Result is malloc'd +diff -rupN a2ps-4.14.old/man/a2ps.1 a2ps-4.14/man/a2ps.1 +--- a2ps-4.14.old/man/a2ps.1 2007-12-28 19:29:02.000000000 -0800 ++++ a2ps-4.14/man/a2ps.1 2014-08-07 07:32:28.759925975 -0700 +@@ -81,8 +81,7 @@ first fill (DIRECTION=) rows, or columns + predefined font sizes and layouts for 1.. 9 virtuals + .TP + \fB\-A\fR, \fB\-\-file\-align\fR=\fIMODE\fR +-align separate files according to MODE (fill, rank +-page, sheet, or a number) ++align separate files according to MODE ('virtual', 'rank', 'page', 'sheet', or a number) + .TP + \fB\-j\fR, \fB\-\-borders\fR* + print borders around columns +diff -rupN a2ps-4.14.old/ogonkify/Makefile.in a2ps-4.14/ogonkify/Makefile.in +--- a2ps-4.14.old/ogonkify/Makefile.in 2007-12-28 19:27:58.000000000 -0800 ++++ a2ps-4.14/ogonkify/Makefile.in 2014-08-07 07:34:24.718932161 -0700 +@@ -223,7 +223,7 @@ PSPROGS = allchars.ps compose.ps helper. + # + @EXTENSIONS_TRUE@bin_SCRIPTS = ogonkify composeglyphs + @EXTENSIONS_TRUE@ogonkify_DATA = $(ENCODINGS_VECTORS) $(CREATED_FONTS) $(PSPROGS) README +-@EXTENSIONS_TRUE@afm_DATA = $(CREATED_AFMS) ++@EXTENSIONS_TRUE@afm_DATA = $(CREATED_AFMS) $(ORIGINAL_COMP_FONTS_AFMS) + @EXTENSIONS_TRUE@fonts_DATA = $(CREATED_PFAS) + + # +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-07 07:35:27.037010315 -0700 +@@ -38,7 +38,7 @@ $encoding='L2'; + 'ibmpc','IBMPCEncoding', 'mac','MacintoshEncoding', + 'HP','HPRomanEncoding'); + @standardFont= +- ('Courier', 'Courier-Oblique', 'Courier-Bold', 'Courier-BoldItalic', ++ ('Courier', 'Courier-Oblique', 'Courier-Bold', 'Courier-BoldOblique', + 'Times-Roman', 'Times-Italic', 'Times-Bold', 'Times-BoldItalic', + 'Helvetica', 'Helvetica-Oblique', 'Helvetica-Bold', + 'Helvetica-BoldOblique'); +diff -rupN a2ps-4.14.old/ogonkify/pcrb-o.afm a2ps-4.14/ogonkify/pcrb-o.afm +--- a2ps-4.14.old/ogonkify/pcrb-o.afm 2007-12-28 19:28:25.000000000 -0800 ++++ a2ps-4.14/ogonkify/pcrb-o.afm 2014-08-07 07:36:40.027273107 -0700 +@@ -5,7 +5,7 @@ FontName Courier-Bold-Ogonki + EncodingScheme StandardEncoding + FullName Courier-Bold-Ogonki Composite font + FontBBox -113 -250 749 801 +-StartCharMetrics 315 ++StartCharMetrics 316 + C 32 ; WX 600 ; N space ; B 0 0 0 0 ; + C 33 ; WX 600 ; N exclam ; B 202 -15 398 572 ; + C 34 ; WX 600 ; N quotedbl ; B 135 277 465 562 ; +@@ -204,6 +204,7 @@ C -1 ; WX 600 ; N Igrave ; B 77 0 523 78 + C -1 ; WX 600 ; N brokenbar ; B 255 -175 345 675 ; + C -1 ; WX 600 ; N Oacute ; B 22 -18 578 784 ; + C -1 ; WX 600 ; N otilde ; B 30 -15 570 636 ; ++C -1 ; WX 600 ; N Euro ; B -2 0 721 562 ; + C -1 ; WX 600 ; N Yacute ; B 12 0 589 784 ; + C -1 ; WX 600 ; N Icircumflex ; B 77 0 523 780 ; + C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ; +diff -rupN a2ps-4.14.old/ogonkify/pcrr-o.afm a2ps-4.14/ogonkify/pcrr-o.afm +--- a2ps-4.14.old/ogonkify/pcrr-o.afm 2007-12-28 19:28:25.000000000 -0800 ++++ a2ps-4.14/ogonkify/pcrr-o.afm 2014-08-07 07:37:28.600113457 -0700 +@@ -5,7 +5,7 @@ FontName Courier-Ogonki + EncodingScheme StandardEncoding + FullName Courier-Ogonki Composite font + FontBBox -28 -250 628 805 +-StartCharMetrics 315 ++StartCharMetrics 316 + C 32 ; WX 600 ; N space ; B 0 0 0 0 ; + C 33 ; WX 600 ; N exclam ; B 236 -15 364 572 ; + C 34 ; WX 600 ; N quotedbl ; B 187 328 413 562 ; +@@ -204,6 +204,7 @@ C -1 ; WX 600 ; N Igrave ; B 96 0 504 79 + C -1 ; WX 600 ; N brokenbar ; B 275 -175 326 675 ; + C -1 ; WX 600 ; N Oacute ; B 43 -18 557 793 ; + C -1 ; WX 600 ; N otilde ; B 62 -15 538 606 ; ++C -1 ; WX 600 ; N Euro ; B 4 0 596 562 ; + C -1 ; WX 600 ; N Yacute ; B 24 0 576 793 ; + C -1 ; WX 600 ; N Icircumflex ; B 96 0 504 775 ; + C -1 ; WX 600 ; N Atilde ; B 3 0 597 732 ; +diff -rupN a2ps-4.14.old/ogonkify/pcrro-o.afm a2ps-4.14/ogonkify/pcrro-o.afm +--- a2ps-4.14.old/ogonkify/pcrro-o.afm 2007-12-28 19:28:25.000000000 -0800 ++++ a2ps-4.14/ogonkify/pcrro-o.afm 2014-08-07 07:38:18.442975784 -0700 +@@ -5,7 +5,7 @@ FontName Courier-Oblique-Ogonki + EncodingScheme StandardEncoding + FullName Courier-Oblique-Ogonki Composite font + FontBBox -28 -250 742 805 +-StartCharMetrics 315 ++StartCharMetrics 316 + C 32 ; WX 600 ; N space ; B 0 0 0 0 ; + C 33 ; WX 600 ; N exclam ; B 243 -15 464 572 ; + C 34 ; WX 600 ; N quotedbl ; B 273 328 532 562 ; +@@ -204,6 +204,7 @@ C -1 ; WX 600 ; N Igrave ; B 96 0 623 79 + C -1 ; WX 600 ; N brokenbar ; B 238 -175 469 675 ; + C -1 ; WX 600 ; N Oacute ; B 94 -18 638 793 ; + C -1 ; WX 600 ; N otilde ; B 102 -15 629 606 ; ++C -1 ; WX 600 ; N Euro ; B 4 0 715 562 ; + C -1 ; WX 600 ; N Yacute ; B 133 0 695 793 ; + C -1 ; WX 600 ; N Icircumflex ; B 96 0 623 775 ; + C -1 ; WX 600 ; N Atilde ; B 3 0 656 732 ; +diff -rupN a2ps-4.14.old/ogonkify/phvb-o.afm a2ps-4.14/ogonkify/phvb-o.afm +--- a2ps-4.14.old/ogonkify/phvb-o.afm 2007-12-28 19:28:25.000000000 -0800 ++++ a2ps-4.14/ogonkify/phvb-o.afm 2014-08-07 07:39:07.060816910 -0700 +@@ -5,7 +5,7 @@ FontName Helvetica-Bold-Ogonki + EncodingScheme StandardEncoding + FullName Helvetica-Bold-Ogonki Composite font + FontBBox -173 -221 1003 936 +-StartCharMetrics 285 ++StartCharMetrics 286 + C 32 ; WX 278 ; N space ; B 0 0 0 0 ; + C 33 ; WX 333 ; N exclam ; B 112 0 262 729 ; + C 34 ; WX 474 ; N quotedbl ; B 50 470 424 729 ; +@@ -219,6 +219,7 @@ C -1 ; WX 834 ; N onehalf ; B 30 -20 803 + C -1 ; WX 834 ; N onequarter ; B 30 -20 804 715 ; + C -1 ; WX 333 ; N onesuperior ; B 46 284 247 709 ; + C -1 ; WX 611 ; N otilde ; B 35 -23 569 729 ; ++C -1 ; WX 833 ; N Euro ; B 66 0 776 729 ; + C -1 ; WX 584 ; N plusminus ; B 40 0 544 674 ; + C -1 ; WX 737 ; N registered ; B -14 -20 751 745 ; + C -1 ; WX 556 ; N scaron ; B 29 -23 520 745 ; +diff -rupN a2ps-4.14.old/ogonkify/phvbo-o.afm a2ps-4.14/ogonkify/phvbo-o.afm +--- a2ps-4.14.old/ogonkify/phvbo-o.afm 2007-12-28 19:28:25.000000000 -0800 ++++ a2ps-4.14/ogonkify/phvbo-o.afm 2014-08-07 07:40:08.179874322 -0700 +@@ -5,7 +5,7 @@ FontName Helvetica-BoldOblique-Ogonki + EncodingScheme StandardEncoding + FullName Helvetica-BoldOblique-Ogonki Composite font + FontBBox -177 -221 1107 936 +-StartCharMetrics 285 ++StartCharMetrics 286 + C 32 ; WX 278 ; N space ; B 0 0 0 0 ; + C 33 ; WX 333 ; N exclam ; B 112 0 417 729 ; + C 34 ; WX 474 ; N quotedbl ; B 177 470 579 729 ; +@@ -219,6 +219,7 @@ C -1 ; WX 834 ; N onehalf ; B 120 -20 87 + C -1 ; WX 834 ; N onequarter ; B 151 -20 846 715 ; + C -1 ; WX 333 ; N onesuperior ; B 169 284 398 709 ; + C -1 ; WX 611 ; N otilde ; B 82 -23 639 729 ; ++C -1 ; WX 833 ; N Euro ; B 66 0 931 729 ; + C -1 ; WX 584 ; N plusminus ; B 40 0 639 674 ; + C -1 ; WX 737 ; N registered ; B 55 -20 837 745 ; + C -1 ; WX 556 ; N scaron ; B 60 -23 597 745 ; +diff -rupN a2ps-4.14.old/ogonkify/phvro-o.afm a2ps-4.14/ogonkify/phvro-o.afm +--- a2ps-4.14.old/ogonkify/phvro-o.afm 2007-12-28 19:28:25.000000000 -0800 ++++ a2ps-4.14/ogonkify/phvro-o.afm 2014-08-07 07:41:15.175033395 -0700 +@@ -5,7 +5,7 @@ FontName Helvetica-Oblique-Ogonki + EncodingScheme StandardEncoding + FullName Helvetica-Oblique-Ogonki Composite font + FontBBox -178 -220 1108 944 +-StartCharMetrics 285 ++StartCharMetrics 286 + C 32 ; WX 278 ; N space ; B 0 0 0 0 ; + C 33 ; WX 278 ; N exclam ; B 124 0 363 729 ; + C 34 ; WX 355 ; N quotedbl ; B 177 462 455 708 ; +@@ -219,6 +219,7 @@ C -1 ; WX 834 ; N onehalf ; B 116 -21 86 + C -1 ; WX 834 ; N onequarter ; B 147 -21 836 709 ; + C -1 ; WX 333 ; N onesuperior ; B 184 284 370 709 ; + C -1 ; WX 556 ; N otilde ; B 80 -23 582 716 ; ++C -1 ; WX 833 ; N Euro ; B 75 0 916 729 ; + C -1 ; WX 584 ; N plusminus ; B 40 0 621 618 ; + C -1 ; WX 737 ; N registered ; B 55 -23 836 741 ; + C -1 ; WX 500 ; N scaron ; B 61 -24 547 740 ; +diff -rupN a2ps-4.14.old/ogonkify/ptmbi-o.afm a2ps-4.14/ogonkify/ptmbi-o.afm +--- a2ps-4.14.old/ogonkify/ptmbi-o.afm 2007-12-28 19:28:25.000000000 -0800 ++++ a2ps-4.14/ogonkify/ptmbi-o.afm 2014-08-07 07:42:54.844757781 -0700 +@@ -5,7 +5,7 @@ FontName Times-BoldItalic-Ogonki + EncodingScheme StandardEncoding + FullName Times-BoldItalic-Ogonki Composite font + FontBBox -168 -232 1014 894 +-StartCharMetrics 285 ++StartCharMetrics 286 + C 32 ; WX 250 ; N space ; B 0 0 0 0 ; + C 33 ; WX 389 ; N exclam ; B 66 -13 367 676 ; + C 34 ; WX 555 ; N quotedbl ; B 142 367 549 693 ; +@@ -219,6 +219,7 @@ C -1 ; WX 750 ; N onehalf ; B 30 0 720 6 + C -1 ; WX 750 ; N onequarter ; B 30 0 720 676 ; + C -1 ; WX 300 ; N onesuperior ; B 17 270 283 676 ; + C -1 ; WX 500 ; N otilde ; B 27 -13 507 648 ; ++C -1 ; WX 889 ; N Euro ; B -29 -12 907 662 ; + C -1 ; WX 570 ; N plusminus ; B 33 0 537 665 ; + C -1 ; WX 747 ; N registered ; B 23 -18 723 676 ; + C -1 ; WX 389 ; N scaron ; B 16 -13 465 683 ; +diff -rupN a2ps-4.14.old/ogonkify/ptmb-o.afm a2ps-4.14/ogonkify/ptmb-o.afm +--- a2ps-4.14.old/ogonkify/ptmb-o.afm 2007-12-28 19:28:25.000000000 -0800 ++++ a2ps-4.14/ogonkify/ptmb-o.afm 2014-08-07 07:42:05.346901410 -0700 +@@ -5,7 +5,7 @@ FontName Times-Bold-Ogonki + EncodingScheme StandardEncoding + FullName Times-Bold-Ogonki Composite font + FontBBox -172 -256 1008 965 +-StartCharMetrics 285 ++StartCharMetrics 286 + C 32 ; WX 250 ; N space ; B 0 0 0 0 ; + C 33 ; WX 333 ; N exclam ; B 84 -18 248 690 ; + C 34 ; WX 555 ; N quotedbl ; B 67 371 425 690 ; +@@ -219,6 +219,7 @@ C -1 ; WX 750 ; N onehalf ; B 30 -18 720 + C -1 ; WX 750 ; N onequarter ; B 30 -18 720 690 ; + C -1 ; WX 300 ; N onesuperior ; B 24 276 275 690 ; + C -1 ; WX 500 ; N otilde ; B 25 -18 473 671 ; ++C -1 ; WX 944 ; N Euro ; B 21 0 914 681 ; + C -1 ; WX 570 ; N plusminus ; B 50 0 520 600 ; + C -1 ; WX 747 ; N registered ; B 16 -17 730 690 ; + C -1 ; WX 389 ; N scaron ; B 29 -17 359 690 ; +diff -rupN a2ps-4.14.old/ogonkify/ptmri-o.afm a2ps-4.14/ogonkify/ptmri-o.afm +--- a2ps-4.14.old/ogonkify/ptmri-o.afm 2007-12-28 19:28:25.000000000 -0800 ++++ a2ps-4.14/ogonkify/ptmri-o.afm 2014-08-07 07:44:39.709572016 -0700 +@@ -5,7 +5,7 @@ FontName Times-Italic-Ogonki + EncodingScheme StandardEncoding + FullName Times-Italic-Ogonki Composite font + FontBBox -169 -217 1010 883 +-StartCharMetrics 285 ++StartCharMetrics 286 + C 32 ; WX 250 ; N space ; B 0 0 0 0 ; + C 33 ; WX 333 ; N exclam ; B 39 -11 302 667 ; + C 34 ; WX 420 ; N quotedbl ; B 144 421 432 666 ; +@@ -167,6 +167,7 @@ C -1 ; WX 444 ; N egrave ; B 31 -11 412 + C -1 ; WX 300 ; N twosuperior ; B 33 271 324 676 ; + C -1 ; WX 444 ; N eacute ; B 31 -11 459 664 ; + C -1 ; WX 500 ; N otilde ; B 27 -11 496 624 ; ++C -1 ; WX 833 ; N Euro ; B -18 0 873 653 ; + C -1 ; WX 611 ; N Aacute ; B -51 0 564 876 ; + C -1 ; WX 500 ; N ocircumflex ; B 27 -11 468 661 ; + C -1 ; WX 444 ; N yacute ; B -24 -206 459 664 ; +diff -rupN a2ps-4.14.old/ogonkify/ptmr-o.afm a2ps-4.14/ogonkify/ptmr-o.afm +--- a2ps-4.14.old/ogonkify/ptmr-o.afm 2007-12-28 19:28:25.000000000 -0800 ++++ a2ps-4.14/ogonkify/ptmr-o.afm 2014-08-07 07:43:38.709516664 -0700 +@@ -5,7 +5,7 @@ FontName Times-Roman-Ogonki + EncodingScheme StandardEncoding + FullName Times-Roman-Ogonki Composite font + FontBBox -168 -218 1000 898 +-StartCharMetrics 285 ++StartCharMetrics 286 + C 32 ; WX 250 ; N space ; B 0 0 0 0 ; + C 33 ; WX 333 ; N exclam ; B 130 -9 238 676 ; + C 34 ; WX 408 ; N quotedbl ; B 77 431 331 676 ; +@@ -167,6 +167,7 @@ C -1 ; WX 444 ; N egrave ; B 25 -10 424 + C -1 ; WX 300 ; N twosuperior ; B 1 270 296 676 ; + C -1 ; WX 444 ; N eacute ; B 25 -10 424 678 ; + C -1 ; WX 500 ; N otilde ; B 29 -10 470 638 ; ++C -1 ; WX 889 ; N Euro ; B 12 0 863 662 ; + C -1 ; WX 722 ; N Aacute ; B 15 0 706 890 ; + C -1 ; WX 500 ; N ocircumflex ; B 29 -10 470 674 ; + C -1 ; WX 500 ; N yacute ; B 14 -218 475 678 ; +diff -rupN a2ps-4.14.old/src/main.c a2ps-4.14/src/main.c +--- a2ps-4.14.old/src/main.c 2007-12-28 17:33:58.000000000 -0800 ++++ a2ps-4.14/src/main.c 2014-08-07 07:49:12.751295878 -0700 +@@ -57,6 +57,7 @@ + #include "signame.h" + #include "long-options.h" + #include "version-etc.h" ++#include + #include + + /* From basename.c */ +@@ -104,7 +105,9 @@ enum behavior behavior = b_ps; + defined twice, see lib/confg.gperf, handling of `Options:'. */ + + char *program_name; ++#ifndef _GNU_SOURCE + const char *program_invocation_name; ++#endif + + /* Stores the data of liba2ps. */ + +@@ -929,6 +932,7 @@ int + main (int argc, char *argv[]) + { + int argn; ++ char *locale; + + /* Architecture specific initialization. */ + #ifdef __EMX__ +@@ -946,11 +950,19 @@ Copyright (c) 2007- Akim Demaille, Migue + + /* Set the NLS on */ + setlocale (LC_TIME, ""); +-#ifdef HAVE_LC_MESSAGES ++#ifdef LC_MESSAGES + setlocale (LC_MESSAGES, ""); + #endif + setlocale (LC_CTYPE, ""); ++#ifdef LC_PAPER ++ setlocale (LC_PAPER, ""); ++#endif ++ locale = setlocale (LC_ALL, ""); + ++#ifdef LC_NUMERIC ++ /* We use international numbering format for e.g. --font-size and writing PostScript code */ ++ setlocale (LC_NUMERIC, "POSIX"); ++#endif + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + diff --git a/a2ps-4.14.tar.gz b/a2ps-4.14.tar.gz new file mode 100644 index 0000000..b4a3662 --- /dev/null +++ b/a2ps-4.14.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4 +size 2552507 diff --git a/a2ps.changes b/a2ps.changes index d91e8b5..6cd9a45 100644 --- a/a2ps.changes +++ b/a2ps.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +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. + + ------------------------------------------------------------------- Wed Jun 25 13:11:26 UTC 2014 - werner@suse.de diff --git a/a2ps.spec b/a2ps.spec index f695b53..0fe8b7d 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -25,43 +25,40 @@ BuildRequires: ghostscript-fonts-std 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 @@ PostScript. Only language text which can be converted from UTF-8 to 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 @@ rename no nb po/no.* 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 @@ rename no nb po/no.* %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