diff options
author | gdt <gdt> | 2011-03-28 19:36:30 +0000 |
---|---|---|
committer | gdt <gdt> | 2011-03-28 19:36:30 +0000 |
commit | 732753b240cd7d699d1212a839299e5affab3040 (patch) | |
tree | 9cec095dd193d731e4382227d9ace5be47e52a5b /graphics/xplot-devel/patches | |
parent | ddf916dc33d2b77a2cfee8e9f280ecebe7c10304 (diff) | |
download | pkgsrc-732753b240cd7d699d1212a839299e5affab3040.tar.gz |
Add hunk: don't assume bare split writes @_, because new perl doesn't.
Rename patchfile for new convention, and add comments.
Diffstat (limited to 'graphics/xplot-devel/patches')
-rw-r--r-- | graphics/xplot-devel/patches/patch-tcpdump2xplot.pl (renamed from graphics/xplot-devel/patches/patch-ab) | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/graphics/xplot-devel/patches/patch-ab b/graphics/xplot-devel/patches/patch-tcpdump2xplot.pl index 80622a6039b..4c1c4a5e13b 100644 --- a/graphics/xplot-devel/patches/patch-ab +++ b/graphics/xplot-devel/patches/patch-tcpdump2xplot.pl @@ -1,6 +1,15 @@ -$NetBSD: patch-ab,v 1.1 2006/10/14 09:20:14 bad Exp $ +$NetBSD: patch-tcpdump2xplot.pl,v 1.1 2011/03/28 19:36:30 gdt Exp $ ---- tcpdump2xplot.pl.orig 2006-07-27 21:55:59.000000000 +0200 +# This patch contains minor changes to parsing tcpdump to adapt to +# tcpdump's output changes. These changes should be merged upstream. +# Upstream has no bug tracker but $MAINTAINER is an upstream maintainer. +# Specifically: +# omit tos information - we don't use it and it confuses the parser +# bare split breaks in modern perl - assgin to @_ explicitly +# remove "IP" as second field +# allow multiple spaces when splitting sack. + +--- tcpdump2xplot.pl.orig 2006-07-27 19:55:59.000000000 +0000 +++ tcpdump2xplot.pl @@ -229,12 +229,16 @@ for ($lineNo = 1; <$Tcpdump>; $lineNo++) local(%opts); @@ -15,7 +24,7 @@ $NetBSD: patch-ab,v 1.1 2006/10/14 09:20:14 bad Exp $ - if ($_[1] == "IP") { - splice @_,1,1; - } -+ split(/ +/); ++ @_ = split(/ +/); + # Sometime after version 3.7.1 tcpdump started to print 'IP' + # as the second field in the output. Get rid of it again. + # also remove additional fields printed in verbose mode |