ports/117803: Fix net-mgmt/kismet for FreeBSD 7.0

[Tom McLaughlin]

The following reply was made to PR ports/117803; it has been noted by GNATS.

From: Tom McLaughlin <tmclaugh at sdf.lonestar.org>
To: bug-followup at FreeBSD.org, onatan at gmail.com
Cc:  
Subject: Re: ports/117803: Fix net-mgmt/kismet for FreeBSD 7.0
Date: Mon, 05 Nov 2007 13:29:31 -0500

 --=-95bYsYfjVyLe8Vu5X6rK
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 
 Hi, here are the compile warnings as they stands right now on FreeBSD
 7.x.  (Submitter, please send error/warning output next time so the
 maintainer can see exactly where the problem is and so they aren't left
 with blindly patching the port.)
 
 pcapsource.cc:840:1: warning: "IEEE80211_IS_CHAN_FHSS" redefined
 In file included from /usr/include/net80211/ieee80211_ioctl.h:34,
                  from pcapsource.cc:79:
 /usr/include/net80211/_ieee80211.h:175:1: warning: this is the location of the previous definition
 pcapsource.cc:842:1: warning: "IEEE80211_IS_CHAN_A" redefined
 /usr/include/net80211/_ieee80211.h:177:1: warning: this is the location of the previous definition
 pcapsource.cc:844:1: warning: "IEEE80211_IS_CHAN_B" redefined
 /usr/include/net80211/_ieee80211.h:179:1: warning: this is the location of the previous definition
 pcapsource.cc:846:1: warning: "IEEE80211_IS_CHAN_PUREG" redefined
 /usr/include/net80211/_ieee80211.h:181:1: warning: this is the location of the previous definition
 pcapsource.cc:848:1: warning: "IEEE80211_IS_CHAN_G" redefined
 /usr/include/net80211/_ieee80211.h:183:1: warning: this is the location of the previous definition
 
 Attached is a smaller patch which only renames the conflicting macros.
 Can you also point out where we can see the issue with bpf?  I don't
 have a wifi nic in my -CURRENT box to run test kismet.
 
 -- 
 | tmclaugh at sdf.lonestar.org                 tmclaugh at FreeBSD.org |
 | FreeBSD                                       http://www.FreeBSD.org |
 
 --=-95bYsYfjVyLe8Vu5X6rK
 Content-Disposition: attachment; filename=kismet-freebsd7.diff
 Content-Type: text/x-patch; name=kismet-freebsd7.diff; charset=utf-8
 Content-Transfer-Encoding: 7bit
 
 ? .build.out.swp
 ? kismet-freebsd7.diff
 Index: Makefile
 ===================================================================
 RCS file: /ncvs/ports/net-mgmt/kismet/Makefile,v
 retrieving revision 1.15
 diff -u -r1.15 Makefile
 --- Makefile	23 Oct 2007 23:54:09 -0000	1.15
 +++ Makefile	5 Nov 2007 18:27:01 -0000
 @@ -7,6 +7,7 @@
  
  PORTNAME=	kismet
  PORTVERSION=	200710.r1
 +PORTREVISION=	1
  CATEGORIES=	net-mgmt
  MASTER_SITES=	http://www.kismetwireless.net/code/
  DISTNAME=	kismet-2007-10-R1
 Index: files/patch-pcapsource.cc
 ===================================================================
 RCS file: files/patch-pcapsource.cc
 diff -N files/patch-pcapsource.cc
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-pcapsource.cc	5 Nov 2007 18:27:01 -0000
 @@ -0,0 +1,44 @@
 +--- pcapsource.cc.orig	2007-10-06 17:09:03.000000000 -0400
 ++++ pcapsource.cc	2007-11-05 13:10:18.825873000 -0500
 +@@ -837,15 +837,15 @@
 + #define	IEEE80211_CHAN_T \
 + 	(IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
 + 
 +-#define	IEEE80211_IS_CHAN_FHSS(_flags) \
 ++#define	KISMET_IEEE80211_IS_CHAN_FHSS(_flags) \
 + 	((_flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS)
 +-#define	IEEE80211_IS_CHAN_A(_flags) \
 ++#define	KISMET_IEEE80211_IS_CHAN_A(_flags) \
 + 	((_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A)
 +-#define	IEEE80211_IS_CHAN_B(_flags) \
 ++#define	KISMET_IEEE80211_IS_CHAN_B(_flags) \
 + 	((_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B)
 +-#define	IEEE80211_IS_CHAN_PUREG(_flags) \
 ++#define	KISMET_IEEE80211_IS_CHAN_PUREG(_flags) \
 + 	((_flags & IEEE80211_CHAN_PUREG) == IEEE80211_CHAN_PUREG)
 +-#define	IEEE80211_IS_CHAN_G(_flags) \
 ++#define	KISMET_IEEE80211_IS_CHAN_G(_flags) \
 + 	((_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G)
 + #define	IEEE80211_IS_CHAN_T(_flags) \
 + 	((_flags & IEEE80211_CHAN_T) == IEEE80211_CHAN_T)
 +@@ -972,15 +972,15 @@
 +             switch (bit) {
 +                 case IEEE80211_RADIOTAP_CHANNEL:
 +                     packet->channel = ieee80211_mhz2ieee(u.u16, u2.u16);
 +-                    if (IEEE80211_IS_CHAN_FHSS(u2.u16))
 ++                    if (KISMET_IEEE80211_IS_CHAN_FHSS(u2.u16))
 +                         packet->carrier = carrier_80211dsss;
 +-                    else if (IEEE80211_IS_CHAN_A(u2.u16))
 ++                    else if (KISMET_IEEE80211_IS_CHAN_A(u2.u16))
 +                         packet->carrier = carrier_80211a;
 +-                    else if (IEEE80211_IS_CHAN_B(u2.u16))
 ++                    else if (KISMET_IEEE80211_IS_CHAN_B(u2.u16))
 +                         packet->carrier = carrier_80211b;
 +-                    else if (IEEE80211_IS_CHAN_PUREG(u2.u16))
 ++                    else if (KISMET_IEEE80211_IS_CHAN_PUREG(u2.u16))
 +                         packet->carrier = carrier_80211g;
 +-                    else if (IEEE80211_IS_CHAN_G(u2.u16))
 ++                    else if (KISMET_IEEE80211_IS_CHAN_G(u2.u16))
 +                         packet->carrier = carrier_80211g;
 +                     else if (IEEE80211_IS_CHAN_T(u2.u16))
 +                         packet->carrier = carrier_80211a;/*XXX*/
 
 --=-95bYsYfjVyLe8Vu5X6rK--