cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak -gpsmap for 64 bit archs. Found by steven@.

Browse Source
This commit is contained in:
kili 2007-06-28 12:43:32 +00:00
parent e894fa5536
commit 3809a7a2a1
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/kismet/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2007/05/02 08:15:16 bernd Exp $
# $OpenBSD: Makefile,v 1.17 2007/06/28 12:43:32 kili Exp $
# Much help came from Alexandre Anriot, Robert Nagy, Bernd Ahlers,
# and, last but not least, Pedro la Peu.
@ -11,7 +11,7 @@ NOT_FOR_ARCHS=m68k m88k vax
V= 2007-01-R1b
DISTNAME= kismet-${V}
PKGNAME-main= kismet-${V:S,-,,g}
PKGNAME-gpsmap= kismet-gpsmap-${V:S,-,,g}p0
PKGNAME-gpsmap= kismet-gpsmap-${V:S,-,,g}p1
CATEGORIES= net security
HOMEPAGE= http://www.kismetwireless.net/

24
net/kismet/patches/patch-gpsmap_cc
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-gpsmap_cc,v 1.3 2007/04/09 20:50:58 kili Exp $
$OpenBSD: patch-gpsmap_cc,v 1.4 2007/06/28 12:43:32 kili Exp $
# Use our ftp(1) instead of wget.
# Unbreak on 64bit archs (and just simplify).
--- gpsmap.cc.orig Sat Aug 19 15:01:58 2006
+++ gpsmap.cc Thu Dec 28 11:42:02 2006
@@ -99,8 +99,8 @@ const char url_template_em[] = "gpsmap-h
--- gpsmap.cc.orig Sat May 20 21:41:16 2006
+++ gpsmap.cc Mon Jun 25 13:36:14 2007
@@ -99,8 +99,8 @@ const char url_template_em[] = "gpsmap-helper-earthama
const char url_template_euex[] = "http://www.expedia.de/pub/agent.dll?qscr=mrdt&ID=3XNsF.&CenP=%f,%f&Lang=%s&Alti=%ld&Size=%d,%d&Offs=0.000000,0.000000&BCheck=1";
@ -15,7 +16,20 @@ $OpenBSD: patch-gpsmap_cc,v 1.3 2007/04/09 20:50:58 kili Exp $
// Image scales we try to autofetch
long int scales[] = { 1000, 2000, 5000, 10000, 20000, 30000, 50000, 60000,
@@ -4219,7 +4219,7 @@ int main(int argc, char *argv[]) {
@@ -2242,11 +2242,8 @@ void DrawNetPower(vector<gps_network *> in_nets, Image
pthread_attr_destroy(&attr);
// Now wait for the threads to complete and come back
- int thread_status;
for (int t = 0; t < numthreads; t++) {
- void *tmp;
- pthread_join(mapthread[t], &tmp);
- thread_status = reinterpret_cast<int>(tmp);
+ pthread_join(mapthread[t], NULL);
}
#else
// Run one instance of our "thread". thread number 0, it should just crunch it all
@@ -4219,7 +4216,7 @@ int main(int argc, char *argv[]) {
}
} else {
char geturl[1024];