1 |
--- aircrack-ng-1.1/scripts/airodump-ng-oui-update.destdir~ 2010-08-05 02:34:21.001168811 +0200 |
2 |
+++ aircrack-ng-1.1/scripts/airodump-ng-oui-update 2010-08-05 02:59:37.570447670 +0200 |
3 |
@@ -4,26 +4,28 @@ CURL=`which curl 2>/dev/null` |
4 |
WGET=`which wget 2>/dev/null` |
5 |
OUI_DOWNLOAD_URL="http://standards.ieee.org/regauth/oui/oui.txt" |
6 |
|
7 |
-OUI_PATH="/usr/local/etc/aircrack-ng" |
8 |
+OUI_PATH="${DESTDIR}/usr/share/aircrack-ng" |
9 |
AIRODUMP_NG_OUI="${OUI_PATH}/airodump-ng-oui.txt" |
10 |
OUI_IEEE="${OUI_PATH}/oui.txt" |
11 |
USERID="" |
12 |
|
13 |
|
14 |
-# Make sure the user is root |
15 |
-if [ x"`which id 2> /dev/null`" != "x" ] |
16 |
-then |
17 |
+if [ -z "${DESTDIR}" ]; then |
18 |
+ # Make sure the user is root |
19 |
+ if [ x"`which id 2> /dev/null`" != "x" ] |
20 |
+ then |
21 |
USERID="`id -u 2> /dev/null`" |
22 |
-fi |
23 |
+ fi |
24 |
|
25 |
-if [ x$USERID = "x" -a x$UID != "x" ] |
26 |
-then |
27 |
+ if [ x$USERID = "x" -a x$UID != "x" ] |
28 |
+ then |
29 |
USERID=$UID |
30 |
-fi |
31 |
+ fi |
32 |
|
33 |
-if [ x$USERID != "x" -a x$USERID != "x0" ] |
34 |
-then |
35 |
+ if [ x$USERID != "x" -a x$USERID != "x0" ] |
36 |
+ then |
37 |
echo Run it as root ; exit ; |
38 |
+ fi |
39 |
fi |
40 |
|
41 |
|
42 |
--- aircrack-ng-1.1/src/airodump-ng.h.destdir~ 2010-01-12 01:26:31.000000000 +0100 |
43 |
+++ aircrack-ng-1.1/src/airodump-ng.h 2010-08-05 02:46:50.767447489 +0200 |
44 |
@@ -111,7 +111,6 @@ static uchar ZERO[32] = |
45 |
"\x00\x00\x00\x00\x00\x00\x00\x00" |
46 |
"\x00\x00\x00\x00\x00\x00\x00\x00"; |
47 |
|
48 |
-#define OUI_PATH "/usr/local/etc/aircrack-ng/airodump-ng-oui.txt" |
49 |
#define MIN_RAM_SIZE_LOAD_OUI_RAM 32768 |
50 |
|
51 |
int read_pkts=0; |
52 |
--- aircrack-ng-1.1/src/Makefile.destdir~ 2010-08-05 03:15:02.505559976 +0200 |
53 |
+++ aircrack-ng-1.1/src/Makefile 2010-08-05 03:18:07.395670630 +0200 |
54 |
@@ -4,6 +4,7 @@ include $(AC_ROOT)/common.mak |
55 |
|
56 |
TEST_DIR = $(AC_ROOT)/test |
57 |
|
58 |
+CPPFLAGS += -DOUI_PATH='"$(datadir)/aircrack-ng/airodump-ng-oui.txt"' |
59 |
CFLAGS += -Iinclude |
60 |
|
61 |
iCC = $(shell find /opt/intel/cc/*/bin/icc) |