From patchwork Wed Mar 22 08:16:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 741915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vp2b14nBlz9s7l for ; Wed, 22 Mar 2017 19:16:45 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g0h6A/wJ"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5DCEC2EDC1; Wed, 22 Mar 2017 08:16:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sNSxQGieUcun; Wed, 22 Mar 2017 08:16:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0CA9426827; Wed, 22 Mar 2017 08:16:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 15EB51C2018 for ; Wed, 22 Mar 2017 08:16:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1099D86D57 for ; Wed, 22 Mar 2017 08:16:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1Ond2H0JDygX for ; Wed, 22 Mar 2017 08:16:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3315186D50 for ; Wed, 22 Mar 2017 08:16:36 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id n11so14248031pfg.2 for ; Wed, 22 Mar 2017 01:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7aIG5HYw/8WJVWTEGyw+0RCco8mo1XJW2mey78que2g=; b=g0h6A/wJyuw+m2fk0f8+G8jrp80LKmvWfZsNqG50lMN/wLvoi0+dOpCf8KQEFgZS1O 0kfY1qZtuvY8zWnzE7Mv4P1Ky9h78lGIM2TV21ONrcO3kiaNAOpvrlWo6Ef6/wWSk/1t Fe5JMzMrL+gtLt94AaLayjCFY2HtDHRi4mUnIg1CqnEIfT/G+lk74P2OnlbTuK/HMXsf M65YxAc4DazKMLKu5/57X3KNgYGVhGXEnwKm9MTDnL4/CS6UXypiGY8iAVThiODxOkJ7 5uYSUsznimZpzyLklEerutCK723egd23Uvr2EWHqt56nSmX0gpHbSRWwOzPnCJ60puvN bK2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7aIG5HYw/8WJVWTEGyw+0RCco8mo1XJW2mey78que2g=; b=aQ2F270mOwe5wi3r5wZHy+pD+xMbW86LcBOc7PH4npZ0mqAZIG1CVkPXisZT0bqXev mJtty6BAUY5nJyJbIdOdRTJteEt+IM5cwyY/UGbp5YHg+Xv5j2eE1btIiJGw7q+d2u8n 2/wXFh15o8a35qTwXrgmek4D0ER4PbsAAxhJjlSy5TEW43tys2nvFByqKmp3bhyNSlUP E+61hQkSM41f+ZB1UiIkkLZbyHuPG1phYL9gXqgY0+g7vGzURahRkSZc9ooAzcOykZjo wRtJA8OkUGyvOa7c4WmkVpbkAnouY4s2O6oVD/pZYuQsgzrxJGmjCejpyx8j/RmawYTd f8ww== X-Gm-Message-State: AFeK/H0DzFL3Ii4Oy7VlL6PkaiplQIyWEmmZ9Dws1N4JChQ77dFu0Vf/ToxrmHx1rrVm1Q== X-Received: by 10.99.23.102 with SMTP id 38mr43014161pgx.188.1490170595784; Wed, 22 Mar 2017 01:16:35 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:8987:faae:9fd:b827]) by smtp.gmail.com with ESMTPSA id d199sm2046252pfd.107.2017.03.22.01.16.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 01:16:35 -0700 (PDT) From: Chris Packham To: buildroot@buildroot.org Date: Wed, 22 Mar 2017 21:16:26 +1300 Message-Id: <20170322081626.6757-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.11.0.24.ge6920cf Subject: [Buildroot] [PATCH] tcpreplay: Bump version to v4.2.0 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" Signed-off-by: Chris Packham --- ...-capture-has-a-packet-that-is-too-large-2.patch | 44 ---------------------- package/tcpreplay/tcpreplay.hash | 2 +- package/tcpreplay/tcpreplay.mk | 2 +- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch diff --git a/package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch b/package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch deleted file mode 100644 index 233b6d959..000000000 --- a/package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d689d14dbcd768c028eab2fb378d849e543dcfe9 Mon Sep 17 00:00:00 2001 -From: Fred Klassen -Date: Sun, 26 Feb 2017 20:45:59 -0800 -Subject: [PATCH] #278 fail if capture has a packet that is too large (#286) - -* #278 fail if capture has a packet that is too large - -[baruch: remove the CHANGELOG update] -Signed-off-by: Baruch Siach ---- -Upstream status: upstream commit d689d14db - -diff --git a/src/tcpcapinfo.c b/src/tcpcapinfo.c -index 775f1625b00f..96928820fe94 100644 ---- a/src/tcpcapinfo.c -+++ b/src/tcpcapinfo.c -@@ -281,6 +281,15 @@ main(int argc, char *argv[]) - caplen = pcap_ph.caplen; - } - -+ if (caplentoobig) { -+ printf("\n\nCapture file appears to be damaged or corrupt.\n" -+ "Contains packet of size %u, bigger than snap length %u\n", -+ caplen, pcap_fh.snaplen); -+ -+ close(fd); -+ break; -+ } -+ - /* check to make sure timestamps don't go backwards */ - if (last_sec > 0 && last_usec > 0) { - if ((pcap_ph.ts.tv_sec == last_sec) ? -@@ -306,7 +315,7 @@ main(int argc, char *argv[]) - } - - close(fd); -- continue; -+ break; - } - - /* print the frame checksum */ --- -2.11.0 - diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index e7ba4400e..bc75d88e7 100644 --- a/package/tcpreplay/tcpreplay.hash +++ b/package/tcpreplay/tcpreplay.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 da483347e83a9b5df0e0dbb0f822a2d37236e79dda35f4bc4e6684fa827f25ea tcpreplay-4.1.2.tar.gz +sha256 924f80cd1958a4c4447f0a6a54e8d3af7aebd3674aa4ef9973f69b43b1675221 tcpreplay-4.2.0.tar.gz diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index a8bcf1c5d..21784c1ff 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.1.2 +TCPREPLAY_VERSION = 4.2.0 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_LICENSE = GPLv3 TCPREPLAY_LICENSE_FILES = docs/LICENSE