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.

1 files changed, 0 insertions, 39 deletions

diff --git a/graphics/xv/patches/patch-au b/graphics/xv/patches/patch-au
deleted file mode 100644
index 9fcad862eca..00000000000
--- a/graphics/xv/patches/patch-au
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-au,v 1.1 2001/04/05 13:57:18 wiz Exp $
-
---- xvps.c.orig	Thu Dec 22 23:34:42 1994
-+++ xvps.c	Sun Nov 14 14:05:49 1999
-@@ -139,9 +139,9 @@
-   CBCreate(&encapsCB, psW, 240, 7, "preview", infofg, infobg, hicol, locol);
-   CBCreate(&pscompCB, psW, 331, 7, "compress", infofg, infobg, hicol, locol);
- 
--  DCreate(&xsDial, psW, 240, 30, 80, 100, 10, 800, 100, 5, 
-+  DCreate(&xsDial, psW, 240, 30, 80, 100, 10.0, 800.0, 100.0, 0.5, 5.0, 
- 	  infofg, infobg, hicol, locol, "Width", "%");
--  DCreate(&ysDial, psW, 331, 30, 80, 100, 10, 800, 100, 5, 
-+  DCreate(&ysDial, psW, 331, 30, 80, 100, 10.0, 800.0, 100.0, 0.5, 5.0, 
- 	  infofg, infobg, hicol, locol, "Height", "%");
-   xsDial.drawobj = changedScale;
-   ysDial.drawobj = changedScale;
-@@ -236,10 +236,10 @@
- 
-   if (rd_int("psres")) {             /* xv.psres:  default paper resolution */
-     if (def_int >= 10 && def_int <= 720) {
--      int i = (int) ((PIX2INCH * 100) / def_int);
-+      double v = (PIX2INCH * 100) / def_int;
- 
--      DSetVal(&xsDial, i);
--      DSetVal(&ysDial, i);
-+      DSetVal(&xsDial, v);
-+      DSetVal(&ysDial, v);
-     }
-   }
- 
-@@ -836,7 +836,7 @@
-   if (scx < scy) { sz_iny = h * scx; }
-             else { sz_inx = w * scy; }
- 
--  DSetVal(&xsDial, (int) ((100 * (sz_inx * PIX2INCH) / w) + .5));
-+  DSetVal(&xsDial, 100 * (sz_inx * PIX2INCH) / w);
-   DSetVal(&ysDial, xsDial.val);
- 
-   sz_inx = (double) w / PIX2INCH * (xsDial.val / 100.0);