[pkgsrc/trunk]: pkgsrc/net/ethereal fix alignment in the ieee802_11_radio header

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c553c264170
branches:  trunk
changeset: 496787:4c553c264170
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Jul 13 10:01:53 2005 +0000

description:
fix alignment in the ieee802_11_radio header

diffstat:

 net/ethereal/Makefile         |   7 ++++++-
 net/ethereal/distinfo         |   3 ++-
 net/ethereal/patches/patch-aa |  27 +++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diffs (65 lines):

diff -r 0e77f9f9a39c -r 4c553c264170 net/ethereal/Makefile
--- a/net/ethereal/Makefile     Wed Jul 13 09:55:50 2005 +0000
+++ b/net/ethereal/Makefile     Wed Jul 13 10:01:53 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2005/06/01 18:03:07 jlam Exp $
+# $NetBSD: Makefile,v 1.110 2005/07/13 10:01:53 drochner Exp $
 
 DISTNAME=              ethereal-0.10.11
+PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          http://www.ethereal.com/distribution/ \
                        http://ethereal.planetmirror.com/distribution/ \
@@ -46,6 +47,10 @@
 USE_BUILTIN.libpcap=   no
 .endif
 
+# XXX avoid rebuild after dissector patch
+pre-build:
+       ${TOUCH} ${WRKSRC}/epan/dissectors/register.c
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff -r 0e77f9f9a39c -r 4c553c264170 net/ethereal/distinfo
--- a/net/ethereal/distinfo     Wed Jul 13 09:55:50 2005 +0000
+++ b/net/ethereal/distinfo     Wed Jul 13 10:01:53 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.38 2005/05/06 13:54:48 tron Exp $
+$NetBSD: distinfo,v 1.39 2005/07/13 10:01:53 drochner Exp $
 
 SHA1 (ethereal-0.10.11.tar.bz2) = 8ce2f276cd71b6dae23b75496316f72285bab547
 RMD160 (ethereal-0.10.11.tar.bz2) = 3064136913a762f8cad1e4c925c70cce9895f05a
 Size (ethereal-0.10.11.tar.bz2) = 5964016 bytes
+SHA1 (patch-aa) = 0513b971c0af032fc64fc181fbd64d78aef0d044
diff -r 0e77f9f9a39c -r 4c553c264170 net/ethereal/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ethereal/patches/patch-aa     Wed Jul 13 10:01:53 2005 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-aa,v 1.15 2005/07/13 10:01:53 drochner Exp $
+
+--- epan/dissectors/packet-radiotap.c.orig     2005-07-12 17:36:14.000000000 +0200
++++ epan/dissectors/packet-radiotap.c
+@@ -397,6 +397,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
+           offset++;
+           break;
+       case IEEE80211_RADIOTAP_CHANNEL:
++          offset = (offset + 1) & ~1;
+           if (tree) {
+               freq = tvb_get_letohs(tvb, offset);
+               flags = tvb_get_letohs(tvb, offset+2);
+@@ -412,12 +413,14 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
+       case IEEE80211_RADIOTAP_LOCK_QUALITY:
+       case IEEE80211_RADIOTAP_TX_ATTENUATION:
+       case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
++          offset = (offset + 1) & ~1;
+ #if 0
+           tvb_get_letohs(tvb, offset);
+ #endif
+           offset+=2;
+           break;
+       case IEEE80211_RADIOTAP_TSFT:
++          offset = (offset + 7) & ~7;
+           if (tree) {
+               proto_tree_add_item(radiotap_tree, hf_radiotap_mactime,
+                                   tvb, offset, 8, FALSE);