[pkgsrc/trunk]: pkgsrc/devel/ncc Fix segfaults on some sources using nested s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd5a748d2162
branches:  trunk
changeset: 549547:bd5a748d2162
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Nov 05 12:29:04 2008 +0000

description:
Fix segfaults on some sources using nested structs, unions and
(anonymous) bit fields.
Install nccstrip2.py (used by nccld).

>From Marko Schuetz in PR 39840.

Bump PKGREVISION.

diffstat:

 devel/ncc/Makefile         |   6 +++++-
 devel/ncc/PLIST            |   3 ++-
 devel/ncc/distinfo         |   3 ++-
 devel/ncc/patches/patch-ae |  22 ++++++++++++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diffs (87 lines):

diff -r 7fe79ab5a28e -r bd5a748d2162 devel/ncc/Makefile
--- a/devel/ncc/Makefile        Wed Nov 05 11:44:22 2008 +0000
+++ b/devel/ncc/Makefile        Wed Nov 05 12:29:04 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/10/20 07:52:26 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/11/05 12:29:04 wiz Exp $
 #
 
 DISTNAME=              ncc-2.8
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          http://students.ceid.upatras.gr/~sxanth/ncc/
 
@@ -20,9 +21,11 @@
 SUBST_FILES.prefix=    config.h
 SUBST_SED.prefix=      -e 's,@PREFIX@,${PREFIX},g'
 
+PYTHON_PATCH_SCRIPTS+= scripts/nccstrip2.py
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/objdir/ncc ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/scripts/nccstrip2.py ${PREFIX}/bin
        ${LN} -s ncc ${PREFIX}/bin/nccar
        ${LN} -s ncc ${PREFIX}/bin/nccc++
        ${LN} -s ncc ${PREFIX}/bin/nccld
@@ -38,4 +41,5 @@
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ncc
 
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 7fe79ab5a28e -r bd5a748d2162 devel/ncc/PLIST
--- a/devel/ncc/PLIST   Wed Nov 05 11:44:22 2008 +0000
+++ b/devel/ncc/PLIST   Wed Nov 05 12:29:04 2008 +0000
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/10/20 07:52:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/11/05 12:29:04 wiz Exp $
 bin/ncc
 bin/nccar
 bin/nccc++
 bin/nccld
 bin/nccnav
 bin/nccnavi
+bin/nccstrip2.py
 man/man1/ncc.1
 share/doc/ncc/KEYS.txt
 share/doc/ncc/README
diff -r 7fe79ab5a28e -r bd5a748d2162 devel/ncc/distinfo
--- a/devel/ncc/distinfo        Wed Nov 05 11:44:22 2008 +0000
+++ b/devel/ncc/distinfo        Wed Nov 05 12:29:04 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/10/20 07:52:26 wiz Exp $
+$NetBSD: distinfo,v 1.2 2008/11/05 12:29:04 wiz Exp $
 
 SHA1 (ncc-2.8.tar.gz) = 96f6d8d76dc0e67a436b7f1acf67503998ad5771
 RMD160 (ncc-2.8.tar.gz) = dcd8998ff31d1291208bf9ea4ff5a08b2525745d
@@ -7,3 +7,4 @@
 SHA1 (patch-ab) = 92ada3f6f824d18a05a6e38d2f1086ebaa87e98e
 SHA1 (patch-ac) = 437150dbe18e5d2c8c175667f3fa6b1d419f452a
 SHA1 (patch-ad) = 0bc35544a5fe07112ee53ff5864d3a0d0f011e6e
+SHA1 (patch-ae) = 2397a601229a211c379450b83cad69fcfd6d9022
diff -r 7fe79ab5a28e -r bd5a748d2162 devel/ncc/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ncc/patches/patch-ae        Wed Nov 05 12:29:04 2008 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2008/11/05 12:29:04 wiz Exp $
+
+--- cdb.C.orig 2008-10-11 14:57:21.000000000 +0000
++++ cdb.C
+@@ -394,6 +394,9 @@ void close_region ()
+ 
+ lookup_t *Lookup (Symbol s, bool tagged, RegionPtr r)
+ {
++      if (s == -1)
++              return NULL;
++
+       lookup_t *t = lookup_table [s - SYMBASE];
+ 
+       if (tagged) for (; t; t = t->next) {
+@@ -1175,6 +1178,7 @@ void aeqn::prstruct (RegionPtr p)
+               txt [txti++] = UNI;
+       for (m = regions [p].first; m; m=m->next) {
+               L = Lookup (m->s, false, p);
++              if (!L) continue;
+               txt [txti++] = m->s;
+               base = base_of (L->info.tdf);
+               spec = spec_of (L->info.tdf);