[pkgsrc/trunk]: pkgsrc/net/mrt Fix broken va_arg usage violating ISO C promot...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/30505be7221d
branches:  trunk
changeset: 510040:30505be7221d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Mar 22 23:55:37 2006 +0000

description:
Fix broken va_arg usage violating ISO C promotion rules. Bump revision.

diffstat:

 net/mrt/Makefile         |   3 ++-
 net/mrt/distinfo         |   4 +++-
 net/mrt/patches/patch-ae |  13 +++++++++++++
 net/mrt/patches/patch-af |  13 +++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diffs (63 lines):

diff -r 12cc16f3e16a -r 30505be7221d net/mrt/Makefile
--- a/net/mrt/Makefile  Wed Mar 22 23:53:33 2006 +0000
+++ b/net/mrt/Makefile  Wed Mar 22 23:55:37 2006 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:20 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/22 23:55:37 joerg Exp $
 #
 
 DISTNAME=      mrt-2.2.2a-Aug11
 PKGNAME=       mrt-2.2.2a.20000811
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.merit.edu/net-research/mrt/
 
diff -r 12cc16f3e16a -r 30505be7221d net/mrt/distinfo
--- a/net/mrt/distinfo  Wed Mar 22 23:53:33 2006 +0000
+++ b/net/mrt/distinfo  Wed Mar 22 23:55:37 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/12/18 22:12:12 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/03/22 23:55:37 joerg Exp $
 
 SHA1 (mrt-2.2.2a-Aug11.tar.gz) = 6290a0b8d5539fddbd562d8dec64deb291dd3369
 RMD160 (mrt-2.2.2a-Aug11.tar.gz) = e62d3b06d802757cbb1aa4225713b8bf7523ba77
@@ -7,3 +7,5 @@
 SHA1 (patch-ab) = 6f2d358eb50ccd7c8caa11cb3bff9f6b6232b8dd
 SHA1 (patch-ac) = 2fc1c1f19848c90f7344813090fc7c96de121702
 SHA1 (patch-ad) = bbc017a99d34ee3bd6eecad077102b10c7e83349
+SHA1 (patch-ae) = 1689741472239677511a8e06357fc37f34eae4d4
+SHA1 (patch-af) = 83678e7e5b1016cfd29b0b8efcc362b3500daf3f
diff -r 12cc16f3e16a -r 30505be7221d net/mrt/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/mrt/patches/patch-ae  Wed Mar 22 23:55:37 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/03/22 23:55:37 joerg Exp $
+
+--- lib/mrt/trace.c.orig       2006-03-22 23:39:19.000000000 +0000
++++ lib/mrt/trace.c
+@@ -496,7 +496,7 @@ int set_trace (trace_t * tmp, int first,
+           tmp->flags &= ~va_arg (ap, long);
+           break;
+       case TRACE_USE_SYSLOG:
+-          tmp->syslog_flag = va_arg(ap, u_char);
++          tmp->syslog_flag = va_arg(ap, int);
+           break;
+       case TRACE_MAX_FILESIZE:
+           if (tmp->slave) break; /* ignore */
diff -r 12cc16f3e16a -r 30505be7221d net/mrt/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/mrt/patches/patch-af  Wed Mar 22 23:55:37 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/03/22 23:55:37 joerg Exp $
+
+--- lib/mrt/buffer.c.orig      2006-03-22 23:49:03.000000000 +0000
++++ lib/mrt/buffer.c
+@@ -376,7 +376,7 @@ buffer_vprintf (buffer_t *buffer, char *
+       case 'x':
+       case 'b':
+           if (argtype == 'h')
+-              ulongarg = va_arg (ap, short);
++              ulongarg = va_arg (ap, int);
+           else if (argtype == 'l')
+               ulongarg = va_arg (ap, long);
+           else