[pkgsrc/trunk]: pkgsrc/security/heimdal Add patch-aa to make heimdal compile ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fe35bbdc540
branches:  trunk
changeset: 497802:1fe35bbdc540
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Thu Aug 04 16:50:18 2005 +0000

description:
Add patch-aa to make heimdal compile with gcc-4 (default with darwin 8)
This patch is the same as revision 1.3 of
/cvsroot/src/crypto/dist/heimdal/lib/asn1/gen_glue.c by matt@
those cvs log:
  Don't emit struct units [] anymore.  emit a struct units * const foo and
  in the C file initialize that to the static list.

Bump pkgrevision: it changes the binary package on gcc<4 platforms

approved by wiz@

diffstat:

 security/heimdal/Makefile         |   3 ++-
 security/heimdal/distinfo         |   3 ++-
 security/heimdal/patches/patch-aa |  29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r 5248a4d7e4bc -r 1fe35bbdc540 security/heimdal/Makefile
--- a/security/heimdal/Makefile Thu Aug 04 16:13:39 2005 +0000
+++ b/security/heimdal/Makefile Thu Aug 04 16:50:18 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2005/06/20 09:51:02 lha Exp $
+# $NetBSD: Makefile,v 1.41 2005/08/04 16:50:18 tonio Exp $
 
 DISTNAME=      heimdal-0.6.5
+PKGREVISION= 1
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.pdc.kth.se/pub/heimdal/src/   \
                ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/
diff -r 5248a4d7e4bc -r 1fe35bbdc540 security/heimdal/distinfo
--- a/security/heimdal/distinfo Thu Aug 04 16:13:39 2005 +0000
+++ b/security/heimdal/distinfo Thu Aug 04 16:50:18 2005 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/06/20 09:51:02 lha Exp $
+$NetBSD: distinfo,v 1.13 2005/08/04 16:50:18 tonio Exp $
 
 SHA1 (heimdal-0.6.5.tar.gz) = 1cb896e2f081e74bf766279535a2510c9a5cb0b3
 RMD160 (heimdal-0.6.5.tar.gz) = 726f9b4c655e6380ac0ad4ea3917b938013d8e5c
 Size (heimdal-0.6.5.tar.gz) = 3329395 bytes
+SHA1 (patch-aa) = c0a736131b3fb54f9cdea57ea55e4f0f0619532b
 SHA1 (patch-ab) = 400a9ac3a76ac7e8b4dcc230e0bdf7fc5222fbb7
 SHA1 (patch-ac) = 121961811f559822c6a4f3d7f7e4646b16908942
 SHA1 (patch-ad) = 20347c61cf79c17500ab3508424632efc3545b65
diff -r 5248a4d7e4bc -r 1fe35bbdc540 security/heimdal/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/heimdal/patches/patch-aa Thu Aug 04 16:50:18 2005 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.3 2005/08/04 16:50:18 tonio Exp $
+
+--- lib/asn1/gen_glue.c.orig   2005-08-04 16:58:58.000000000 +0200
++++ lib/asn1/gen_glue.c        2005-08-04 17:02:45.000000000 +0200
+@@ -103,11 +103,11 @@
+     int tag = -1;
+ 
+     fprintf (headerfile,
+-           "extern struct units %s_units[];",
++           "extern struct units * const %s_units;",
+            s->gen_name);
+ 
+     fprintf (codefile,
+-           "struct units %s_units[] = {\n",
++           "struct units %s_units_static[] = {\n",
+            s->gen_name);
+ 
+     if(t->members)
+@@ -122,6 +122,10 @@
+     fprintf (codefile,
+            "\t{NULL,\t0}\n"
+            "};\n\n");
++
++    fprintf (codefile,
++            "struct units * const %s_units = %s_units_static;\n\n",
++            s->gen_name, s->gen_name);
+ }
+ 
+ void