[pkgsrc/trunk]: pkgsrc/wm/compiz Fix core dump with ini plugin (flat-file con...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b88677991a47
branches:  trunk
changeset: 542754:b88677991a47
user:      hira <hira%pkgsrc.org@localhost>
date:      Mon May 26 17:22:37 2008 +0000

description:
Fix core dump with ini plugin (flat-file configuration backend) from
upstream.  Bump PKGREVISION.

diffstat:

 wm/compiz/Makefile         |   4 ++--
 wm/compiz/distinfo         |   3 ++-
 wm/compiz/patches/patch-ac |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r 7ab4faa640da -r b88677991a47 wm/compiz/Makefile
--- a/wm/compiz/Makefile        Mon May 26 16:52:21 2008 +0000
+++ b/wm/compiz/Makefile        Mon May 26 17:22:37 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/05/24 21:45:14 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2008/05/26 17:22:37 hira Exp $
 #
 
 DISTNAME=      compiz-0.6.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=app/}
 
diff -r 7ab4faa640da -r b88677991a47 wm/compiz/distinfo
--- a/wm/compiz/distinfo        Mon May 26 16:52:21 2008 +0000
+++ b/wm/compiz/distinfo        Mon May 26 17:22:37 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/05/12 01:57:37 jmcneill Exp $
+$NetBSD: distinfo,v 1.7 2008/05/26 17:22:37 hira Exp $
 
 SHA1 (compiz-0.6.2.tar.gz) = ab5ecad856049a12a803fe6c94c3e55cdfcb5f68
 RMD160 (compiz-0.6.2.tar.gz) = 6cc235570c3ac15573050b27198648045a85a804
 Size (compiz-0.6.2.tar.gz) = 1784471 bytes
 SHA1 (patch-aa) = 1b6ab48fd459bc2fa4173f8f1d4936aa0d5c00be
 SHA1 (patch-ab) = 273430fa119b4c904287115be1f5273868073899
+SHA1 (patch-ac) = 51479150d46def76d1c9988151c37571f4954c82
diff -r 7ab4faa640da -r b88677991a47 wm/compiz/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/compiz/patches/patch-ac        Mon May 26 17:22:37 2008 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2008/05/26 17:22:37 hira Exp $
+
+--- plugins/ini.c.orig 2008-05-26 17:10:50.000000000 +0900
++++ plugins/ini.c      2008-05-26 17:12:01.000000000 +0900
+@@ -377,7 +377,7 @@
+     if (*optionName)
+     {
+        strncpy (*optionName, line, length);
+-       *optionName[length] = 0;
++       (*optionName)[length] = 0;
+     }
+     splitPos++;
+     optionLength = strlen (splitPos);
+@@ -387,7 +387,7 @@
+     if (*optionValue)
+     {
+       strncpy (*optionValue, splitPos, optionLength);
+-      *optionValue[optionLength] = 0;
++      (*optionValue)[optionLength] = 0;
+     }
+     return TRUE;
+ }