From 690df505864e45457dec3f5f1d0198705605faa9 Mon Sep 17 00:00:00 2001 From: Martin Banky Date: Sun, 12 Dec 2010 22:53:49 +0100 Subject: [PATCH] mrouted: convet to gentargets and bump to version 3.9.4 mrouted is once again being actively developed. See http://github.com/troglobit/mrouted [ Thomas: bump to 3.9.4, patches updated, prefix fix. ] Signed-off-by: Martin Banky Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- CHANGES | 2 +- package/mrouted/Config.in | 5 +- .../mrouted-3.9-beta3-bcopy_bcmp_bzero.patch | 164 ------------------ package/mrouted/mrouted-3.9.4-bcopy.patch | 26 +++ .../mrouted-3.9.4-makefile-flags.patch | 64 +++++++ package/mrouted/mrouted-sys_errlist.patch | 44 ----- package/mrouted/mrouted.mk | 60 ++----- 7 files changed, 111 insertions(+), 254 deletions(-) delete mode 100644 package/mrouted/mrouted-3.9-beta3-bcopy_bcmp_bzero.patch create mode 100644 package/mrouted/mrouted-3.9.4-bcopy.patch create mode 100644 package/mrouted/mrouted-3.9.4-makefile-flags.patch delete mode 100644 package/mrouted/mrouted-sys_errlist.patch diff --git a/CHANGES b/CHANGES index c56fa751f7..2a46d66363 100644 --- a/CHANGES +++ b/CHANGES @@ -6,7 +6,7 @@ Updated/fixed packages: at, busybox, bzip2, dbus, direcfb-examples, dmalloc, cloop, cups, ffmpeg, gdk-pixbuf, hostapd, i2c-tools, input-tools, libconfig, ltp-testsuite, m4, - mii-diag, openssh, openssl, openvpn, pango, qt, rsync, + mii-diag, mrouted, openssh, openssl, openvpn, pango, qt, rsync, sdl_gfx, sdl_sound, udev, usbutils, xz, zlib New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone diff --git a/package/mrouted/Config.in b/package/mrouted/Config.in index df3c567110..1503cc6ab9 100644 --- a/package/mrouted/Config.in +++ b/package/mrouted/Config.in @@ -3,4 +3,7 @@ config BR2_PACKAGE_MROUTED help An implementation of the DVMRP multicast routing protocol. - http://freshmeat.net/projects/mrouted/ + If built with uClibc, then UCLIBC_SUPPORT_AI_ADDRCONFIG is + needed in uClibc configuration. + + http://github.com/troglobit/mrouted diff --git a/package/mrouted/mrouted-3.9-beta3-bcopy_bcmp_bzero.patch b/package/mrouted/mrouted-3.9-beta3-bcopy_bcmp_bzero.patch deleted file mode 100644 index e38efd2e3c..0000000000 --- a/package/mrouted/mrouted-3.9-beta3-bcopy_bcmp_bzero.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff -urN mrouted-3.9-beta3.0rig/cfparse.y mrouted-3.9-beta3/cfparse.y ---- mrouted-3.9-beta3.0rig/cfparse.y 1998-03-01 02:48:58.000000000 +0100 -+++ mrouted-3.9-beta3/cfparse.y 2009-01-14 21:17:00.000000000 +0100 -@@ -583,8 +583,7 @@ - if (hp->h_addr_list[1]) - fatal("Hostname %s does not %s", - $1, "map to a unique address"); -- -- bcopy(hp->h_addr_list[0], &$$, -+ memmove (&$$, hp->h_addr_list[0], - hp->h_length); - } - -diff -urN mrouted-3.9-beta3.0rig/config.c mrouted-3.9-beta3/config.c ---- mrouted-3.9-beta3.0rig/config.c 1998-01-06 02:57:41.000000000 +0100 -+++ mrouted-3.9-beta3/config.c 2009-01-14 21:18:59.000000000 +0100 -@@ -89,7 +89,7 @@ - * SIOCGIFFLAGS stomps over it because the requests - * are returned in a union.) - */ -- bcopy(ifrp->ifr_name, ifr.ifr_name, sizeof(ifr.ifr_name)); -+ memmove (ifr.ifr_name, ifrp->ifr_name, sizeof(ifr.ifr_name)); - - /* - * Ignore loopback interfaces and interfaces that do not support -diff -urN mrouted-3.9-beta3.0rig/defs.h mrouted-3.9-beta3/defs.h ---- mrouted-3.9-beta3.0rig/defs.h 2009-01-14 21:12:22.000000000 +0100 -+++ mrouted-3.9-beta3/defs.h 2009-01-14 21:20:05.000000000 +0100 -@@ -116,8 +116,6 @@ - #endif /* RSRR */ - - #ifdef SYSV --#define bcopy(a, b, c) memcpy(b, a, c) --#define bzero(s, n) memset((s), 0, (n)) - #define setlinebuf(s) setvbuf(s, NULL, _IOLBF, 0) - #endif - -diff -urN mrouted-3.9-beta3.0rig/igmp.c mrouted-3.9-beta3/igmp.c ---- mrouted-3.9-beta3.0rig/igmp.c 1998-01-06 02:57:43.000000000 +0100 -+++ mrouted-3.9-beta3/igmp.c 2009-01-14 21:27:41.000000000 +0100 -@@ -56,7 +56,7 @@ - k_set_loop(FALSE); /* disable multicast loopback */ - - ip = (struct ip *)send_buf; -- bzero(ip, sizeof(struct ip)); -+ memset(ip, 0, sizeof(struct ip)); - /* - * Fields zeroed that aren't filled in later: - * - IP ID (let the kernel fill it in) -@@ -421,7 +421,7 @@ - } - } - -- bzero(&sdst, sizeof(sdst)); -+ memset(&sdst, 0, sizeof(sdst)); - sdst.sin_family = AF_INET; - #ifdef HAVE_SA_LEN - sdst.sin_len = sizeof(sdst); -diff -urN mrouted-3.9-beta3.0rig/ipip.c mrouted-3.9-beta3/ipip.c ---- mrouted-3.9-beta3.0rig/ipip.c 1998-01-06 02:57:45.000000000 +0100 -+++ mrouted-3.9-beta3/ipip.c 2009-01-14 21:28:19.000000000 +0100 -@@ -61,7 +61,7 @@ - ip = v->uv_encap_hdr = (struct ip *)malloc(sizeof(struct ip)); - if (ip == NULL) - log(LOG_ERR, 0, "out of memory"); -- bzero(ip, sizeof(struct ip)); -+ memset(ip, 0, sizeof(struct ip)); - /* - * Fields zeroed that aren't filled in later: - * - IP ID (let the kernel fill it in) -@@ -111,7 +111,7 @@ - ip->ip_len = htons(ip->ip_len); - #endif - -- bzero(&sdst, sizeof(sdst)); -+ memset(&sdst, 0, sizeof(sdst)); - sdst.sin_family = AF_INET; - #ifdef HAVE_SA_LEN - sdst.sin_len = sizeof(sdst); -@@ -123,7 +123,7 @@ - iov[1].iov_base = (caddr_t)send_buf; - iov[1].iov_len = MIN_IP_HEADER_LEN + IGMP_MINLEN + datalen; - -- bzero(&msg, sizeof(msg)); -+ memset(&msg, 0, sizeof(msg)); - msg.msg_name = (caddr_t)&sdst; - msg.msg_namelen = sizeof(sdst); - msg.msg_iov = iov; -diff -urN mrouted-3.9-beta3.0rig/main.c mrouted-3.9-beta3/main.c ---- mrouted-3.9-beta3.0rig/main.c 2009-01-14 21:12:22.000000000 +0100 -+++ mrouted-3.9-beta3/main.c 2009-01-14 21:22:33.000000000 +0100 -@@ -429,7 +429,7 @@ - gettimeofday(&curtime, NULL); - lasttime = curtime; - for(;;) { -- bcopy((char *)&readers, (char *)&rfds, sizeof(rfds)); -+ memmove ((char *)&rfds, (char *)&readers, sizeof(rfds)); - secs = timer_nextTimer(); - if (secs == -1) - timeout = NULL; -diff -urN mrouted-3.9-beta3.0rig/prune.c mrouted-3.9-beta3/prune.c ---- mrouted-3.9-beta3.0rig/prune.c 1998-03-01 03:06:32.000000000 +0100 -+++ mrouted-3.9-beta3/prune.c 2009-01-14 21:27:06.000000000 +0100 -@@ -2450,7 +2450,7 @@ - /* copy the packet to the sending buffer */ - p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN; - -- bcopy(data, p, datalen); -+ memmove (p, data, datalen); - - p += datalen; - -@@ -2469,7 +2469,7 @@ - * fill in initial response fields - */ - resp = (struct tr_resp *)p; -- bzero(resp, sizeof(struct tr_resp)); -+ memset(resp, 0, sizeof(struct tr_resp)); - datalen += RLEN; - - resp->tr_qarr = htonl(((tp.tv_sec + JAN_1970) << 16) + -diff -urN mrouted-3.9-beta3.0rig/route.c mrouted-3.9-beta3/route.c ---- mrouted-3.9-beta3.0rig/route.c 1998-01-15 01:08:34.000000000 +0100 -+++ mrouted-3.9-beta3/route.c 2009-01-14 21:26:37.000000000 +0100 -@@ -388,7 +388,8 @@ - else r->rt_originwidth = 1; - r->rt_flags = 0; - r->rt_dominants = (u_int32 *)(r + 1); -- bzero(r->rt_dominants, numvifs * sizeof(u_int32)); -+ memset(r->rt_dominants, 0, numvifs * sizeof(u_int32)); -+ - r->rt_groups = NULL; - VIFM_CLRALL(r->rt_children); - NBRM_CLRALL(r->rt_subordinates); -@@ -968,7 +969,7 @@ - bh->bh_dst = dst; - bh->bh_level = level; - bh->bh_datalen = datalen; -- bcopy(p, (char *)(bh + 1), datalen); -+ memmove ((char *)(bh + 1), p, datalen); - v->uv_blasterend += bblen; - - if (v->uv_blastertimer == 0) { -diff -urN mrouted-3.9-beta3.0rig/rsrr.c mrouted-3.9-beta3/rsrr.c ---- mrouted-3.9-beta3.0rig/rsrr.c 1998-01-06 02:57:58.000000000 +0100 -+++ mrouted-3.9-beta3/rsrr.c 2009-01-14 21:29:18.000000000 +0100 -@@ -81,7 +81,7 @@ - log(LOG_ERR, errno, "Can't create RSRR socket"); - - unlink(RSRR_SERV_PATH); -- bzero((char *) &serv_addr, sizeof(serv_addr)); -+ memset((char *) &serv_addr, 0, sizeof(serv_addr)); - serv_addr.sun_family = AF_UNIX; - strcpy(serv_addr.sun_path, RSRR_SERV_PATH); - #ifdef HAVE_SA_LEN -@@ -107,7 +107,7 @@ - { - register int rsrr_recvlen; - -- bzero((char *) &client_addr, sizeof(client_addr)); -+ memset((char *) &client_addr, 0, sizeof(client_addr)); - rsrr_recvlen = recvfrom(rsrr_socket, rsrr_recv_buf, sizeof(rsrr_recv_buf), - 0, (struct sockaddr *)&client_addr, &client_length); - if (rsrr_recvlen < 0) { diff --git a/package/mrouted/mrouted-3.9.4-bcopy.patch b/package/mrouted/mrouted-3.9.4-bcopy.patch new file mode 100644 index 0000000000..73f8acccbb --- /dev/null +++ b/package/mrouted/mrouted-3.9.4-bcopy.patch @@ -0,0 +1,26 @@ +--- + mtrace.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: mrouted-3.9.4/mtrace.c +=================================================================== +--- mrouted-3.9.4.orig/mtrace.c ++++ mrouted-3.9.4/mtrace.c +@@ -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 *)igmp, (char *)&save->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 *)igmp, (char *)&base.igmp, ipdatalen); + /* + * If the user specified which traces to monitor, + * only accept traces that correspond to the diff --git a/package/mrouted/mrouted-3.9.4-makefile-flags.patch b/package/mrouted/mrouted-3.9.4-makefile-flags.patch new file mode 100644 index 0000000000..932bec006c --- /dev/null +++ b/package/mrouted/mrouted-3.9.4-makefile-flags.patch @@ -0,0 +1,64 @@ +--- + 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) diff --git a/package/mrouted/mrouted-sys_errlist.patch b/package/mrouted/mrouted-sys_errlist.patch deleted file mode 100644 index 8498dc743f..0000000000 --- a/package/mrouted/mrouted-sys_errlist.patch +++ /dev/null @@ -1,44 +0,0 @@ -Patches from Kevin P. Fleming . - ---- mrouted-3.9-beta3.orig/main.c~ 2004-03-10 19:00:38.000000000 -0700 -+++ mrouted-3.9-beta3.orig/main.c 2004-03-10 19:02:33.000000000 -0700 -@@ -1001,10 +1001,8 @@ - thyme->tm_min, thyme->tm_sec, now.tv_usec / 1000, msg); - if (syserr == 0) - fprintf(stderr, "\n"); -- else if (syserr < sys_nerr) -- fprintf(stderr, ": %s\n", sys_errlist[syserr]); - else -- fprintf(stderr, ": errno %d\n", syserr); -+ fprintf(stderr, ": %s\n", strerror(syserr)); - } - - /* ---- mrouted-3.9-beta3.orig/mrinfo.c~ 1998-02-28 20:05:20.000000000 -0700 -+++ mrouted-3.9-beta3.orig/mrinfo.c 2004-03-10 19:01:49.000000000 -0700 -@@ -159,10 +159,8 @@ - vfprintf(stderr, fmt, ap); - if (syserr == 0) - fprintf(stderr, "\n"); -- else if (syserr < sys_nerr) -- fprintf(stderr, ": %s\n", sys_errlist[syserr]); - else -- fprintf(stderr, ": errno %d\n", syserr); -+ fprintf(stderr, ": %s\n", strerror(syserr)); - } - - if (severity <= LOG_ERR) ---- mrouted-3.9-beta3.orig/mapper.c~ 1998-01-05 18:57:47.000000000 -0700 -+++ mrouted-3.9-beta3.orig/mapper.c 2004-03-10 19:02:04.000000000 -0700 -@@ -197,10 +197,8 @@ - vfprintf(stderr, fmt, ap); - if (syserr == 0) - fprintf(stderr, "\n"); -- else if (syserr < sys_nerr) -- fprintf(stderr, ": %s\n", sys_errlist[syserr]); - else -- fprintf(stderr, ": errno %d\n", syserr); -+ fprintf(stderr, ": %s\n", strerror(syserr)); - } - - if (severity <= LOG_ERR) diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index 4438c6dd18..da4ef72f30 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -4,52 +4,24 @@ # # ############################################################# -MROUTED_VERSION:=3.9-beta3.orig -MROUTED_SOURCE:=mrouted_$(MROUTED_VERSION).tar.gz -MROUTED_SITE:=http://archive.debian.org/debian-archive/pool/non-free/m/mrouted/ -MROUTED_DIR:=$(BUILD_DIR)/mrouted-$(MROUTED_VERSION) -MROUTED_CAT:=$(ZCAT) -MROUTED_PATCH:=mrouted_3.9-beta3-1.1.diff.gz -MROUTED_BINARY:=mrouted -MROUTED_TARGET_BINARY:=usr/sbin/mrouted +MROUTED_VERSION = 3.9.4 +MROUTED_SITE = https://github.com/troglobit/mrouted.git +MROUTED_SITE_METHOD = git -$(DL_DIR)/$(MROUTED_SOURCE): - $(call DOWNLOAD,$(MROUTED_SITE),$(MROUTED_SOURCE)) +define MROUTED_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef -$(DL_DIR)/$(MROUTED_PATCH): - $(call DOWNLOAD,$(MROUTED_SITE),$(MROUTED_PATCH)) +define MROUTED_INSTALL_TARGET_CMDS + $(MAKE) prefix=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install +endef -$(MROUTED_DIR)/.unpacked: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH) - $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_PATCH) | patch -p1 -d $(MROUTED_DIR) - toolchain/patch-kernel.sh $(MROUTED_DIR) package/mrouted/ mrouted\*.patch - touch $(MROUTED_DIR)/.unpacked +define MROUTED_UNINSTALL_TARGET_CMDS + $(MAKE) prefix=/usr DESTDIR=$(TARGET_DIR) -C $(@D) uninstall +endef -$(MROUTED_DIR)/$(MROUTED_BINARY): $(MROUTED_DIR)/.unpacked - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) CC="$(TARGET_CC)" -C $(MROUTED_DIR) +define MROUTED_CLEAN_CMDS + $(MAKE) -C $(@D) clean +endef -$(TARGET_DIR)/$(MROUTED_TARGET_BINARY): $(MROUTED_DIR)/$(MROUTED_BINARY) - cp -a $(MROUTED_DIR)/$(MROUTED_BINARY) $(TARGET_DIR)/$(MROUTED_TARGET_BINARY) - -mrouted: $(TARGET_DIR)/$(MROUTED_TARGET_BINARY) - -mrouted-source: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH) - -mrouted-unpacked: $(MROUTED_DIR)/.unpacked - -mrouted-clean: - rm -f $(TARGET_DIR)/$(MROUTED_TARGET_BINARY) - -$(MAKE) -C $(MROUTED_DIR) clean - -mrouted-dirclean: - rm -rf $(MROUTED_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_MROUTED),y) -TARGETS+=mrouted -endif +$(eval $(call GENTARGETS,package,mrouted)) -- 2.30.2