From patchwork Fri Jan 2 12:39:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 424987 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 16ECD14012A for ; Fri, 2 Jan 2015 23:40:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 460B28AE44; Fri, 2 Jan 2015 12:40:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fQ7xlcSsU3kc; Fri, 2 Jan 2015 12:40:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id F3C148ADEE; Fri, 2 Jan 2015 12:40:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B9C4A1C2875 for ; Fri, 2 Jan 2015 12:40:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B4CC98AA77 for ; Fri, 2 Jan 2015 12:40:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qKdr2WeVa9Qs for ; Fri, 2 Jan 2015 12:40:41 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [62.210.192.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0D10A8516E for ; Fri, 2 Jan 2015 12:40:40 +0000 (UTC) Received: from asgard ([200.5.70.130]) (authenticated bits=0) by www.zacarias.com.ar (8.14.9/8.14.9) with ESMTP id t02CeXtH011503 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 2 Jan 2015 12:40:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1420202439; bh=ax/wrjv0FgAoRHtJPPIHJ82VYeYlcYf1CQPvN607jdU=; h=From:To:Cc:Subject:Date; b=DyrsZvz3bHmkbip6NQO2PKaaRQFlPhkrpzDWxpeVtuhOEgqKwwsmOUdWdp/+36bEx NZ0HG0T20HGMlygqgLaS3EZVs8eUqG6PW4pt/CWjYNNgxbKLs06ZcGUcFRw1NGYw6F s34RdSGci+scRd35GmjedTVeKc0/N7sI9GKCI77c= Received: by asgard (sSMTP sendmail emulation); Fri, 02 Jan 2015 09:39:40 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Fri, 2 Jan 2015 09:39:40 -0300 Message-Id: <1420202380-29765-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.0.5 X-Virus-Scanned: clamav-milter 0.98.5 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH] mrouted: bump to version 3.9.7 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" bcopy patch removed since code is upstream. Signed-off-by: Gustavo Zacarias --- package/mrouted/mrouted-bcopy.patch | 39 ------------------------------------- package/mrouted/mrouted.mk | 10 +++++++++- 2 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 package/mrouted/mrouted-bcopy.patch diff --git a/package/mrouted/mrouted-bcopy.patch b/package/mrouted/mrouted-bcopy.patch deleted file mode 100644 index 74af02d..0000000 --- a/package/mrouted/mrouted-bcopy.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2d33110ee18fb59a1d6917d598fc1f4eb3c4cf83 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -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 ---- - 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 - diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index 78fe98a..01b4a9f 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -4,9 +4,17 @@ # ################################################################################ -MROUTED_VERSION = 3.9.6 +MROUTED_VERSION = 3.9.7 MROUTED_SITE = $(call github,troglobit,mrouted,$(MROUTED_VERSION)) MROUTED_DEPENDENCIES = host-bison +MROUTED_LICENSE = BSD-3c +MROUTED_LICENSE_FILES = LICENSE + +define MROUTED_CONFIGURE_CMDS + (cd $(@D); \ + $(TARGET_MAKE_ENV) $(@D)/configure --enable-rsrr \ + ) +endef define MROUTED_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)