CVS commit: pkgsrc/graphics/xv

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Nov 25 08:03:02 UTC 2023

Modified Files:
        pkgsrc/graphics/xv: Makefile distinfo
Added Files:
        pkgsrc/graphics/xv/patches: patch-xvxbm.c

Log Message:
xv: fix a bug when loading xbm filename contains '0x' strings.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/graphics/xv/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/xv/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/xv/patches/patch-xvxbm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/xv/Makefile
diff -u pkgsrc/graphics/xv/Makefile:1.101 pkgsrc/graphics/xv/Makefile:1.102
--- pkgsrc/graphics/xv/Makefile:1.101   Sat Oct 21 17:10:44 2023
+++ pkgsrc/graphics/xv/Makefile Sat Nov 25 08:03:01 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2023/10/21 17:10:44 gdt Exp $
+# $NetBSD: Makefile,v 1.102 2023/11/25 08:03:01 tsutsui Exp $
 
 DISTNAME=      xv-3.10a
-PKGREVISION=   29
+PKGREVISION=   30
 CATEGORIES=    graphics x11
 MASTER_SITES=  ftp://ftp.cis.upenn.edu/pub/xv/
 DISTFILES=     ${DEFAULT_DISTFILES} ${JUMBO_PATCHES}

Index: pkgsrc/graphics/xv/distinfo
diff -u pkgsrc/graphics/xv/distinfo:1.27 pkgsrc/graphics/xv/distinfo:1.28
--- pkgsrc/graphics/xv/distinfo:1.27    Wed Aug 16 17:02:19 2023
+++ pkgsrc/graphics/xv/distinfo Sat Nov 25 08:03:01 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2023/08/16 17:02:19 tsutsui Exp $
+$NetBSD: distinfo,v 1.28 2023/11/25 08:03:01 tsutsui Exp $
 
 BLAKE2s (xv-3.10a-enhancements.20070520-20081216.diff) = 1333e3066444f6adf64e83c33a129a46143678d4b2c805f3740baae1320d3449
 SHA512 (xv-3.10a-enhancements.20070520-20081216.diff) = d7152799f6ec65404496b8d83a93681122fe1280741ffe4d20d7dc1b3791873081c778b3d9806f1217b9d45f5b5bfce6fdbfb655c26ed5e87388a6f517c4f2f7
@@ -23,3 +23,4 @@ SHA1 (patch-xvmisc.c) = ad326175632736e2
 SHA1 (patch-xvpcd.c) = 1825015f441b9af91916f9a62e8d1dee6ddfdef9
 SHA1 (patch-xvpng.c) = 2bda08bae67fcf127c49b9ed780b7a247579c088
 SHA1 (patch-xvwebp.c) = 9bffcb775d641f50d778ad026cb66880b74e7462
+SHA1 (patch-xvxbm.c) = efd77451cbf7ddc7bd904518478d1f91d1bfdebc

Added files:

Index: pkgsrc/graphics/xv/patches/patch-xvxbm.c
diff -u /dev/null pkgsrc/graphics/xv/patches/patch-xvxbm.c:1.1
--- /dev/null   Sat Nov 25 08:03:02 2023
+++ pkgsrc/graphics/xv/patches/patch-xvxbm.c    Sat Nov 25 08:03:01 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-xvxbm.c,v 1.1 2023/11/25 08:03:01 tsutsui Exp $
+
+- fix a bug that puts a garbage in the first 8 pixels when loading xbm
+  filename contains '0x' strings
+
+--- xvxbm.c.orig       2023-11-25 07:43:40.021758068 +0000
++++ xvxbm.c
+@@ -80,6 +80,11 @@ int LoadXBM(fname, pinfo)
+ 
+ 
+ 
++  /* scan forward until we see '= {' before bitmap array to skip filename */
++  c = getc(fp);
++  while (c!=EOF && c!='=') { c = getc(fp); }
++  while (c!=EOF && c!='{') { c = getc(fp); }
++
+   /* scan forward until we see the first '0x' */
+   c = getc(fp);  c1 = getc(fp);
+   while (c1!=EOF && !(c=='0' && c1=='x') ) { c = c1;  c1 = getc(fp); }