NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mrouted: bump to version 3.9.6

Browse Source 
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2012-05-11 09:37:37 +00:00 committed by Peter Korsgaard
parent 21fd343a10
commit 28fa6f1951
4 changed files with 42 additions and 88 deletions

21
package/mrouted/mrouted-3.9.4-bcopy.patch
View File

@ -1,21 +0,0 @@
diff -Nura mrouted-3.9.4/mtrace.c mrouted-3.9.4-memmove/mtrace.c
--- mrouted-3.9.4/mtrace.c 2010-11-19 20:53:19.000000000 -0300
+++ mrouted-3.9.4-memmove/mtrace.c 2012-05-03 08:27:33.895422455 -0300
@@ -556,7 +556,7 @@
save->rtime = ((tr.tv_sec + JAN_1970) << 16) +
(tr.tv_usec << 10) / 15625;
save->len = len;
- bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);
+ memmove((char *)&save->igmp, (char *)igmp, ipdatalen);
}
return recvlen;
}
@@ -646,7 +646,7 @@
base.rtime = ((tr.tv_sec + JAN_1970) << 16) +
(tr.tv_usec << 10) / 15625;
base.len = len;
- bcopy((char *)igmp, (char *)&base.igmp, ipdatalen);
+ memmove((char *)&base.igmp, (char *)igmp, ipdatalen);
/*
* If the user specified which traces to monitor,
* only accept traces that correspond to the

64
package/mrouted/mrouted-3.9.4-makefile-flags.patch
View File

@ -1,64 +0,0 @@
---
Makefile | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
Index: mrouted-3.9.4/Makefile
===================================================================
--- mrouted-3.9.4.orig/Makefile
+++ mrouted-3.9.4/Makefile
@@ -42,11 +42,9 @@
#MSTAT_OBJS = mstat.o $(EXTRA_OBJS)
## Common
-CFLAGS = $(MCAST_INCLUDE) $(SNMPDEF) $(RSRRDEF) $(INCLUDES) $(DEFS) $(USERCOMPILE)
-CFLAGS += -O2 -W -Wall -Werror
-#CFLAGS += -O -g
-LDLIBS = $(SNMPLIBDIR) $(SNMPLIBS) $(EXTRA_LIBS)
-LDFLAGS += -Wl,-Map,$@.map
+MROUTED_CFLAGS = $(MCAST_INCLUDE) $(SNMPDEF) $(RSRRDEF) $(INCLUDES) $(DEFS) $(USERCOMPILE)
+LDLIBS = $(SNMPLIBDIR) $(SNMPLIBS) $(EXTRA_LIBS)
+MROUTED_LDFLAGS += -Wl,-Map,$@.map
OBJS = $(IGMP_OBJS) $(ROUTER_OBJS) $(MAPPER_OBJS) $(MRINFO_OBJS) \
$(MTRACE_OBJS) $(MSTAT_OBJS)
SRCS = $(OBJS:.o=.c)
@@ -65,7 +63,7 @@
.c.o:
@printf " CC $@\n"
- @$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(CPPFLAGS) -c -o $@ $<
install: $(EXECS)
@install -d $(DESTDIR)$(prefix)/sbin
@@ -95,26 +93,26 @@
mrouted: $(IGMP_OBJS) $(ROUTER_OBJS) $(CMULIBS)
@printf " LINK $@\n"
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS)
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS)
vers.c: Makefile
@echo $(VERSION) | sed -e 's/.*/char todaysversion[]="&";/' > vers.c
map-mbone: $(IGMP_OBJS) $(MAPPER_OBJS)
@printf " LINK $@\n"
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS)
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS)
mrinfo: $(IGMP_OBJS) $(MRINFO_OBJS)
@printf " LINK $@\n"
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS)
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS)
mtrace: $(IGMP_OBJS) $(MTRACE_OBJS)
@printf " LINK $@\n"
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS)
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS)
mstat: $(MSTAT_OBJS) $(CMULIBS)
@printf " LINK $@\n"
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS)
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS)
clean: $(SNMPCLEAN)
-@$(RM) $(OBJS) $(EXECS)

39
package/mrouted/mrouted-bcopy.patch Normal file
View File

@ -0,0 +1,39 @@
From 2d33110ee18fb59a1d6917d598fc1f4eb3c4cf83 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 7 May 2012 16:32:10 -0300
Subject: [PATCH] Switch from bcopy to memmove
The bcopy() function is marked as legacy per POSIX.1-2001 and removed by
POSIX-1.2008 thus shouldn't be used.
So switch over to memmove()
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
mtrace.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mtrace.c b/mtrace.c
index c982a67..64630bf 100644
--- a/mtrace.c
+++ b/mtrace.c
@@ -556,7 +556,7 @@ int send_recv(u_int32_t dst, int type, int code, int tries, struct resp_buf *sav
save->rtime = ((tr.tv_sec + JAN_1970) << 16) +
(tr.tv_usec << 10) / 15625;
save->len = len;
- bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);
+ memmove((char *)&save->igmp, (char *)igmp, ipdatalen);
}
return recvlen;
}
@@ -646,7 +646,7 @@ void passive_mode(void)
base.rtime = ((tr.tv_sec + JAN_1970) << 16) +
(tr.tv_usec << 10) / 15625;
base.len = len;
- bcopy((char *)igmp, (char *)&base.igmp, ipdatalen);
+ memmove((char *)&base.igmp, (char *)igmp, ipdatalen);
/*
* If the user specified which traces to monitor,
* only accept traces that correspond to the
--
1.7.3.4

6
package/mrouted/mrouted.mk
View File

@ -2,11 +2,11 @@
#
# mrouted
#
#
#############################################################
MROUTED_VERSION = 3.9.4
MROUTED_VERSION = 3.9.6
MROUTED_SOURCE = mrouted-$(MROUTED_VERSION).tar.bz2
MROUTED_SITE = http://ftp.vmlinux.org/pub/People/jocke/mrouted
MROUTED_SITE = http://cloud.github.com/downloads/troglobit/mrouted
define MROUTED_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)