diff options
author | wiz <wiz@pkgsrc.org> | 2008-11-10 18:00:34 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2008-11-10 18:00:34 +0000 |
commit | 2926dd273bdfe3b9652a9fc54e66f952dd7bf9c3 (patch) | |
tree | 40ac12f6d2807ae58a7e3b3bf4e00d948eab3d86 /print | |
parent | f9f90615b2ef84a32625156d42e33f682c08c0a6 (diff) | |
download | pkgsrc-2926dd273bdfe3b9652a9fc54e66f952dd7bf9c3.tar.gz |
Update to 4.14. Security problems cited below were already fixed
in pkgsrc.
Version 4.14 Dec 29, 2007
* New Maintainer.
* No UTF-8 support yet ;-< Basically this is a maintenance release.
* License:
- Now GNU a2ps is licensed under GPLv3 or later.
- Removed or replaced non-free/license-wise vague files (see
ChangeLog for detail.)
* Build:
- Now can be built with the modern GNU Autotools.
- Now can be built with gcc 3.4 or later.
* Predefined delegations:
- Add html2ps delegation if netscape don't run.
- Now the configure script check if netscape support remote-command.
- Now works with modern GV(PostScript and PDF viewer). Tested with
3.6.2.
* Options:
- Better description on the default output and the -d option.
* Encodings:
- CP1251.
* Bug Fixes:
- `input buffer overflow, can't enlarge buffer because scanner uses REJECT'
This should no longer happen.
- Now works on IA64, PowerPC and AMD64.
- Fixed wrong default values for deskjet printers.
- Quote arguments to file(1).
- Fixed several security issues (CVE-2004-1377).
- PS generated by a2ps is now compatible with Adobe Distiller for Mac OS X.
* Style sheets:
- specc.ssh, thanks to Hideaki Yokota
- csharp.ssh, thanks to Karen Christenson
- nasm.ssh & pic16f84.ssh, thanks to Aleksandar Veselinovic
- small.ssh, thanks Christophe Continente
- matlab4.ssh & matlab.ssh, thanks to Joakim Lubeck
- stratego.ssh, thanks to Nicolas Tisserand
- rd.ssh, s.ssh and st.ssh, thanks to Torsten Hothorn et.al.
- ruby.ssh, thanks to Noritsugu Nakamura.
- php.ssh, thanks to Hartmut Holzgraefe
- udiff.ssh: Improved highlighting for diffs.
- perl.ssh: Improved.
- Some rules of sheets.map are improved
* Contributions:
- pdiff: Now pdiff can accept standard input.
* Prologues:
- Added diffcolor.pro for diffs
* Documentation:
- Revised.
* Translation:
- Japanese translation thanks to Yasuyuki Furukawa.
- Revised Dutch translation, thanks to Benno Schlenberg.
- Revised French translation.
* Many other fixes, but the log is rather spotty ;-<
* Part of works done at the Codefest Asia 2007 in ITB Bandung, Indonesia.
Diffstat (limited to 'print')
-rw-r--r-- | print/a2ps/Makefile | 12 | ||||
-rw-r--r-- | print/a2ps/PLIST | 24 | ||||
-rw-r--r-- | print/a2ps/distinfo | 16 | ||||
-rw-r--r-- | print/a2ps/patches/patch-aa | 38 | ||||
-rw-r--r-- | print/a2ps/patches/patch-ab | 14 | ||||
-rw-r--r-- | print/a2ps/patches/patch-ac | 59 | ||||
-rw-r--r-- | print/a2ps/patches/patch-ad | 31 | ||||
-rw-r--r-- | print/a2ps/patches/patch-ae | 32 | ||||
-rw-r--r-- | print/a2ps/patches/patch-af | 19 |
9 files changed, 56 insertions, 189 deletions
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile index ded89ff7da6..5f378500a48 100644 --- a/print/a2ps/Makefile +++ b/print/a2ps/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.67 2008/06/12 02:14:42 joerg Exp $ +# $NetBSD: Makefile,v 1.68 2008/11/10 18:00:34 wiz Exp $ -DISTNAME= a2ps-4.13b -PKGNAME= a2ps-4.13.0.2 -PKGREVISION= 11 +DISTNAME= a2ps-4.14 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU:=a2ps/} \ ftp://ftp.enst.fr/pub/unix/a2ps/ @@ -11,13 +9,10 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www-inf.enst.fr/~demaille/a2ps/ COMMENT= Formats an ascii file for printing on a postscript printer -PKG_DESTDIR_SUPPORT= user-destdir - DEPENDS+= psutils>=1.17:../../print/psutils -.include "../../mk/bsd.prefs.mk" +PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/a2ps-4.13 STRIP= # empty USE_LIBTOOL= yes @@ -43,4 +38,5 @@ pre-build: ${TOUCH} ${WRKSRC}/doc/*.dvi .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/gperf/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/a2ps/PLIST b/print/a2ps/PLIST index 99ebb69958a..fe4e85f0491 100644 --- a/print/a2ps/PLIST +++ b/print/a2ps/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:32 jlam Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/11/10 18:00:34 wiz Exp $ bin/a2ps bin/card bin/composeglyphs @@ -25,6 +25,10 @@ man/man1/texi2dvi4a2ps.1 share/a2ps/README share/a2ps/afm/fonts.map share/a2ps/afm/make_fonts_map.sh +share/a2ps/afm/pagb.afm +share/a2ps/afm/pagbo.afm +share/a2ps/afm/pagd.afm +share/a2ps/afm/pagdo.afm share/a2ps/afm/pbkd.afm share/a2ps/afm/pbkdi.afm share/a2ps/afm/pbkl.afm @@ -75,6 +79,7 @@ share/a2ps/encoding/iso9.edf share/a2ps/encoding/koi8.edf share/a2ps/encoding/mac.edf share/a2ps/encoding/ms-cp1250.edf +share/a2ps/encoding/ms-cp1251.edf share/a2ps/fonts/pcfont.pfa share/a2ps/ppd/README share/a2ps/ppd/level1.ppd @@ -86,6 +91,7 @@ share/a2ps/ps/bw.pro share/a2ps/ps/color.hdr share/a2ps/ps/color.pro share/a2ps/ps/diff.pro +share/a2ps/ps/diffcolor.pro share/a2ps/ps/ehandler.ps share/a2ps/ps/fixed.pro share/a2ps/ps/gray.pro @@ -110,6 +116,7 @@ share/a2ps/sheets/clisp.ssh share/a2ps/sheets/coqv.ssh share/a2ps/sheets/cpp.ssh share/a2ps/sheets/csh.ssh +share/a2ps/sheets/csharp.ssh share/a2ps/sheets/cxx.ssh share/a2ps/sheets/dc_shell.ssh share/a2ps/sheets/eiffel.ssh @@ -139,11 +146,13 @@ share/a2ps/sheets/lout.ssh share/a2ps/sheets/mail.ssh share/a2ps/sheets/make.ssh share/a2ps/sheets/maple.ssh +share/a2ps/sheets/matlab.ssh share/a2ps/sheets/matlab4.ssh share/a2ps/sheets/mib.ssh share/a2ps/sheets/mly.ssh share/a2ps/sheets/modula2.ssh share/a2ps/sheets/modula3.ssh +share/a2ps/sheets/nasm.ssh share/a2ps/sheets/o2c.ssh share/a2ps/sheets/oberon.ssh share/a2ps/sheets/objc.ssh @@ -152,6 +161,8 @@ share/a2ps/sheets/octave.ssh share/a2ps/sheets/oracle.ssh share/a2ps/sheets/pascal.ssh share/a2ps/sheets/perl.ssh +share/a2ps/sheets/php.ssh +share/a2ps/sheets/pic16f84.ssh share/a2ps/sheets/plsql.ssh share/a2ps/sheets/pov.ssh share/a2ps/sheets/ppd.ssh @@ -161,7 +172,10 @@ share/a2ps/sheets/prolog.ssh share/a2ps/sheets/promela.ssh share/a2ps/sheets/ps.ssh share/a2ps/sheets/python.ssh +share/a2ps/sheets/rd.ssh share/a2ps/sheets/rexx.ssh +share/a2ps/sheets/ruby.ssh +share/a2ps/sheets/s.ssh share/a2ps/sheets/sather.ssh share/a2ps/sheets/scheme.ssh share/a2ps/sheets/sdl88.ssh @@ -169,10 +183,14 @@ share/a2ps/sheets/sed.ssh share/a2ps/sheets/sh.ssh share/a2ps/sheets/sheets.map share/a2ps/sheets/shell.ssh +share/a2ps/sheets/small.ssh share/a2ps/sheets/sml.ssh +share/a2ps/sheets/specc.ssh share/a2ps/sheets/sql.ssh share/a2ps/sheets/sql92.ssh share/a2ps/sheets/ssh.ssh +share/a2ps/sheets/st.ssh +share/a2ps/sheets/stratego.ssh share/a2ps/sheets/symbols.ssh share/a2ps/sheets/tcl.ssh share/a2ps/sheets/tclx.ssh @@ -193,8 +211,6 @@ share/a2ps/sheets/wdiff.ssh share/a2ps/sheets/xs.ssh share/a2ps/sheets/yacc.ssh share/a2ps/sheets/zsh.ssh -share/emacs/site-lisp/a2ps-print.el -share/emacs/site-lisp/a2ps.el share/examples/a2ps/a2ps-site.cfg share/examples/a2ps/a2ps.cfg share/locale/ca/LC_MESSAGES/a2ps.mo @@ -202,9 +218,9 @@ share/locale/cs/LC_MESSAGES/a2ps.mo share/locale/da/LC_MESSAGES/a2ps.mo share/locale/de/LC_MESSAGES/a2ps.mo share/locale/es/LC_MESSAGES/a2ps.mo -share/locale/et/LC_MESSAGES/a2ps.mo share/locale/fr/LC_MESSAGES/a2ps.mo share/locale/it/LC_MESSAGES/a2ps.mo +share/locale/ja/LC_MESSAGES/a2ps.mo share/locale/ko/LC_MESSAGES/a2ps.mo share/locale/nl/LC_MESSAGES/a2ps.mo share/locale/no/LC_MESSAGES/a2ps.mo diff --git a/print/a2ps/distinfo b/print/a2ps/distinfo index ae38a62f824..cc284e164bf 100644 --- a/print/a2ps/distinfo +++ b/print/a2ps/distinfo @@ -1,11 +1,7 @@ -$NetBSD: distinfo,v 1.10 2006/06/07 21:06:49 minskim Exp $ +$NetBSD: distinfo,v 1.11 2008/11/10 18:00:34 wiz Exp $ -SHA1 (a2ps-4.13b.tar.gz) = cfc79a3e54115e569f667fa3fd2c2ec16d22b31a -RMD160 (a2ps-4.13b.tar.gz) = affc47a7487f2459184be0be76e49b1e185fc53d -Size (a2ps-4.13b.tar.gz) = 1944289 bytes -SHA1 (patch-aa) = 67f0c9ddf6e9829aeecb3de596c925d451990877 -SHA1 (patch-ab) = ba7446a32733d60910036190be957045d4ec1218 -SHA1 (patch-ac) = 5daaedd3866c731206b829124d8a3f4741512d17 -SHA1 (patch-ad) = a9ed67aeb2723153e1023980ff69086bca0f1f59 -SHA1 (patch-ae) = 34b45a6c37b721547d23c1d65e51b6e919cb3671 -SHA1 (patch-af) = 5ef90175f69a70e57aac8fa9a9d487f5a5c86820 +SHA1 (a2ps-4.14.tar.gz) = 365abbbe4b7128bf70dad16d06e23c5701874852 +RMD160 (a2ps-4.14.tar.gz) = a5105d6256a809483e099519325979aaaff7219e +Size (a2ps-4.14.tar.gz) = 2552507 bytes +SHA1 (patch-aa) = 6317b6abca697388538fc705037da55379a4e1e1 +SHA1 (patch-ab) = 7b1f1e3ed2af47e7d9864ec2dbcd7d105f93632a diff --git a/print/a2ps/patches/patch-aa b/print/a2ps/patches/patch-aa index 112dc77ea9f..78a6bac4652 100644 --- a/print/a2ps/patches/patch-aa +++ b/print/a2ps/patches/patch-aa @@ -1,22 +1,22 @@ -$NetBSD: patch-aa,v 1.10 2001/09/09 12:24:46 tron Exp $ +$NetBSD: patch-aa,v 1.11 2008/11/10 18:00:34 wiz Exp $ ---- contrib/emacs/Makefile.in.orig Thu Feb 24 19:01:08 2000 -+++ contrib/emacs/Makefile.in Sun Sep 9 14:18:39 2001 -@@ -128,7 +128,7 @@ - YACC = @YACC@ - file_prog = @file_prog@ - l = @l@ +--- contrib/emacs/Makefile.in.orig 2007-12-29 03:28:06.000000000 +0000 ++++ contrib/emacs/Makefile.in +@@ -243,7 +243,7 @@ install_sh = @install_sh@ + latex = @latex@ + libdir = @libdir@ + libexecdir = @libexecdir@ -lispdir = @lispdir@ +lispdir = @prefix@/share/emacs/site-lisp - - - dist_lisp_LISP = a2ps.el a2ps-print.el -@@ -181,7 +181,7 @@ - .el.elc: - @echo 'WARNING: Warnings can be ignored. :-)' - if test $(EMACS) != no; then \ -- EMACS=$(EMACS) $(SHELL) $(srcdir)/elisp-comp $<; \ -+ echo EMACS=$(EMACS) $(SHELL) $(srcdir)/elisp-comp $<; \ - fi - - mostlyclean-lisp: + localedir = @localedir@ + localstatedir = @localstatedir@ + makeinfo = @makeinfo@ +@@ -319,7 +319,7 @@ elc-stamp: $(LISP) + set x "$$@" "$$d$$p"; shift; \ + done; \ + shift; \ +- EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \ ++ echo EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \ + else : ; fi + @mv -f elc-temp $@ + $(am__ELCFILES): elc-stamp diff --git a/print/a2ps/patches/patch-ab b/print/a2ps/patches/patch-ab index 10f4d23585d..fb8d16193c5 100644 --- a/print/a2ps/patches/patch-ab +++ b/print/a2ps/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.5 2002/11/26 11:02:06 jmmv Exp $ +$NetBSD: patch-ab,v 1.6 2008/11/10 18:00:34 wiz Exp $ ---- etc/Makefile.in.orig Thu Feb 24 18:55:34 2000 +--- etc/Makefile.in.orig 2007-12-29 03:28:07.000000000 +0000 +++ etc/Makefile.in -@@ -136,7 +136,7 @@ libpath = $(pkgdatadir)/sheets:$(pkgdata - +@@ -264,7 +264,7 @@ tex = @tex@ + ogonkifydir = $(datadir)/ogonkify + libpath = $(pkgdatadir)/sheets:$(pkgdatadir)/ps:$(pkgdatadir)/encoding:$(pkgdatadir)/afm:$(ogonkifydir)/afm:$(pkgdatadir)/ppd:$(pkgdatadir)/fonts:$(ogonkifydir)/fonts:$(pkgdatadir) pkgdata_DATA = README - -dsysconf = $(DESTDIR)$(sysconfdir) +dsysconf = $(DESTDIR)$(datadir)/examples/@PACKAGE@ - EXTRA_DIST = README.in - + DISTCLEANFILES = a2ps.cfg README + all: all-am diff --git a/print/a2ps/patches/patch-ac b/print/a2ps/patches/patch-ac deleted file mode 100644 index 9fa95435677..00000000000 --- a/print/a2ps/patches/patch-ac +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2004/12/20 15:02:34 wiz Exp $ - ---- src/select.c.orig 1999-12-16 02:04:56.000000000 +0100 -+++ src/select.c -@@ -131,6 +131,36 @@ sheets_map_load_main (void) - 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 @@ file_verdict_on (const uchar *filename) - 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/print/a2ps/patches/patch-ad b/print/a2ps/patches/patch-ad deleted file mode 100644 index 347d466215f..00000000000 --- a/print/a2ps/patches/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2005/06/09 14:53:49 salo Exp $ - -Fix for CAN-2004-1377 - ---- contrib/fixps.in.orig 2000-02-21 09:16:15.000000000 +0100 -+++ contrib/fixps.in 2005-06-09 16:45:42.000000000 +0200 -@@ -38,7 +38,6 @@ - run_gs=0 - # What action to perform: fixps, cat, check, and gs - task=fixps --tmpdir=/tmp/$program.$$ - verbose=echo - - # The version/usage strings -@@ -183,6 +182,8 @@ - exit 1;; - esac - -+tmpdir=`mktemp -d -t fixps.XXXXXX` || { echo "$program: Cannot create temporary directory!" >&2 ; exit 1; } -+ - if test -n "$debug"; then - # Set -x now if debugging - set -x -@@ -191,7 +192,6 @@ - trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15 - fi - --mkdir $tmpdir - fixps_sed=$tmpdir/fixps.sed - - # If printing from stdin, save into a tmp file diff --git a/print/a2ps/patches/patch-ae b/print/a2ps/patches/patch-ae deleted file mode 100644 index df873963442..00000000000 --- a/print/a2ps/patches/patch-ae +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2005/06/09 14:53:49 salo Exp $ - -Fix for CAN-2004-1377 - ---- contrib/psmandup.in.orig 1999-10-24 15:06:42.000000000 +0200 -+++ contrib/psmandup.in 2005-06-09 16:46:24.000000000 +0200 -@@ -36,7 +36,6 @@ - message= - psselect=${PSSELECT:-psselect} - psset=${PSSET:-psset} --tmpdir=/tmp/$program.$$ - - # These two must be kept in synch. They are opposed. - verbose=echo -@@ -177,6 +176,8 @@ - exit 1;; - esac - -+tmpdir=`mktemp -d -t psmandup.XXXXXX` || { echo "$program: Cannot create temporary directory!" >&2 ; exit 1; } -+ - if test -n "$debug"; then - # Set -x now if debugging - set -x -@@ -185,8 +186,6 @@ - trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15 - fi - --mkdir $tmpdir -- - # If printing from stdin, save into a tmp file - if test $file = '-'; then - file=$tmpdir/stdin.ps diff --git a/print/a2ps/patches/patch-af b/print/a2ps/patches/patch-af deleted file mode 100644 index 81157dd539a..00000000000 --- a/print/a2ps/patches/patch-af +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-af,v 1.4 2006/06/07 21:06:49 minskim Exp $ - ---- lib/path-concat.c.orig 1999-10-10 18:34:46.000000000 +0000 -+++ lib/path-concat.c -@@ -26,13 +26,12 @@ - #endif - - #include <stdio.h> -+#include <stdlib.h> - #if HAVE_STRING_H - # include <string.h> - #endif - #include <sys/types.h> - --char *malloc (); -- - #ifndef DIRECTORY_SEPARATOR - # define DIRECTORY_SEPARATOR '/' - #endif |