From d670d0f889cc02eba4d9de43e838f07962a52750 Mon Sep 17 00:00:00 2001 From: espie Date: Fri, 28 May 2010 09:49:21 +0000 Subject: [PATCH] fix build on gcc4 --- net/mrtd/patches/patch-include_mrt_h | 8 +++---- net/mrtd/patches/patch-include_rib_h | 11 ++++++++++ net/mrtd/patches/patch-lib_config_commconf_c | 22 ++++++++++++++++++++ net/mrtd/patches/patch-lib_mrt_buffer_c | 8 +++---- net/mrtd/patches/patch-lib_mrt_trace_c | 8 +++---- 5 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 net/mrtd/patches/patch-include_rib_h create mode 100644 net/mrtd/patches/patch-lib_config_commconf_c diff --git a/net/mrtd/patches/patch-include_mrt_h b/net/mrtd/patches/patch-include_mrt_h index 1c192722b8d..3892a5dd38e 100644 --- a/net/mrtd/patches/patch-include_mrt_h +++ b/net/mrtd/patches/patch-include_mrt_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-include_mrt_h,v 1.1 2001/04/16 12:15:25 lebel Exp $ ---- include/mrt.h.orig Tue Dec 28 18:41:27 1999 -+++ include/mrt.h Thu Apr 12 10:56:21 2001 -@@ -680,7 +680,7 @@ int inet_pton (int af, const char *src, +$OpenBSD: patch-include_mrt_h,v 1.2 2010/05/28 09:49:21 espie Exp $ +--- include/mrt.h.orig Wed Dec 29 00:41:27 1999 ++++ include/mrt.h Fri May 28 04:15:22 2010 +@@ -680,7 +680,7 @@ int inet_pton (int af, const char *src, void *dst); #ifdef NT void *memmove (void *dest, const void *src, size_t n); #else diff --git a/net/mrtd/patches/patch-include_rib_h b/net/mrtd/patches/patch-include_rib_h new file mode 100644 index 00000000000..3a6293a1001 --- /dev/null +++ b/net/mrtd/patches/patch-include_rib_h @@ -0,0 +1,11 @@ +$OpenBSD: patch-include_rib_h,v 1.1 2010/05/28 09:49:21 espie Exp $ +--- include/rib.h.orig Fri May 28 11:46:14 2010 ++++ include/rib.h Fri May 28 11:46:30 2010 +@@ -167,7 +167,6 @@ int trace_ipv6_rib (uii_connection_t *uii); + #endif /* HAVE_IPV6 */ + + extern rib_t *RIB; +-extern rib_t *RIBS[AFI_MAX][SAFI_MAX]; + extern rib_t *RIBm; + extern rib_t *RIBv6; + extern rib_t *RIBv6m; diff --git a/net/mrtd/patches/patch-lib_config_commconf_c b/net/mrtd/patches/patch-lib_config_commconf_c new file mode 100644 index 00000000000..7985c683803 --- /dev/null +++ b/net/mrtd/patches/patch-lib_config_commconf_c @@ -0,0 +1,22 @@ +$OpenBSD: patch-lib_config_commconf_c,v 1.1 2010/05/28 09:49:21 espie Exp $ +--- lib/config/commconf.c.orig Fri May 28 11:42:24 2010 ++++ lib/config/commconf.c Fri May 28 11:45:23 2010 +@@ -351,7 +351,8 @@ get_config_interface (interface_t * interface) + static int + config_interface (uii_connection_t * uii, char *name) + { +- interface_t *interface, *ip; ++ interface_t *interface; ++ DATA_PTR ip; + + if ((interface = find_interface_byname (name)) == NULL) { + config_notice (TR_ERROR, uii, +@@ -365,7 +366,7 @@ config_interface (uii_connection_t * uii, char *name) + uii->state = UII_CONFIG_INTERFACE; + Delete (name); + +- LL_Iterate (CONFIG_MRTD->ll_interfaces, (char *) ip) { ++ LL_Iterate (CONFIG_MRTD->ll_interfaces, ip) { + if (ip == interface) + return (0); + } diff --git a/net/mrtd/patches/patch-lib_mrt_buffer_c b/net/mrtd/patches/patch-lib_mrt_buffer_c index d89f310e8a6..6f31a869141 100644 --- a/net/mrtd/patches/patch-lib_mrt_buffer_c +++ b/net/mrtd/patches/patch-lib_mrt_buffer_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_mrt_buffer_c,v 1.1 2002/12/06 02:12:28 pvalchev Exp $ ---- lib/mrt/buffer.c.orig Thu Nov 28 22:24:33 2002 -+++ lib/mrt/buffer.c Thu Nov 28 22:25:05 2002 -@@ -375,9 +375,7 @@ buffer_vprintf (buffer_t *buffer, char * +$OpenBSD: patch-lib_mrt_buffer_c,v 1.2 2010/05/28 09:49:21 espie Exp $ +--- lib/mrt/buffer.c.orig Mon Dec 20 18:26:10 1999 ++++ lib/mrt/buffer.c Fri May 28 04:15:22 2010 +@@ -375,9 +375,7 @@ buffer_vprintf (buffer_t *buffer, char *fmt, va_list a case 'X': case 'x': case 'b': diff --git a/net/mrtd/patches/patch-lib_mrt_trace_c b/net/mrtd/patches/patch-lib_mrt_trace_c index 41941a2e871..1ac76924d83 100644 --- a/net/mrtd/patches/patch-lib_mrt_trace_c +++ b/net/mrtd/patches/patch-lib_mrt_trace_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_mrt_trace_c,v 1.1 2002/12/06 02:12:29 pvalchev Exp $ ---- lib/mrt/trace.c.orig Thu Nov 28 22:25:08 2002 -+++ lib/mrt/trace.c Thu Nov 28 22:25:25 2002 -@@ -496,7 +496,7 @@ int set_trace (trace_t * tmp, int first, +$OpenBSD: patch-lib_mrt_trace_c,v 1.2 2010/05/28 09:49:21 espie Exp $ +--- lib/mrt/trace.c.orig Tue Apr 18 20:42:13 2000 ++++ lib/mrt/trace.c Fri May 28 04:15:22 2010 +@@ -496,7 +496,7 @@ int set_trace (trace_t * tmp, int first,...) { tmp->flags &= ~va_arg (ap, long); break; case TRACE_USE_SYSLOG: