pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q3]: pkgsrc/print/gv Pullup ticket 1918 - requested by tron
details: https://anonhg.NetBSD.org/pkgsrc/rev/672cda4097a8
branches: pkgsrc-2006Q3
changeset: 519196:672cda4097a8
user: ghen <ghen%pkgsrc.org@localhost>
date: Thu Nov 23 09:03:49 2006 +0000
description:
Pullup ticket 1918 - requested by tron
security update for gv
- pkgsrc/print/gv/Makefile 1.61-1.62
- pkgsrc/print/gv/distinfo 1.14-1.15
- pkgsrc/print/gv/patches/patch-aa 1.14
- pkgsrc/print/gv/patches/patch-ab 1.8
- pkgsrc/print/gv/patches/patch-ac 1.9
- pkgsrc/print/gv/patches/patch-ad 1.5
- pkgsrc/print/gv/patches/patch-ae 1.9
- pkgsrc/print/gv/patches/patch-af 1.6
Module Name: pkgsrc
Committed By: tron
Date: Mon Oct 23 12:29:56 UTC 2006
Modified Files:
pkgsrc/print/gv: Makefile distinfo
pkgsrc/print/gv/patches: patch-aa patch-ab patch-ad patch-ae patch-af
Removed Files:
pkgsrc/print/gv/patches: patch-ac
Log Message:
Update "gv" package to version 3.6.2. This is release fixes several
bugs present in the 3.6.1 release.
Based on patches provided by Thomas Klausner in private e-mail.
---
Module Name: pkgsrc
Committed By: tron
Date: Tue Nov 21 13:58:10 UTC 2006
Modified Files:
pkgsrc/print/gv: Makefile distinfo
Added Files:
pkgsrc/print/gv/patches: patch-ac
Log Message:
Add security fix for CVE-2006-5864 based on patch taken from Debian Sarge.
Bump package revision because of this fix.
diffstat:
print/gv/Makefile | 12 +---
print/gv/distinfo | 20 ++++----
print/gv/patches/patch-aa | 23 ++------
print/gv/patches/patch-ab | 111 ++++++++++++++++++++++++++++++++++++---------
print/gv/patches/patch-ac | 45 ++++++++++--------
print/gv/patches/patch-ad | 18 +++---
print/gv/patches/patch-ae | 6 +-
print/gv/patches/patch-af | 18 +++---
8 files changed, 153 insertions(+), 100 deletions(-)
diffs (truncated from 325 to 300 lines):
diff -r 2940e85f911b -r 672cda4097a8 print/gv/Makefile
--- a/print/gv/Makefile Thu Nov 23 08:52:58 2006 +0000
+++ b/print/gv/Makefile Thu Nov 23 09:03:49 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2006/04/06 18:18:15 jlam Exp $
+# $NetBSD: Makefile,v 1.60.4.1 2006/11/23 09:03:49 ghen Exp $
-DISTNAME= gv-3.6.1
+DISTNAME= gv-3.6.2
PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU:=gv/}
@@ -13,7 +13,7 @@
USE_TOOLS+= gmake gs:run makeinfo
TEXINFO_REQD= 4.2
-INFO_FILES= # PLIST
+INFO_FILES= yes
# this pkg does not work with std xaw, but xpm and xaw3d work
XAW_TYPE?= 3d
@@ -22,11 +22,5 @@
XAW_TYPE= 3d
.endif
-.if !exists(/usr/include/getopt.h)
-. include "../../pkgtools/libnbcompat/buildlink3.mk"
-post-extract:
- cd ${WRKSRC}/src && ${LN} -s ${PREFIX}/include/nbcompat.h getopt.h
-.endif
-
.include "../../mk/xaw.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 2940e85f911b -r 672cda4097a8 print/gv/distinfo
--- a/print/gv/distinfo Thu Nov 23 08:52:58 2006 +0000
+++ b/print/gv/distinfo Thu Nov 23 09:03:49 2006 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2006/01/15 20:07:42 joerg Exp $
+$NetBSD: distinfo,v 1.13.6.1 2006/11/23 09:03:49 ghen Exp $
-SHA1 (gv-3.6.1.tar.gz) = a094d019772e11c6003cc8682c945b7b9bc700b7
-RMD160 (gv-3.6.1.tar.gz) = d783a15f581eb32efc65981b693db44aed193de2
-Size (gv-3.6.1.tar.gz) = 453921 bytes
-SHA1 (patch-aa) = 2034f06c3297af89bc06b2eba10c1828168b1b33
-SHA1 (patch-ab) = 1b97781ebbf51447d0cddd04f6bce30c42187294
-SHA1 (patch-ac) = eb1007d4a10b7e9bfcfa22ecd19d2694914ab208
-SHA1 (patch-ad) = 69378625f582e823e6ec0e68fce254f87f61b1d3
-SHA1 (patch-ae) = 6f88f095aa1ce011e6836b5e98602bf5c8825625
-SHA1 (patch-af) = f51ec8f50a08c83a48b3ecf0ded4dfca9d0f96f9
+SHA1 (gv-3.6.2.tar.gz) = 9753904c7c7c3c89b98c8e949a1579bfbd3b6af5
+RMD160 (gv-3.6.2.tar.gz) = 6479102493e3ebf5b2602a577c02a8b573a73cab
+Size (gv-3.6.2.tar.gz) = 446040 bytes
+SHA1 (patch-aa) = 4a13819735017694fad8a44e3b50a90b763c4a46
+SHA1 (patch-ab) = 63d103a821074ab36a6cf946bbf1252d4d356987
+SHA1 (patch-ac) = 9855bff1b2bf6f43a0749035585abd38a1d87866
+SHA1 (patch-ad) = b2f3060594d1ca1c53e74b3247ab7dba6e4a3326
+SHA1 (patch-ae) = 2d1057004a1bd1b29af491c3163d83dd31bba7c2
+SHA1 (patch-af) = 618164139ea6dcc81996dff659d01ede6245ff43
diff -r 2940e85f911b -r 672cda4097a8 print/gv/patches/patch-aa
--- a/print/gv/patches/patch-aa Thu Nov 23 08:52:58 2006 +0000
+++ b/print/gv/patches/patch-aa Thu Nov 23 09:03:49 2006 +0000
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.13 2005/02/24 07:43:30 reed Exp $
+$NetBSD: patch-aa,v 1.13.14.1 2006/11/23 09:03:49 ghen Exp $
---- src/main.c.orig Mon Dec 6 15:36:57 2004
-+++ src/main.c
-@@ -321,6 +321,8 @@ int main(argc, argv)
- Dimension maximum_width,maximum_height;
- unsigned int gwidth=0,gheight=0;
- int dim_forced;
-+ int opt_counter = 0;
-+ int c;
-
- /*### initializing global variables ####################################*/
-
-@@ -419,8 +421,6 @@ int main(argc, argv)
+--- src/main.c.orig 2006-09-14 19:56:08.000000000 +0100
++++ src/main.c 2006-10-23 12:50:43.000000000 +0100
+@@ -408,7 +408,7 @@
}
/*### Manage GNU command line arguments ########################*/
-- int opt_counter = 0;
-- int c;
- while ((c = getopt_long (argc, argv, "vhu", GNU_longOptions, NULL))
+- while ((c = getopt_long_only (argc, argv, "vhu", GNU_longOptions, NULL))
++ while ((c = getopt_long (argc, argv, "vhu", GNU_longOptions, NULL))
!= -1)
{
+
diff -r 2940e85f911b -r 672cda4097a8 print/gv/patches/patch-ab
--- a/print/gv/patches/patch-ab Thu Nov 23 08:52:58 2006 +0000
+++ b/print/gv/patches/patch-ab Thu Nov 23 09:03:49 2006 +0000
@@ -1,25 +1,88 @@
-$NetBSD: patch-ab,v 1.7 2004/12/30 21:04:25 snj Exp $
+$NetBSD: patch-ab,v 1.7.14.1 2006/11/23 09:03:49 ghen Exp $
---- src/ps.c.orig 2004-12-07 15:55:59.000000000 -0800
-+++ src/ps.c 2004-12-30 12:36:25.000000000 -0800
-@@ -531,16 +531,16 @@ unc_ok:
- doc->beginheader = position;
- section_len = line_len;
- } else if (iscomment(line,"%PDF-") && cmd_scan_pdf) {
--
-- /* PDF hack to set DELAYSAFER on interpreter invocation */
-- pdf_delaysafer_hack = 1;
--
- struct document *retval = NULL;
- FILE *tmpfile = (FILE*)NULL;
- char *filename_dsc;
- char cmd[512];
- char s[512];
- mode_t old_umask;
-+
-+ /* PDF hack to set DELAYSAFER on interpreter invocation */
-+ pdf_delaysafer_hack = 1;
-+
- filename_dsc=file_getTmpFilename(NULL,filename_raw);
- sprintf(cmd,cmd_scan_pdf,filename,filename_dsc);
- old_umask = umask(0077);
+--- src/gv_message.h.orig 2005-03-31 14:02:39.000000000 +0100
++++ src/gv_message.h 2006-10-23 13:16:40.000000000 +0100
+@@ -29,48 +29,48 @@
+ char *message_usage = "\
+ Usage: gv [OPTION]... [FILE]\n\
+ PostScript and PDF viewer.\n\
+- [-]-monochrome display document using only black and white\n\
+- [-]-grayscale display document without colors\n\
+- [-]-color display document as usual\n\
+- [-]-safer start ghostscript in safe mode\n\
+- [-]-nosafer do not start ghostscript in safe mode\n\
+- [-]-quiet start ghostscript with the -dQUIET option\n\
+- [-]-noquiet do not start ghostscript with the -dQUIET option\n\
+- [-]-arguments=ARGS start ghostscript with additional options as specified\n\
++ --monochrome display document using only black and white\n\
++ --grayscale display document without colors\n\
++ --color display document as usual\n\
++ --safer start ghostscript in safe mode\n\
++ --nosafer do not start ghostscript in safe mode\n\
++ --quiet start ghostscript with the -dQUIET option\n\
++ --noquiet do not start ghostscript with the -dQUIET option\n\
++ --arguments=ARGS start ghostscript with additional options as specified\n\
+ by the string ARGS\n\
+- [-]-page=LABEL display the page with label LABEL first\n\
+- [-]-center the page should be centered automatically\n\
+- [-]-nocenter the page should not be centered automatically\n\
+- [-]-media=MEDIA selects the paper size to be used\n\
+- [-]-orientation=ORIENTATION sets the orientation of the page\n\
+- [-]-scale=N selects the scale N\n\
+- [-]-scalebase=N selects the scale base N\n\
+- [-]-swap interchange the meaning of the orientations landscape\n\
++ --page=LABEL display the page with label LABEL first\n\
++ --center the page should be centered automatically\n\
++ --nocenter the page should not be centered automatically\n\
++ --media=MEDIA selects the paper size to be used\n\
++ --orientation=ORIENTATION sets the orientation of the page\n\
++ --scale=N selects the scale N\n\
++ --scalebase=N selects the scale base N\n\
++ --swap interchange the meaning of the orientations landscape\n\
+ and seascape\n\
+- [-]-noswap do not interchange the meaning of the orientation\n\
++ --noswap do not interchange the meaning of the orientation\n\
+ landscape and seascape\n\
+- [-]-antialias use antialiasing\n\
+- [-]-noantialias do not use antialiasing\n\
+- [-]-dsc dsc comments are respected\n\
+- [-]-nodsc dsc comments are not respected\n\
+- [-]-eof ignore the postscript EOF comment while scanning\n\
++ --antialias use antialiasing\n\
++ --noantialias do not use antialiasing\n\
++ --dsc dsc comments are respected\n\
++ --nodsc dsc comments are not respected\n\
++ --eof ignore the postscript EOF comment while scanning\n\
+ documents\n\
+- [-]-noeof do not ignore the postscript EOF comment while\n\
++ --noeof do not ignore the postscript EOF comment while\n\
+ scanning documents\n\
+- [-]-pixmap use backing pixmap\n\
+- [-]-nopixmap do not use backing pixmap\n\
+- [-]-watch watch the document file for changes\n\
+- [-]-nowatch do not watch the document file for changes\n\
+- [-]-help print a help message and exit\n\
+- [-]-usage print a usage message and exit\n\
+- [-]-resize fit the size of the window to the size of the page\n\
+- [-]-noresize do not fit the size of the window to the size of the page\n\
++ --pixmap use backing pixmap\n\
++ --nopixmap do not use backing pixmap\n\
++ --watch watch the document file for changes\n\
++ --nowatch do not watch the document file for changes\n\
++ --help print a help message and exit\n\
++ --usage print a usage message and exit\n\
++ --resize fit the size of the window to the size of the page\n\
++ --noresize do not fit the size of the window to the size of the page\n\
+ -geometry [<width>][x<height>][{+-}<xoffset>{+-}<yoffset>]\n\
+- [-]-ad=FILE read and use additional resources from FILE\n\
+- [-]-style=FILE read and use additional resources from FILE. These resources\n\
++ --ad=FILE read and use additional resources from FILE\n\
++ --style=FILE read and use additional resources from FILE. These resources\n\
+ have lower priority than those provided on the context of --ad\n\
+- [-]-spartan shortcut for --style=gv_spartan.dat\n\
+- [-]-version show gv version and exit\n\
++ --spartan shortcut for --style=gv_spartan.dat\n\
++ --version show gv version and exit\n\
+ ";
+
+ char *message_help = "\
diff -r 2940e85f911b -r 672cda4097a8 print/gv/patches/patch-ac
--- a/print/gv/patches/patch-ac Thu Nov 23 08:52:58 2006 +0000
+++ b/print/gv/patches/patch-ac Thu Nov 23 09:03:49 2006 +0000
@@ -1,21 +1,26 @@
-$NetBSD: patch-ac,v 1.7 2004/12/08 03:51:54 minskim Exp $
+$NetBSD: patch-ac,v 1.7.16.1 2006/11/23 09:03:49 ghen Exp $
---- src/resource.c.orig Sun Nov 14 02:16:12 2004
-+++ src/resource.c
-@@ -126,6 +126,7 @@ XrmDatabase resource_buildDatabase(displ
- #ifdef VMS
- int b;
- #endif
-+ String rpath;
-
- BEGINMESSAGE(resource_buildDatabase)
-
-@@ -150,7 +151,7 @@ XrmDatabase resource_buildDatabase(displ
- // s = XtResolvePathname(display,"app-defaults",NULL,NULL,NULL,NULL,0,NULL);
- /* #endif */
-
-- String rpath = GV_XtNewString(GV_LIBDIR);
-+ rpath = GV_XtNewString(GV_LIBDIR);
- if (rpath) {
- INFSMESSAGE(merging system resource file into database,rpath)
- XrmCombineFileDatabase(rpath,&db,True);
+--- src/ps.c.orig 2006-07-07 16:35:49.000000000 +0100
++++ src/ps.c 2006-11-21 13:49:17.000000000 +0000
+@@ -1396,6 +1396,8 @@
+ quoted=1;
+ line++;
+ while (*line && !(*line == ')' && level == 0 )) {
++ if (cp - text >= PSLINELENGTH - 1)
++ break;
+ if (*line == '\\') {
+ if (*(line+1) == 'n') {
+ *cp++ = '\n';
+@@ -1450,8 +1452,11 @@
+ }
+ }
+ } else {
+- while (*line && !(*line == ' ' || *line == '\t' || *line == '\n'))
++ while (*line && !(*line == ' ' || *line == '\t' || *line == '\n')) {
++ if (cp - text >= PSLINELENGTH - 2)
++ break;
+ *cp++ = *line++;
++ }
+ }
+ *cp = '\0';
+ if (next_char) *next_char = line;
diff -r 2940e85f911b -r 672cda4097a8 print/gv/patches/patch-ad
--- a/print/gv/patches/patch-ad Thu Nov 23 08:52:58 2006 +0000
+++ b/print/gv/patches/patch-ad Thu Nov 23 09:03:49 2006 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.4 2005/02/24 07:43:30 reed Exp $
+$NetBSD: patch-ad,v 1.4.14.1 2006/11/23 09:03:49 ghen Exp $
---- src/file.c.orig Tue Dec 7 15:37:40 2004
+--- src/file.c.orig 2005-08-10 13:33:21.000000000 +0200
+++ src/file.c
-@@ -296,6 +296,9 @@ file_fileIsNotUseful(fn)
- errno = EISDIR;
- } else if (s.st_size == 0) {
- r = 1;
+@@ -265,6 +265,9 @@ int file_fileIsDir(fn)
+ /* file_fileIsNotUseful */
+ /*############################################################*/
+
+#ifndef ENODATA
+#define ENODATA ENOMSG
+#endif
- errno = ENODATA;
- }
- IMESSAGE(r)
+ int
+ file_fileIsNotUseful(fn)
+ char *fn;
diff -r 2940e85f911b -r 672cda4097a8 print/gv/patches/patch-ae
--- a/print/gv/patches/patch-ae Thu Nov 23 08:52:58 2006 +0000
+++ b/print/gv/patches/patch-ae Thu Nov 23 09:03:49 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.8 2006/01/15 20:07:42 joerg Exp $
+$NetBSD: patch-ae,v 1.8.6.1 2006/11/23 09:03:49 ghen Exp $
---- src/Ghostview.c.orig 2006-01-15 20:00:42.000000000 +0000
+--- src/Ghostview.c.orig 2006-07-04 21:09:52.000000000 +0200
+++ src/Ghostview.c
-@@ -88,8 +88,6 @@ typedef char *XPointer;
+@@ -83,8 +83,6 @@ typedef char *XPointer;
#endif
#include <errno.h>
diff -r 2940e85f911b -r 672cda4097a8 print/gv/patches/patch-af
Home |
Main Index |
Thread Index |
Old Index