From 034ff377a9b16d9fcdbaa6d84a8e08cb5e0d18f0 Mon Sep 17 00:00:00 2001 From: ensc Date: Oct 08 2007 07:31:24 +0000 Subject: - updated to 2007-10-R1 - dropped/rediffed patches - added BR on dbus-devel --- diff --git a/kismet-2005-08-R1-jobcontrol.patch b/kismet-2005-08-R1-jobcontrol.patch deleted file mode 100644 index a379512..0000000 --- a/kismet-2005-08-R1-jobcontrol.patch +++ /dev/null @@ -1,29 +0,0 @@ -2006-03-18 Enrico Scholz - - - scripts/kismet.in: disable jobcontrol which simply does - not work: when starting the server with 'kismet_server - ... &', write operations will result into a SIGTTOU - causing malfunctions. So, it is better not to use job - control which seems to be required for specifying the - last job only. A plain 'wait' will suffice there. - ---- kismet-2005-08-R1/scripts/kismet.in.jobcontrol 2005-08-16 03:22:38.000000000 +0200 -+++ kismet-2005-08-R1/scripts/kismet.in 2006-03-18 11:52:24.000000000 +0100 -@@ -7,8 +7,6 @@ - - GREP_OPTIONS="" - --set -m -- - gui=`grep -e "^gui=" ${ETC}/kismet_ui.conf | cut -d= -f2 | tr -d " \t"` - piddir=`grep -e "^piddir=" ${ETC}/kismet.conf | cut -d= -f2 | tr -d " \t"` - -@@ -74,7 +72,7 @@ - if test "$?" != "5"; then - echo "Killing server..." - kill $servpid -- wait %- -+ wait - fi - - echo "Kismet exited." diff --git a/kismet-2007-01-R1-printf.patch b/kismet-2007-01-R1-printf.patch deleted file mode 100644 index 8b83da5..0000000 --- a/kismet-2007-01-R1-printf.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- kismet-2007-01-R1b/finitestate.cc.printf 2005-06-03 07:31:10.000000000 +0200 -+++ kismet-2007-01-R1b/finitestate.cc 2007-02-04 00:52:52.000000000 +0100 -@@ -224,8 +224,9 @@ - - snprintf(atext, STATUS_MAX, "Out-of-sequence BSS timestamp on %s " - "- got %llx, expected %llx - this could indicate AP spoofing", -- in_info->bssid_mac.Mac2String().c_str(), in_info->timestamp, -- elem->bss_timestamp); -+ in_info->bssid_mac.Mac2String().c_str(), -+ static_cast(in_info->timestamp), -+ static_cast(elem->bss_timestamp)); - atracker->RaiseAlert(alertid, in_info->bssid_mac, 0, 0, 0, - in_info->channel, atext); - ---- kismet-2007-01-R1b/gpsmap.cc.printf 2007-02-04 00:48:01.000000000 +0100 -+++ kismet-2007-01-R1b/gpsmap.cc 2007-02-04 00:58:27.000000000 +0100 -@@ -1025,7 +1025,7 @@ - - // Sanitize the data and build the map of points we don't look at - if (verbose) -- fprintf(stderr, "NOTICE: Sanitizing %d sample points...\n", -+ fprintf(stderr, "NOTICE: Sanitizing %zd sample points...\n", - file_points.size()); - SanitizeSamplePoints(file_points, &file_screen); - -@@ -2881,7 +2881,7 @@ - // contents - - // Test the standard text in col1 -- snprintf(text, 1024, "Visible networks: %d\n", drawn_net_map.size()); -+ snprintf(text, 1024, "Visible networks: %zd\n", drawn_net_map.size()); - text_colwidth = kismax(text_colwidth, IMStringWidth(text, leg_img, leg_di)); - - snprintf(text, 1024, "Map Created : %.24s", ctime((const time_t *) &curtime)); -@@ -2972,7 +2972,7 @@ - cur_rowpos += tx_height + 2; - */ - -- snprintf(text, 1024, "Visible networks: %d\n", drawn_net_map.size()); -+ snprintf(text, 1024, "Visible networks: %zd\n", drawn_net_map.size()); - tx_height = IMStringHeight(text, leg_img, leg_di); - - snprintf(prim, 1024, "text %d,%d \"%s\"", -@@ -4393,7 +4393,7 @@ - gpsnetvec.push_back(x->second); - } - -- fprintf(stderr, "Plotting %d networks...\n", gpsnetvec.size()); -+ fprintf(stderr, "Plotting %zd networks...\n", gpsnetvec.size()); - - for (unsigned int x = 0; x < draw_feature_order.length(); x++) { - switch (draw_feature_order[x]) { ---- kismet-2007-01-R1b/server_protocols.cc.printf 2007-01-15 16:14:48.000000000 +0100 -+++ kismet-2007-01-R1b/server_protocols.cc 2007-02-04 00:53:43.000000000 +0100 -@@ -515,7 +515,7 @@ - snprintf(tmpstr, 128, "%d", net->dupeiv_packets); - data->ndvec.push_back(tmpstr); - -- snprintf(tmpstr, 128, "%lld", net->bss_timestamp); -+ snprintf(tmpstr, 128, "%lld", static_cast(net->bss_timestamp)); - data->ndvec.push_back(tmpstr); - - } ---- kismet-2007-01-R1b/tcpclient.cc.printf 2006-04-26 05:52:04.000000000 +0200 -+++ kismet-2007-01-R1b/tcpclient.cc 2007-02-04 00:55:48.000000000 +0100 -@@ -401,6 +401,7 @@ - int tmpturbocell_mode; - int tmpfirst_time; // HACK: should be some 64-bit type - int tmplast_time; // HACK: should be some 64-bit type -+ long long int tmpbss_timestamp; - scanned = sscanf(in_data+hdrlen+18, "%d \001%255[^\001]\001 " - "\001%255[^\001]\001 " - "%d %d %d %d %d %d %d %d %d %hd.%hd.%hd.%hd " -@@ -423,12 +424,13 @@ - &aggregate_points, &datasize, - &turbocell_nid, &tmpturbocell_mode, - &turbocell_sat, &carrier_set, &maxseenrate, -- &encoding_set, &decrypted, &dupeiv_packets, &bss_timestamp); -+ &encoding_set, &decrypted, &dupeiv_packets, &tmpbss_timestamp); - type = static_cast(tmptype); - first_time = tmpfirst_time; - last_time = tmplast_time; - atype = static_cast(tmpatype); - turbocell_mode = static_cast(tmpturbocell_mode); -+ bss_timestamp = tmpbss_timestamp; - } - - if (scanned < 51) { ---- kismet-2007-01-R1b/panelfront_display.cc.printf 2007-01-06 07:51:15.000000000 +0100 -+++ kismet-2007-01-R1b/panelfront_display.cc 2007-02-04 00:57:13.000000000 +0100 -@@ -1660,7 +1660,8 @@ - - // Added by Sven-Ola, may need le64_to_cpu()? Also added the bss_tsf - // to the kismet tcp protocol used between client and server -- snprintf(output, print_width, "BSS Time: %llx", dnet->bss_timestamp); -+ snprintf(output, print_width, "BSS Time: %llx", -+ static_cast(dnet->bss_timestamp)); - kwin->text.push_back(output); - - if (dnet->maxseenrate != 0) { -@@ -2612,7 +2613,7 @@ - snprintf(output, print_width, "Start : %.24s", ctime((const time_t *) &start_time)); - details_text.push_back(output); - -- snprintf(output, print_width, "Servers : %d", context_list.size()); -+ snprintf(output, print_width, "Servers : %zd", context_list.size()); - details_text.push_back(output); - - snprintf(output, print_width, "Networks: %d", num_networks); diff --git a/kismet-2007-10-R1-printf.patch b/kismet-2007-10-R1-printf.patch new file mode 100644 index 0000000..cb814cb --- /dev/null +++ b/kismet-2007-10-R1-printf.patch @@ -0,0 +1,80 @@ +diff -up kismet-2007-10-R1/finitestate.cc.printf kismet-2007-10-R1/finitestate.cc +--- kismet-2007-10-R1/finitestate.cc.printf 2005-06-03 07:31:10.000000000 +0200 ++++ kismet-2007-10-R1/finitestate.cc 2007-10-08 09:16:00.000000000 +0200 +@@ -224,8 +224,9 @@ int BssTimestampAutomata::ProcessPacket( + + snprintf(atext, STATUS_MAX, "Out-of-sequence BSS timestamp on %s " + "- got %llx, expected %llx - this could indicate AP spoofing", +- in_info->bssid_mac.Mac2String().c_str(), in_info->timestamp, +- elem->bss_timestamp); ++ in_info->bssid_mac.Mac2String().c_str(), ++ static_cast(in_info->timestamp), ++ static_cast(elem->bss_timestamp)); + atracker->RaiseAlert(alertid, in_info->bssid_mac, 0, 0, 0, + in_info->channel, atext); + +diff -up kismet-2007-10-R1/gpsmap.cc.printf kismet-2007-10-R1/gpsmap.cc +--- kismet-2007-10-R1/gpsmap.cc.printf 2007-10-08 09:16:00.000000000 +0200 ++++ kismet-2007-10-R1/gpsmap.cc 2007-10-08 09:16:00.000000000 +0200 +@@ -1025,7 +1025,7 @@ int ProcessGPSFile(char *in_fname) { + + // Sanitize the data and build the map of points we don't look at + if (verbose) +- fprintf(stderr, "NOTICE: Sanitizing %d sample points...\n", ++ fprintf(stderr, "NOTICE: Sanitizing %zd sample points...\n", + file_points.size()); + SanitizeSamplePoints(file_points, &file_screen); + +@@ -2881,7 +2881,7 @@ int DrawLegendComposite(vectorsecond); + } + +- fprintf(stderr, "Plotting %d networks...\n", gpsnetvec.size()); ++ fprintf(stderr, "Plotting %zd networks...\n", gpsnetvec.size()); + + for (unsigned int x = 0; x < draw_feature_order.length(); x++) { + switch (draw_feature_order[x]) { +diff -up kismet-2007-10-R1/server_protocols.cc.printf kismet-2007-10-R1/server_protocols.cc +--- kismet-2007-10-R1/server_protocols.cc.printf 2007-03-27 14:44:20.000000000 +0200 ++++ kismet-2007-10-R1/server_protocols.cc 2007-10-08 09:16:00.000000000 +0200 +@@ -522,7 +522,7 @@ void Protocol_Network2Data(const wireles + snprintf(tmpstr, 128, "%d", net->dupeiv_packets); + data->ndvec.push_back(tmpstr); + +- snprintf(tmpstr, 128, "%lld", net->bss_timestamp); ++ snprintf(tmpstr, 128, "%lld", static_cast(net->bss_timestamp)); + data->ndvec.push_back(tmpstr); + + } +diff -up kismet-2007-10-R1/tcpclient.cc.printf kismet-2007-10-R1/tcpclient.cc +diff -up kismet-2007-10-R1/panelfront_display.cc.printf kismet-2007-10-R1/panelfront_display.cc +--- kismet-2007-10-R1/panelfront_display.cc.printf 2007-10-05 03:42:30.000000000 +0200 ++++ kismet-2007-10-R1/panelfront_display.cc 2007-10-08 09:16:00.000000000 +0200 +@@ -1711,7 +1711,8 @@ int PanelFront::DetailsPrinter(void *in_ + + // Added by Sven-Ola, may need le64_to_cpu()? Also added the bss_tsf + // to the kismet tcp protocol used between client and server +- snprintf(output, print_width, "BSS Time: %llx", dnet->bss_timestamp); ++ snprintf(output, print_width, "BSS Time: %llx", ++ static_cast(dnet->bss_timestamp)); + kwin->text.push_back(output); + + if (dnet->maxseenrate != 0) { diff --git a/kismet.spec b/kismet.spec index e56f26f..55f7de9 100644 --- a/kismet.spec +++ b/kismet.spec @@ -1,6 +1,6 @@ -## $Id: kismet.spec,v 1.9 2007/02/04 11:17:27 ensc Exp $ +## $Id: kismet.spec,v 1.10 2007/10/08 07:31:24 ensc Exp $ -%global _version 2007-01-R1b +%global _version 2007-10-R1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -20,7 +20,7 @@ Summary: WLAN detector, sniffer and IDS Name: kismet Version: %_rpmversion -Release: %release_func 7 +Release: %release_func 0 License: GPL Group: Applications/Internet URL: http://www.kismetwireless.net/ @@ -28,10 +28,9 @@ Source0: http://www.kismetwireless.net/code/%name-%_version.tar.gz Source1: http://www.kismetwireless.net/code/%name-%_version.tar.gz.asc Source10: tmpwatch.kismet Source11: sysconfig.kismet -Patch0: kismet-2005-08-R1-jobcontrol.patch Patch7: kismet-2006-04-R1-ssize.patch Patch8: kismet-2007-01-R1-setgroups.patch -Patch9: kismet-2007-01-R1-printf.patch +Patch9: kismet-2007-10-R1-printf.patch Patch10: kismet-2007-01-R1-cast.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: expat-devel ncurses-devel diffutils @@ -40,6 +39,7 @@ BuildRequires: ImageMagick-devel # should be required by ImageMagick-devel but are missing in FC4 BuildRequires: libtiff-devel libjpeg-devel freetype-devel BuildRequires: fedora-usermgmt-devel +BuildRequires: dbus-devel Provides: user(%username) Provides: group(%username) Requires(missingok): tmpwatch @@ -78,7 +78,6 @@ but introduce dependencies which are not needed for kismet to work. %prep %setup -q -n %name-%_version -%patch0 -p1 -b .jobcontrol %patch7 -p1 -b .ssize %patch8 -p1 -b .setgroups %patch9 -p1 -b .printf @@ -158,6 +157,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 8 2007 Enrico Scholz - 0.0.2007.10.R1-1 +- updated to 2007-10-R1 +- dropped/rediffed patches +- added BR on dbus-devel + * Sun Feb 4 2007 Enrico Scholz - 0.0.2007.01.R1b-7 - further x86_64 fixes for printf() format-string modifiers diff --git a/lastver b/lastver index b21f880..72f269e 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -2007-01-R1b +2007-10-R1 diff --git a/sources b/sources index e88b7fd..22d5de1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a1dcea71f0c3f881ef72f5bca2db7b39 kismet-2007-01-R1b.tar.gz -0d4c55a4c1c69979e968fe85d373cf4a kismet-2007-01-R1b.tar.gz.asc +2100c667e69db0cde35fa2d06c8516e2 kismet-2007-10-R1.tar.gz +d8752e46fa04fb634fd86f289bdb2e14 kismet-2007-10-R1.tar.gz.asc