head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.40 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.38 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.36 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.34 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.32 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.22 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.20 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.18 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.16 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.14 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.12 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.10 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.8 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.6 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.4 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.2 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 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 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.3 date 2005.08.10.16.50.18; author he; state dead; branches; next 1.2; 1.2 date 2004.03.29.00.50.41; author dillo; state Exp; branches 1.2.10.1; next 1.1; 1.1 date 2001.04.05.13.57.16; author wiz; state Exp; branches; next ; 1.2.10.1 date 2005.08.19.11.37.05; author salo; state dead; branches; next ; desc @@ 1.3 log @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. @ text @$NetBSD: patch-am,v 1.2 2004/03/29 00:50:41 dillo Exp $ This patch is based on http://www.mit.edu/afs/athena/contrib/graphics/src/xv/patches/png/xvpng.diff It was edited to fit into the NetBSD Packages Collection! - HF It is also based on ftp://ftp.trilon.com/pub/xv/patches/longname.patch --------------------------------------------------------------------------- --- xvbrowse.c.orig Sun Mar 21 21:27:18 2004 +++ xvbrowse.c @@@@ -61,6 +61,7 @@@@ typedef unsigned int mode_t; /* file mo #include "bits/br_pic" #include "bits/br_pi" #include "bits/br_pic2" +#include "bits/br_png" #include "bits/br_trash" #include "bits/fcurs" @@@@ -106,7 +107,8 @@@@ typedef unsigned int mode_t; /* file mo #define BF_PI 31 #define BF_PIC2 32 #define BF_PCD 33 -#define BF_MAX 34 /* # of built-in icons */ +#define BF_PNG 34 +#define BF_MAX 35 /* # of built-in icons */ #define ISLOADABLE(ftyp) (ftyp!=BF_DIR && ftyp!=BF_CHR && ftyp!=BF_BLK && \ ftyp!=BF_SOCK && ftyp!=BF_FIFO) @@@@ -543,6 +545,7 @@@@ void CreateBrowse(geom, fgstr, bgstr, hi bfIcons[BF_PI] = MakePix1(br->win,br_pi_bits,br_pi_width,br_pi_height); bfIcons[BF_PIC2]=MakePix1(br->win,br_pic2_bits,br_pic2_width,br_pic2_height); bfIcons[BF_PCD] = MakePix1(br->win,br_pcd_bits,br_pcd_width,br_pcd_height); + bfIcons[BF_PNG]=MakePix1(br->win,br_png_bits,br_png_width,br_png_height); /* check that they all got built */ @@@@ -1509,6 +1512,7 @@@@ static void drawIcon(br, num) if (StringWidth(str) > ISPACE_WIDE-6) { int dotpos; strncpy(tmpstr, str, (size_t) 56); + tmpstr[56] = '\0'; dotpos = strlen(tmpstr); strcat(tmpstr,"..."); @@@@ -3045,6 +3049,7 @@@@ static void scanFile(br, bf, name) case RFT_PI: bf->ftype = BF_PI; break; case RFT_PIC2: bf->ftype = BF_PIC2; break; case RFT_PCD: bf->ftype = BF_PCD; break; + case RFT_PNG: bf->ftype = BF_PNG; break; } } } @@@@ -3612,6 +3617,7 @@@@ static void genIcon(br, bf) case RFT_PI: strcat(str,"PI file"); break; case RFT_PIC2: strcat(str,"PIC2 file"); break; case RFT_PCD: strcat(str,"PhotoCD file"); break; + case RFT_PNG: strcat(str,"PNG file"); break; default: strcat(str,"file of unknown type"); break; } @ 1.2 log @Apply longname.patch and fix crash with long file names in visual schnauzer. Bump package revision. While here, convert to buildlink 3. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.1 2001/04/05 13:57:16 wiz Exp $ @ 1.2.10.1 log @Pullup ticket 689 - requested by Havard Eidnes security fixes for xv Revisions pulled up: - pkgsrc/graphics/xv/Makefile 1.59 - pkgsrc/graphics/xv/PLIST 1.3 - pkgsrc/graphics/xv/distinfo 1.11 - pkgsrc/graphics/xv/patches/patch-aa removed - pkgsrc/graphics/xv/patches/patch-ab removed - pkgsrc/graphics/xv/patches/patch-ac 1.8 - pkgsrc/graphics/xv/patches/patch-ad 1.9 - pkgsrc/graphics/xv/patches/patch-ae removed - pkgsrc/graphics/xv/patches/patch-af 1.5 - pkgsrc/graphics/xv/patches/patch-ag removed - pkgsrc/graphics/xv/patches/patch-ah 1.2 - pkgsrc/graphics/xv/patches/patch-ai 1.2 - pkgsrc/graphics/xv/patches/patch-aj 1.2 - pkgsrc/graphics/xv/patches/patch-ak removed - pkgsrc/graphics/xv/patches/patch-al removed - pkgsrc/graphics/xv/patches/patch-am removed - pkgsrc/graphics/xv/patches/patch-an removed - pkgsrc/graphics/xv/patches/patch-ao removed - pkgsrc/graphics/xv/patches/patch-ap removed - pkgsrc/graphics/xv/patches/patch-aq removed - pkgsrc/graphics/xv/patches/patch-ar removed - pkgsrc/graphics/xv/patches/patch-as removed - pkgsrc/graphics/xv/patches/patch-at removed - pkgsrc/graphics/xv/patches/patch-au removed - pkgsrc/graphics/xv/patches/patch-av removed - pkgsrc/graphics/xv/patches/patch-aw removed - pkgsrc/graphics/xv/patches/patch-ax removed - pkgsrc/graphics/xv/patches/patch-ay removed Module Name: pkgsrc Committed By: he Date: Wed Aug 10 16:50:18 UTC 2005 Modified Files: pkgsrc/graphics/xv: Makefile PLIST distinfo pkgsrc/graphics/xv/patches: patch-ac patch-ad patch-af patch-ah patch-ai patch-aj Removed Files: pkgsrc/graphics/xv/patches: patch-aa patch-ab patch-ae patch-ag patch-ak patch-al patch-am patch-an patch-ao patch-ap patch-aq patch-ar patch-as patch-at patch-au patch-av patch-aw patch-ax patch-ay Log Message: 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. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.2 2004/03/29 00:50:41 dillo Exp $ @ 1.1 log @Standardize patch file names. @ text @d1 1 a1 1 $NetBSD: patch-png2-xvbrowse.c,v 1.1 1999/06/13 16:23:54 hubertf Exp $ d7 2 d12 3 a14 3 --- xvbrowse.c.patched Sun Jun 13 03:22:27 1999 +++ xvbrowse.c Sun Jun 13 03:25:38 1999 @@@@ -61,6 +61,7 @@@@ d22 1 a22 1 @@@@ -106,7 +107,8 @@@@ d32 1 a32 1 @@@@ -543,6 +545,7 @@@@ d40 9 a48 1 @@@@ -3045,6 +3048,7 @@@@ d56 1 a56 1 @@@@ -3612,6 +3616,7 @@@@ @