rpms/kismet/devel kismet-2007-10-R1-printf.patch, NONE, 1.1 kismet.spec, 1.9, 1.10 lastver, 1.1, 1.2 sources, 1.3, 1.4 kismet-2005-08-R1-jobcontrol.patch, 1.1, NONE kismet-2007-01-R1-printf.patch, 1.2, NONE
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Mon Oct 8 07:31:56 UTC 2007
Author: ensc
Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3864
Modified Files:
kismet.spec lastver sources
Added Files:
kismet-2007-10-R1-printf.patch
Removed Files:
kismet-2005-08-R1-jobcontrol.patch
kismet-2007-01-R1-printf.patch
Log Message:
- updated to 2007-10-R1
- dropped/rediffed patches
- added BR on dbus-devel
kismet-2007-10-R1-printf.patch:
--- NEW FILE kismet-2007-10-R1-printf.patch ---
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<long long unsigned>(in_info->timestamp),
+ static_cast<long long unsigned>(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(vector<gps_netwo
// 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 @@ int DrawLegendComposite(vector<gps_netwo
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 @@ int main(int argc, char *argv[]) {
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]) {
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<long long int>(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<long long unsigned>(dnet->bss_timestamp));
kwin->text.push_back(output);
if (dnet->maxseenrate != 0) {
Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kismet.spec 4 Feb 2007 11:17:27 -0000 1.9
+++ kismet.spec 8 Oct 2007 07:31:24 -0000 1.10
@@ -1,6 +1,6 @@
## $Id$
-%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 @@
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 @@
# 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 @@
%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 @@
%changelog
+* Mon Oct 8 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 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 <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2007.01.R1b-7
- further x86_64 fixes for printf() format-string modifiers
Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver 1 Sep 2007 14:44:53 -0000 1.1
+++ lastver 8 Oct 2007 07:31:24 -0000 1.2
@@ -1 +1 @@
-2007-01-R1b
+2007-10-R1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 3 Feb 2007 23:10:54 -0000 1.3
+++ sources 8 Oct 2007 07:31:24 -0000 1.4
@@ -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
--- kismet-2005-08-R1-jobcontrol.patch DELETED ---
--- kismet-2007-01-R1-printf.patch DELETED ---
More information about the scm-commits
mailing list