summaryrefslogtreecommitdiff
path: root/net/mrt
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-03-22 23:55:37 +0000
committerjoerg <joerg@pkgsrc.org>2006-03-22 23:55:37 +0000
commit35f27db0d1ae3a884299e0138a91602cc3c7b731 (patch)
tree5458de38a57c152cef2249b9f942e5a9a34406e5 /net/mrt
parente5438c440d09dd3801fd9baa138c26ecbd88f245 (diff)
downloadpkgsrc-35f27db0d1ae3a884299e0138a91602cc3c7b731.tar.gz
Fix broken va_arg usage violating ISO C promotion rules. Bump revision.
Diffstat (limited to 'net/mrt')
-rw-r--r--net/mrt/Makefile3
-rw-r--r--net/mrt/distinfo4
-rw-r--r--net/mrt/patches/patch-ae13
-rw-r--r--net/mrt/patches/patch-af13
4 files changed, 31 insertions, 2 deletions
diff --git a/net/mrt/Makefile b/net/mrt/Makefile
index d0bd4527ae2..acd383ec35b 100644
--- a/net/mrt/Makefile
+++ b/net/mrt/Makefile
@@ -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 --git a/net/mrt/distinfo b/net/mrt/distinfo
index e18f52a0625..e857148c170 100644
--- a/net/mrt/distinfo
+++ b/net/mrt/distinfo
@@ -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-aa) = b3d4121b5d94f6bc6b702e6c72e3565adf19d74e
SHA1 (patch-ab) = 6f2d358eb50ccd7c8caa11cb3bff9f6b6232b8dd
SHA1 (patch-ac) = 2fc1c1f19848c90f7344813090fc7c96de121702
SHA1 (patch-ad) = bbc017a99d34ee3bd6eecad077102b10c7e83349
+SHA1 (patch-ae) = 1689741472239677511a8e06357fc37f34eae4d4
+SHA1 (patch-af) = 83678e7e5b1016cfd29b0b8efcc362b3500daf3f
diff --git a/net/mrt/patches/patch-ae b/net/mrt/patches/patch-ae
new file mode 100644
index 00000000000..5739d311170
--- /dev/null
+++ b/net/mrt/patches/patch-ae
@@ -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 --git a/net/mrt/patches/patch-af b/net/mrt/patches/patch-af
new file mode 100644
index 00000000000..f5bd293531a
--- /dev/null
+++ b/net/mrt/patches/patch-af
@@ -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