[pkgsrc/pkgsrc-2004Q4]: pkgsrc/x11/xview-lib Pullup ticket 308 - requested by...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6daf6ce8aeea
branches:  pkgsrc-2004Q4
changeset: 485931:6daf6ce8aeea
user:      salo <salo%pkgsrc.org@localhost>
date:      Fri Feb 25 00:43:03 2005 +0000

description:
Pullup ticket 308 - requested by Matthias Drochner
security fix for xview-lib

Revisions pulled up:
- pkgsrc/x11/xview-lib/Makefile         1.25
- pkgsrc/x11/xview-lib/distinfo         1.8
- pkgsrc/x11/xview-lib/patches/patch-fa 1.1

   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Thu Feb 10 11:03:53 UTC 2005

   Modified Files:
           pkgsrc/x11/xview-lib: Makefile distinfo
   Added Files:
           pkgsrc/x11/xview-lib/patches: patch-fa

   Log Message:
   the daily security patch:
   sprintf->snprintf to fix security problem (CAN-2005-0076)
   (patch from Debian)
   bump PKGREVISION

diffstat:

 x11/xview-lib/Makefile         |   4 ++--
 x11/xview-lib/distinfo         |   3 ++-
 x11/xview-lib/patches/patch-fa |  31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r 140cfe841ab5 -r 6daf6ce8aeea x11/xview-lib/Makefile
--- a/x11/xview-lib/Makefile    Thu Feb 24 23:51:41 2005 +0000
+++ b/x11/xview-lib/Makefile    Fri Feb 25 00:43:03 2005 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2004/04/22 23:15:02 snj Exp $
+# $NetBSD: Makefile,v 1.24.6.1 2005/02/25 00:43:03 salo Exp $
 # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
 #
 
 DISTNAME=              xview3.2p1-X11R6
 PKGNAME=               xview-lib-3.2.1
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_LOCAL}
 
diff -r 140cfe841ab5 -r 6daf6ce8aeea x11/xview-lib/distinfo
--- a/x11/xview-lib/distinfo    Thu Feb 24 23:51:41 2005 +0000
+++ b/x11/xview-lib/distinfo    Fri Feb 25 00:43:03 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/09/30 20:38:28 kristerw Exp $
+$NetBSD: distinfo,v 1.7.2.1 2005/02/25 00:43:03 salo Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 Size (xview3.2p1-X11R6.tar.gz) = 3436814 bytes
@@ -108,3 +108,4 @@
 SHA1 (patch-dz) = b8304af8ac019af3224f0df0212e5d4da4226eac
 SHA1 (patch-ea) = ac9158bfc79aba18b318f1e2e7ac0fa2427cfbec
 SHA1 (patch-eb) = 05fcefb5b5f0799b92828b72938a57854707a69b
+SHA1 (patch-fa) = b17b18509017d19e52c1c54416bec24d67ce2b4d
diff -r 140cfe841ab5 -r 6daf6ce8aeea x11/xview-lib/patches/patch-fa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xview-lib/patches/patch-fa    Fri Feb 25 00:43:03 2005 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-fa,v 1.1.2.2 2005/02/25 00:43:03 salo Exp $
+
+--- lib/libxview/base/xv_parse.c.orig  2005-02-10 12:41:57.000000000 +0100
++++ lib/libxview/base/xv_parse.c
+@@ -312,7 +312,7 @@ xv_parse_one(app_name, argc, argv)
+     if (argc <= slot->num_args) {
+       char            dummy[128];
+ 
+-      (void) sprintf(dummy, 
++      (void) snprintf(dummy, sizeof(dummy),
+                       XV_MSG("%s: missing argument after %s"), 
+                       app_name,
+                      argv[0]);
+@@ -392,7 +392,7 @@ xv_parse_one(app_name, argc, argv)
+       if (defaults_lookup(argv[1], known_scales) == -1) {
+               char dummy[1024];
+               
+-              (void) sprintf(dummy, 
++              (void) snprintf(dummy, sizeof(dummy),
+                       XV_MSG("%s: unknown scale \"%s\" used with %s option"),
+                              app_name, argv[1], argv[0]);
+               xv_error(XV_NULL,
+@@ -611,7 +611,7 @@ NegArg:
+     {
+       char            dummy[128];
+ 
+-      (void) sprintf(dummy, 
++      (void) snprintf(dummy, sizeof(dummy),
+               XV_MSG("%s: can't have negative argument %s after %s"),
+                      app_name, argv[bad_arg], argv[0]);
+       xv_error(XV_NULL,