summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2005-02-25 00:43:03 +0000
committersalo <salo@pkgsrc.org>2005-02-25 00:43:03 +0000
commit585695fe17569ce71b65c8b9f6616ec3babdaa61 (patch)
tree8fe8288bdb3f53180532675ece1d78fb1934b764
parent3cf3b6578b0c681ff48dd94ce692aba8afa80980 (diff)
downloadpkgsrc-585695fe17569ce71b65c8b9f6616ec3babdaa61.tar.gz
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
-rw-r--r--x11/xview-lib/Makefile4
-rw-r--r--x11/xview-lib/distinfo3
-rw-r--r--x11/xview-lib/patches/patch-fa31
3 files changed, 35 insertions, 3 deletions
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index bb545a2b360..5b8d6bd8799 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -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 --git a/x11/xview-lib/distinfo b/x11/xview-lib/distinfo
index b46df3d7704..a0c0add91ee 100644
--- a/x11/xview-lib/distinfo
+++ b/x11/xview-lib/distinfo
@@ -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-dy) = b336b712f3fb7964ee4a5ed76ec4cab8a5ad72b7
SHA1 (patch-dz) = b8304af8ac019af3224f0df0212e5d4da4226eac
SHA1 (patch-ea) = ac9158bfc79aba18b318f1e2e7ac0fa2427cfbec
SHA1 (patch-eb) = 05fcefb5b5f0799b92828b72938a57854707a69b
+SHA1 (patch-fa) = b17b18509017d19e52c1c54416bec24d67ce2b4d
diff --git a/x11/xview-lib/patches/patch-fa b/x11/xview-lib/patches/patch-fa
new file mode 100644
index 00000000000..7681584f04b
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fa
@@ -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,