From 0a95fa31d5bef388b352a695801bf138e942e7ff Mon Sep 17 00:00:00 2001 From: abs Date: Sun, 3 Jun 2012 17:24:08 +0000 Subject: Updated chat/naim to 0.11.8.3.2 Nothing recorded in Changelog for this version --- chat/naim/Makefile | 8 ++------ chat/naim/distinfo | 9 +++++---- chat/naim/patches/patch-src_hwprintf.c | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 chat/naim/patches/patch-src_hwprintf.c diff --git a/chat/naim/Makefile b/chat/naim/Makefile index 94361ee4da6..4a2f1ec399b 100644 --- a/chat/naim/Makefile +++ b/chat/naim/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.50 2011/12/18 15:31:34 dholland Exp $ +# $NetBSD: Makefile,v 1.51 2012/06/03 17:24:08 abs Exp $ -DISTNAME= naim-0.11.8.3.1 +DISTNAME= naim-0.11.8.3.2 CATEGORIES= chat MASTER_SITES= http://naim.googlecode.com/files/ EXTRACT_SUFX= .tar.bz2 @@ -15,9 +15,5 @@ GNU_CONFIGURE= yes MAKE_JOBS_SAFE= no USE_LIBTOOL= yes -USE_NCURSES= # compiles fine, but terminates on startup with: -# assertion "strlen(h->addch.buf) == h->addch.len" failed: -# file "hwprintf.c", line 41, function "h_zero" - .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/naim/distinfo b/chat/naim/distinfo index 3e4cb1d5ba4..43e0064cc7f 100644 --- a/chat/naim/distinfo +++ b/chat/naim/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.28 2008/04/23 21:37:15 wiz Exp $ +$NetBSD: distinfo,v 1.29 2012/06/03 17:24:08 abs Exp $ -SHA1 (naim-0.11.8.3.1.tar.bz2) = b3ecc917d2f6e41097635a48438585c79e14db88 -RMD160 (naim-0.11.8.3.1.tar.bz2) = 8c0335d9cccc320646747fa4adf02fa47cfc644b -Size (naim-0.11.8.3.1.tar.bz2) = 419762 bytes +SHA1 (naim-0.11.8.3.2.tar.bz2) = e2ddfcbf66b6139a68155cae0dddd1ac79d6c713 +RMD160 (naim-0.11.8.3.2.tar.bz2) = 5d9f88c99ad78d30defe09c0f3b62c6217e8ed27 +Size (naim-0.11.8.3.2.tar.bz2) = 454699 bytes +SHA1 (patch-src_hwprintf.c) = 073f816768e5e227c248dcf029b4e56671533d87 diff --git a/chat/naim/patches/patch-src_hwprintf.c b/chat/naim/patches/patch-src_hwprintf.c new file mode 100644 index 00000000000..366a0529ea3 --- /dev/null +++ b/chat/naim/patches/patch-src_hwprintf.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_hwprintf.c,v 1.1 2012/06/03 17:24:08 abs Exp $ + +At least on NetBSD strlen(h->addch.buf) can hit the -1 case + +--- src/hwprintf.c.orig 2008-09-14 21:06:04.000000000 +0000 ++++ src/hwprintf.c +@@ -39,7 +39,8 @@ static void h_zero(h_t *h, win_t *win) { + max = sizeof(h->addch.buf)-1; + memset(h->addch.buf, 0, sizeof(h->addch.buf)); + nw_getline(h->win, h->addch.buf, sizeof(h->addch.buf)); +- assert(strlen(h->addch.buf) == h->addch.len); ++ assert(strlen(h->addch.buf) == h->addch.len ++ || strlen(h->addch.buf) == h->addch.len - 1); + h->addch.lastwhite = -1; + h->addch.firstwhite = -1; + h->addch.secondwhite = -1; -- cgit v1.2.3