diff options
| author | he <he@pkgsrc.org> | 2005-08-10 16:50:18 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2005-08-10 16:50:18 +0000 |
| commit | 351592d780e17f601487f2f57db086a9e27badfd (patch) | |
| tree | 2ea820c11dda6de965a168d55f4d309c02be646b /graphics/xv/patches/patch-af | |
| parent | 35be7aab3b48d8df6784a8bdf5f6427991f752cb (diff) | |
| download | pkgsrc-351592d780e17f601487f2f57db086a9e27badfd.tar.gz | |
Instead of separately integrating several different patches, instead
pull in the Jumbo patches from http://www.sonic.net/~roelofs/greg_xv.html.
As far as I can see this covers all our existing patches for added
functionality, although I cannot claim that I have tested each and
every one of them in the new version.
These patches disable a number of image formats that I think are less
common, which have potential heap overflows in the code due to in-
sufficient validation of image dimensions.
The version of the Jumbo patch used here is the 20050501 version.
Package revision bumped to nb10.
Diffstat (limited to 'graphics/xv/patches/patch-af')
| -rw-r--r-- | graphics/xv/patches/patch-af | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/graphics/xv/patches/patch-af b/graphics/xv/patches/patch-af index 4b407d7a75a..b78207a9b28 100644 --- a/graphics/xv/patches/patch-af +++ b/graphics/xv/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.4 2004/08/22 08:02:30 minskim Exp $ +$NetBSD: patch-af,v 1.5 2005/08/10 16:50:18 he Exp $ ---- xv.h.orig Tue Jan 4 17:12:42 2000 -+++ xv.h Tue Jan 4 17:13:38 2000 -@@ -107,9 +107,7 @@ +--- xv.h.orig 2005-07-29 15:52:23.000000000 +0200 ++++ xv.h +@@ -137,9 +137,7 @@ #endif @@ -13,24 +13,34 @@ $NetBSD: patch-af,v 1.4 2004/08/22 08:02:30 minskim Exp $ /* include files */ -@@ -128,7 +126,7 @@ +@@ -158,7 +156,7 @@ #ifndef VMS # include <errno.h> - extern int errno; /* SHOULD be in errno.h, but often isn't */ --# if !(defined(BSD) && (BSD >= 199103)) -+# if !(defined(BSD) && (BSD >= 199103)) && !defined(__linux__) - extern char *sys_errlist[]; /* this too... */ - # endif + # ifndef __NetBSD__ +-# if !(defined __GLIBC__ && __GLIBC__ >= 2) ++# if !(defined(BSD) && (BSD >= 199103)) && !(defined __GLIBC__ && __GLIBC__ >= 2) + extern int errno; /* SHOULD be in errno.h, but often isn't */ + extern char *sys_errlist[]; /* this too... */ + # endif +@@ -170,7 +168,7 @@ + #ifdef VMS + # define ERRSTR(x) strerror(x, vaxc$errno) + #else +-# if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */ ++# if defined(__BEOS__) || defined(__linux__) || defined(__INTERIX) /* or all modern/glibc systems? */ + # define ERRSTR(x) strerror(x) + # else + # define ERRSTR(x) sys_errlist[x] +@@ -345,7 +343,11 @@ #endif -@@ -134,7 +134,11 @@ - /* not everyone has the strerror() function, or so I'm told */ - #ifndef VMS -+#if defined(__INTERIX) -+# define ERRSTR(x) strerror(x) -+#else - # define ERRSTR(x) sys_errlist[x] -+#endif - #else - # define ERRSTR(x) strerror(x, vaxc$errno) + #ifndef S_IRWUSR +-# define S_IRWUSR (S_IRUSR|__S_IWRITE) ++# ifdef __S_IWRITE ++# define S_IRWUSR (S_IRUSR|__S_IWRITE) ++# else ++# define S_IRWUSR (S_IRUSR|S_IWUSR) ++# endif #endif + + #ifndef MAXPATHLEN |