The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...
[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / kismet / 0002-nobsd.patch
1 diff -Nura kismet-2009-06-R1/ifcontrol.cc kismet-2009-06-R1-nobsd/ifcontrol.cc
2 --- kismet-2009-06-R1/ifcontrol.cc      2009-04-08 16:57:44.000000000 -0300
3 +++ kismet-2009-06-R1-nobsd/ifcontrol.cc        2009-09-01 12:54:44.000000000 -0300
4 @@ -148,7 +148,7 @@
5         devlinklen = readlink(devlink.c_str(), devlinktarget, 511);
6         if (devlinklen > 0) {
7                 devlinktarget[devlinklen] = '\0';
8 -               rind = rindex(devlinktarget, '/');
9 +               rind = strrchr(devlinktarget, '/');
10                 // If we found it and not at the end of the line
11                 if (rind != NULL && (rind - devlinktarget) + 1 < devlinklen)
12                         return string(rind + 1);
13 diff -Nura kismet-2009-06-R1/iwcontrol.cc kismet-2009-06-R1-nobsd/iwcontrol.cc
14 --- kismet-2009-06-R1/iwcontrol.cc      2009-04-20 00:22:55.000000000 -0300
15 +++ kismet-2009-06-R1-nobsd/iwcontrol.cc        2009-09-01 12:54:44.000000000 -0300
16 @@ -697,7 +697,7 @@
17                 return -1;
18         }
19  
20 -       bzero(buffer, sizeof(buffer));
21 +       memset(buffer, 0, sizeof(buffer));
22  
23         memset(&wrq, 0, sizeof(struct iwreq));
24  
25 @@ -732,7 +732,7 @@
26                 memcpy((char *) &range, buffer, sizeof(iw_range));
27         } else {
28                 /* Zero unknown fields */
29 -               bzero((char *) &range, sizeof(struct iw_range));
30 +               memset((char *) &range, 0, sizeof(struct iw_range));
31  
32                 /* Initial part unmoved */
33                 memcpy((char *) &range, buffer, iwr15_off(num_channels));
34 diff -Nura kismet-2009-06-R1/madwifing_control.cc kismet-2009-06-R1-nobsd/madwifing_control.cc
35 --- kismet-2009-06-R1/madwifing_control.cc      2009-03-22 23:19:19.000000000 -0300
36 +++ kismet-2009-06-R1-nobsd/madwifing_control.cc        2009-09-01 12:54:42.000000000 -0300
37 @@ -34,7 +34,6 @@
38  #include <stdint.h>
39  #include <ctype.h>
40  #include <getopt.h>
41 -#include <err.h>
42  #include <dirent.h>
43  #include <fcntl.h>
44  #include <errno.h>