head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.6 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.4 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.2 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.4.0.22 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.20 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.18 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.16 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.14 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.12 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.10 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.8 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.6 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.4 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.2 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.2.0.36 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.34 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.32 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.30 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.28 pkgsrc-2008Q1:1.2.0.26 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.24 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.22 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.20 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.18 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.5 date 2011.10.21.19.37.29; author ryoon; state dead; branches; next 1.4; 1.4 date 2009.02.25.18.44.30; author drochner; state Exp; branches; next 1.3; 1.3 date 2009.02.13.18.53.28; author abs; state Exp; branches; next 1.2; 1.2 date 2005.03.17.12.24.13; author salo; state Exp; branches; next 1.1; 1.1 date 2002.01.25.18.58.02; author kleink; state Exp; branches; next ; desc @@ 1.5 log @Update to 1.6.5.2 * Set LICENSE. * Make pkglint happy Changelog: Summary of changes in enscript version 1.6.5.2: * Fix CFG_FATAL macro in util.c; this prevents a segmentation fault when the configuration file contains unknown parameters. (Savannah bug #28769) * Fix segmentation fault with line lengths over 90 characters. (Savannah bug #29198) Summary of changes in enscript version 1.6.5.1: * Typo corrections in the manual pages. * Reorganise source tree to use a single ChangeLog file. * Actually ship f90.st in the tarball. * Reorganise INSTALL and README. Noteworthy changes in enscript version 1.6.5: * New maintainer. * Licensing change: GNU Enscript is now distributed under version 3 or later of the GNU GPL. * Build system fixes - distcheck now passes. * At least four security bug fixes: - CAN-2004-1184 - CAN-2004-1185 - CAN-2004-1186 - CVE-2008-3863, CVE-2008-4306 * Syntax highlighting fixes. - shell escaping rules from Shawn McMahon. - JavaScript regexps now recognised. - New highlighting rules for Fortran 90 from David Bowler. See changelogs for more detailed notes. @ text @$NetBSD: patch-ab,v 1.4 2009/02/25 18:44:30 drochner Exp $ --- src/psgen.c.orig 2003-03-05 08:36:53.000000000 +0100 +++ src/psgen.c @@@@ -24,6 +24,7 @@@@ * Boston, MA 02111-1307, USA. */ +#include #include "gsint.h" /* @@@@ -124,7 +125,7 @@@@ struct gs_token_st double xscale; double yscale; int llx, lly, urx, ury; /* Bounding box. */ - char filename[512]; + char filename[PATH_MAX]; char *skipbuf; unsigned int skipbuf_len; unsigned int skipbuf_pos; @@@@ -135,11 +136,11 @@@@ struct gs_token_st Color bgcolor; struct { - char name[512]; + char name[PATH_MAX]; FontPoint size; InputEncoding encoding; } font; - char filename[512]; + char filename[PATH_MAX]; } u; }; @@@@ -248,7 +249,7 @@@@ static int do_print = 1; static int user_fontp = 0; /* The user ^@@font{}-defined font. */ -static char user_font_name[256]; +static char user_font_name[PATH_MAX]; static FontPoint user_font_pt; static InputEncoding user_font_encoding; @@@@ -978,7 +979,8 @@@@ large for page\n"), FATAL ((stderr, _("user font encoding can be only the system's default or `ps'"))); - strcpy (user_font_name, token.u.font.name); + memset (user_font_name, 0, sizeof(user_font_name)); + strncpy (user_font_name, token.u.font.name, sizeof(user_font_name) - 1); user_font_pt.w = token.u.font.size.w; user_font_pt.h = token.u.font.size.h; user_font_encoding = token.u.font.encoding; @@@@ -1444,7 +1446,7 @@@@ read_special_escape (InputStream *is, To buf[i] = ch; if (i + 1 >= sizeof (buf)) FATAL ((stderr, _("too long argument for %s escape:\n%.*s"), - escapes[i].name, i, buf)); + escapes[e].name, i, buf)); } buf[i] = '\0'; @@@@ -1452,7 +1454,8 @@@@ read_special_escape (InputStream *is, To switch (escapes[e].escape) { case ESC_FONT: - strcpy (token->u.font.name, buf); + memset (token->u.font.name, 0, sizeof(token->u.font.name)); + strncpy (token->u.font.name, buf, sizeof(token->u.font.name) - 1); /* Check for the default font. */ if (strcmp (token->u.font.name, "default") == 0) @@@@ -1465,7 +1468,8 @@@@ read_special_escape (InputStream *is, To FATAL ((stderr, _("malformed font spec for ^@@font escape: %s"), token->u.font.name)); - strcpy (token->u.font.name, cp); + memset (token->u.font.name, 0, sizeof(token->u.font.name)); + strncpy (token->u.font.name, cp, sizeof(token->u.font.name) - 1); xfree (cp); } token->type = tFONT; @@@@ -1544,7 +1548,8 @@@@ read_special_escape (InputStream *is, To break; case ESC_SETFILENAME: - strcpy (token->u.filename, buf); + memset (token->u.filename, 0, sizeof(token->u.font.name)); + strncpy (token->u.filename, buf, sizeof(token->u.filename) - 1); token->type = tSETFILENAME; break; @@@@ -2034,8 +2039,9 @@@@ dump_ps_page_header (char *fname, int em else { ftail++; - strncpy (buf, fname, ftail - fname); - buf[ftail - fname] = '\0'; + i = ftail - fname >= sizeof (buf)-1 ? sizeof (buf)-1 : ftail - fname; + strncpy (buf, fname, i); + buf[i] = '\0'; } if (nup > 1) @@@@ -2385,9 +2391,10 @@@@ recognize_eps_file (Token *token) MESSAGE (2, (stderr, "^@@epsf=\"%s\"\n", token->u.epsf.filename)); i = strlen (token->u.epsf.filename); + /* if (i > 0 && token->u.epsf.filename[i - 1] == '|') { - /* Read EPS data from pipe. */ + / * Read EPS data from pipe. * / token->u.epsf.pipe = 1; token->u.epsf.filename[i - 1] = '\0'; token->u.epsf.fp = popen (token->u.epsf.filename, "r"); @@@@ -2400,6 +2407,7 @@@@ recognize_eps_file (Token *token) } } else + */ { char *filename; @ 1.4 log @pull in a patch from redhat to fix a buffer overflow (CVE-2008-3863), bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Updated print/enscript to 1.6.4 pkgsrc changes: Add PKG_DESTDIR_SUPPORT, Set PAPERSIZE in BUILD_DEFS, pkglint Changes since 1.6.3: 2003-02-28 gettextize * Makefile.am (SUBDIRS): Add intl. * configure.in (AC_OUTPUT): Add intl/Makefile, 2003-02-28 gettextize * Makefile.am (SUBDIRS): Add m4. (ACLOCAL_AMFLAGS): New variable. (EXTRA_DIST): Add config.rpath. * configure.in (AC_OUTPUT): Add po/Makefile.in, (AM_GNU_GETTEXT_VERSION): Bump to 0.11.5. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2005/03/17 12:24:13 salo Exp $ d3 1 a3 1 --- src/psgen.c.orig 2003-03-05 07:36:53.000000000 +0000 d5 90 a94 1 @@@@ -2034,8 +2034,9 @@@@ dump_ps_page_header (char *fname, int em d106 1 a106 1 @@@@ -2385,9 +2386,10 @@@@ recognize_eps_file (Token *token) d118 1 a118 1 @@@@ -2400,6 +2402,7 @@@@ recognize_eps_file (Token *token) @ 1.2 log @Update to version 1.6.3nb1 nb1: ==== - security fixes for CAN-2004-1184, CAN-2004-1185, CAN-2004-1186 - patches from Debian/Gentoo - addresses PR pkg/29721 1.6.3: ====== - Changes in the highlighting / pretty printing - Support for state inheritance. - new highlighting rules - new output language `ansi' to print color outputs - new encodings - new options @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- src/psgen.c.orig 2002-01-24 08:38:58.000000000 +0100 +++ src/psgen.c 2005-03-17 11:56:57.000000000 +0100 @@@@ -2034,8 +2034,9 @@@@ d17 1 a17 1 @@@@ -2385,9 +2386,10 @@@@ d29 1 a29 1 @@@@ -2400,6 +2402,7 @@@@ @ 1.1 log @Update to 1.6.1nb1: fix temporary file creation vulnerability; from Tim Waugh via Debian. @ text @d3 33 a35 9 --- src/psgen.c.orig Thu Jun 25 09:18:54 1998 +++ src/psgen.c Fri Jan 25 19:39:07 2002 @@@@ -2398,7 +2398,7 @@@@ read_float (InputStream *is, int units, int horizontal) { char buf[256]; - int i, ch; + int i, ch = 0; double val; a36 45 for (i = 0; (i < sizeof (buf) - 1 @@@@ -2618,31 +2618,15 @@@@ static void divert () { - char *cp; - assert (divertfp == NULL); /* Open divert file. */ - cp = tempnam (NULL, "ens"); - if (cp == NULL) - FATAL ((stderr, _("couldn't create divert file name: %s"), - strerror (errno))); - - strcpy (divertfname, cp); - - divertfp = fopen (divertfname, "w+b"); + divertfp = tmpfile (); if (divertfp == NULL) FATAL ((stderr, _("couldn't create divert file \"%s\": %s"), divertfname, strerror (errno))); - if (remove (divertfname) == 0) - /* Remove successfull, no need to remove file in undivert(). */ - divertfname[0] = '\0'; - - /* Free the buffer allocated by tempnam(). */ - free (cp); - cofp = divertfp; } @@@@ -2696,10 +2680,6 @@@@ fclose (divertfp); divertfp = NULL; - - /* Do we have to remove the divert file? */ - if (divertfname[0]) - (void) remove (divertfname); cofp = ofp; } @