Skip site navigation (1)Skip section navigation (2)
Date:      Fri,  7 Apr 2006 01:34:58 +0400 (MSD)
From:      Anton Karpov  <toxa@toxahost.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        eol1@yahoo.com
Subject:   ports/95443: Improvements to net-mgmt/kismet: add extra functionality to gpsmap utility
Message-ID:  <20060406213458.C8383FC0C4@mx.toxahost.ru>
Resent-Message-ID: <200604062140.k36LeCjd050502@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         95443
>Category:       ports
>Synopsis:       Improvements to net-mgmt/kismet: add extra functionality to gpsmap utility
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 06 21:40:11 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Anton Karpov
>Release:        7.0-CURRENT i386
>Organization:
>Environment:
FreeBSD laptoxa.toxa.lan 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Thu Mar 16 12:09:11 MSK 2006     root@laptoxa.toxa.lan:/usr/obj/usr/src/sys/LAPTOXA  i386

>Description:

This patch adds possibility to buld gpsmap utility with gpsmap-gmap patch from http://www.parknation.com/gmap/.
Although this is thirt-party patch, thus not supported by Kismet authors, it's pretty useful if you want to plot your wireless networks onto Google Maps.
This patch adds GMAP knob in OPTIONS, and, if selected, it downloads gpsmap-gmap archive, patch gpsmap source and install all necessary additional files.

P.S.: I send it to gnats instead of maintainer (although this mail is CCed to him) because my previous mails didn't reach him. Sure, I want him to answer here, if he is ok about this patch or not.

>How-To-Repeat:
>Fix:

please see proposed diff 

--- kismet.diff begins here ---
diff -ruN kismet/Makefile kismet.orig/Makefile
--- kismet/Makefile	Thu Apr  6 17:30:26 2006
+++ kismet.orig/Makefile	Wed Apr  5 12:34:38 2006
@@ -17,6 +17,7 @@
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--enable-syspcap
@@ -24,8 +25,7 @@
 OPTIONS=	CURSES "libcurses interface" on \
 		PANEL "libpanels interface" on \
 		SETUID "Install kismet with setuid" on \
-		GPSMAP "Build gpsmap utility" on \
-		GMAP "Build gpsmap with Google Maps patch *UNOFFICIAL*" off
+		GPSMAP "Build gpsmap utility" on
 
 .include <bsd.port.pre.mk>
 
@@ -53,15 +53,6 @@
 RUN_DEPENDS+=	wget:${PORTSDIR}/ftp/wget
 .endif
 
-.if defined(WITH_GMAP) && !defined(WITHOUT_GPSMAP)
-PATCH_SITES=	http://www.parknation.com/gmap/files/
-PATCHFILES=	gpsmap-gmap-0.1.tgz
-PLIST_SUB+=	GMAP=""
-SUB_FILES=	pkg-message
-.else
-PLIST_SUB+=	GMAP="@comment "
-.endif
-
 MAN1=		kismet.1 kismet_drone.1 gpsmap.1
 MAN5=		kismet.conf.5 kismet_drone.conf.5 kismet_ui.conf.5
 
@@ -70,26 +61,10 @@
 .endif
 
 post-extract:
-.if defined(WITH_GMAP) && !defined(WITHOUT_GPSMAP)
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} 
-	@${PATCH} -d ${WRKSRC}/gpsmap-gmap-0.1 --forward --quiet < ${PKGDIR}/files/gpsmap-gmap-0.1.diff.patch
-	@${PATCH} -d ${WRKSRC} --forward --quiet < ${WRKSRC}/gpsmap-gmap-0.1/gpsmap-gmap-0.1.diff
-.endif
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
 
 post-install:
-.if defined(WITH_GMAP) && !defined(WITHOUT_GPSMAP)
-	${MKDIR} ${PREFIX}/share/${PORTNAME}/gpsmap-gmap
-	${MKDIR} ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/mapfiles
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/index.html ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/index.html
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/README.txt ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/README.txt
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/mapfiles/shadow.png ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/mapfiles/shadow.png
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/mapfiles/wep.png ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/mapfiles/wep.png
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/mapfiles/open.png ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/mapfiles/open.png
-	${INSTALL_DATA} ${WRKSRC}/gpsmap-gmap-0.1/mapfiles/wpa.png ${PREFIX}/share/${PORTNAME}/gpsmap-gmap/mapfiles/wpa.png
-	@${CAT} ${PKGMESSAGE}
-.endif
 	${INSTALL_DATA} ${WRKSRC}/conf/kismet.conf ${PREFIX}/etc/kismet.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/kismet_drone.conf ${PREFIX}/etc/kismet_drone.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/kismet_ui.conf ${PREFIX}/etc/kismet_ui.conf.sample
diff -ruN kismet/distinfo kismet.orig/distinfo
--- kismet/distinfo	Wed Apr  5 16:51:37 2006
+++ kismet.orig/distinfo	Wed Apr  5 12:34:38 2006
@@ -1,6 +1,3 @@
 MD5 (kismet-2005-08-R1.tar.gz) = 17edb7688e04dd28028d5268a77d0ce7
 SHA256 (kismet-2005-08-R1.tar.gz) = 27e657212881186d356907a7c45b168e7431a2f83f3411d2a90366afccf03916
 SIZE (kismet-2005-08-R1.tar.gz) = 986388
-MD5 (gpsmap-gmap-0.1.tgz) = 7c62c841ccdc187812a0fe602d92d97c
-SHA256 (gpsmap-gmap-0.1.tgz) = 66c5e9c4fed70e88d092754746014bb02071b742c23390f1ec795fd14b32317b
-SIZE (gpsmap-gmap-0.1.tgz) = 13845
diff -ruN kismet/files/gpsmap-gmap-0.1.diff.patch kismet.orig/files/gpsmap-gmap-0.1.diff.patch
--- kismet/files/gpsmap-gmap-0.1.diff.patch	Thu Apr  6 17:52:27 2006
+++ kismet.orig/files/gpsmap-gmap-0.1.diff.patch	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@
---- gpsmap-gmap-0.1.diff.orig	Thu Apr  6 17:36:37 2006
-+++ gpsmap-gmap-0.1.diff	Thu Apr  6 17:36:44 2006
-@@ -430,7 +430,7 @@
-             "  -v, --verbose                  Verbose output while running\n"
-             "  -g, --config-file <file>       Alternate config file\n"
-             "  -o, --output <filename>        Image output file\n"
--+	   "  -j, --googlemaps		     Create a javascript file (used for gogle maps\n"
-++	   "  -j, --googlemaps	     	 Create a javascript file (used for google maps)\n"
-             "  -f, --filter <MAC list>        Comma-separated list of MACs to filter\n"
-             "  -i, --invert-filter            Invert filtering (ONLY draw filtered MACs)\n"
-             "  -F, --typefilter <Type list>   Comma-separated list of net types to filter\n"
diff -ruN kismet/files/pkg-message.in kismet.orig/files/pkg-message.in
--- kismet/files/pkg-message.in	Wed Apr  5 18:02:05 2006
+++ kismet.orig/files/pkg-message.in	Thu Jan  1 03:00:00 1970
@@ -1,10 +0,0 @@
-=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
-* NOTE:
-
-You have built gpsmap with Google Maps functionality. 
-This is third-party patch allows you to plot wireless networks
-using Google Maps engine. It's unsupported by Kismet authors,
-please read %%PREFIX%%/share/kismet/gpsmap-gmap/README.txt from
-step 10, or see http://www.parknation.com/gmap/
-
-=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=
diff -ruN kismet/pkg-plist kismet.orig/pkg-plist
--- kismet/pkg-plist	Wed Apr  5 18:02:53 2006
+++ kismet.orig/pkg-plist	Wed Apr  5 12:34:38 2006
@@ -16,13 +16,5 @@
 share/kismet/wav/junk_traffic.wav
 share/kismet/wav/new_network.wav
 share/kismet/wav/traffic.wav
-%%GMAP%%share/kismet/gpsmap-gmap/README.txt
-%%GMAP%%share/kismet/gpsmap-gmap/index.html
-%%GMAP%%share/kismet/gpsmap-gmap/mapfiles/open.png
-%%GMAP%%share/kismet/gpsmap-gmap/mapfiles/shadow.png
-%%GMAP%%share/kismet/gpsmap-gmap/mapfiles/wep.png
-%%GMAP%%share/kismet/gpsmap-gmap/mapfiles/wpa.png
-%%GMAP%%@dirrm share/kismet/gpsmap-gmap/mapfiles
-%%GMAP%%@dirrm share/kismet/gpsmap-gmap
 @dirrm share/kismet/wav
 @dirrm share/kismet
--- kismet.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060406213458.C8383FC0C4>