/[packages]/cauldron/aircrack-ng/current/SOURCES/aircrack-ng-1.1-airodump-oui-destdir.patch
ViewVC logotype

Diff of /cauldron/aircrack-ng/current/SOURCES/aircrack-ng-1.1-airodump-oui-destdir.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1183 by kharec, Sat Jan 8 20:42:42 2011 UTC revision 108292 by wally, Thu Jun 16 17:38:29 2011 UTC
# Line 1  Line 1 
1  --- aircrack-ng-1.1/scripts/airodump-ng-oui-update.destdir~     2010-08-05 02:34:21.001168811 +0200  --- ./scripts/airodump-ng-oui-update.oui_destdir~       2009-08-07 22:53:15.000000000 +0200
2  +++ aircrack-ng-1.1/scripts/airodump-ng-oui-update      2010-08-05 02:59:37.570447670 +0200  +++ ./scripts/airodump-ng-oui-update    2011-06-16 18:50:33.000000000 +0200
3  @@ -4,26 +4,28 @@ CURL=`which curl 2>/dev/null`  @@ -4,7 +4,7 @@ CURL=`which curl 2>/dev/null`
4   WGET=`which wget 2>/dev/null`   WGET=`which wget 2>/dev/null`
5   OUI_DOWNLOAD_URL="http://standards.ieee.org/regauth/oui/oui.txt"   OUI_DOWNLOAD_URL="http://standards.ieee.org/regauth/oui/oui.txt"
6    
7  -OUI_PATH="/usr/local/etc/aircrack-ng"  -OUI_PATH="/usr/local/etc/aircrack-ng"
8  +OUI_PATH="${DESTDIR}/usr/share/aircrack-ng"  +OUI_PATH="/usr/share/aircrack-ng"
9   AIRODUMP_NG_OUI="${OUI_PATH}/airodump-ng-oui.txt"   AIRODUMP_NG_OUI="${OUI_PATH}/airodump-ng-oui.txt"
10   OUI_IEEE="${OUI_PATH}/oui.txt"   OUI_IEEE="${OUI_PATH}/oui.txt"
11   USERID=""   USERID=""
12    --- ./src/Makefile.oui_destdir~ 2011-06-16 17:40:38.000000000 +0200
13    +++ ./src/Makefile      2011-06-16 17:40:38.000000000 +0200
14    @@ -4,6 +4,7 @@ include $(AC_ROOT)/common.mak
15    
16     TEST_DIR       = $(AC_ROOT)/test
17    
18  -# Make sure the user is root  +CPPFLAGS       += -DOUI_PATH='"$(datadir)/aircrack-ng/airodump-ng-oui.txt"'
19  -if [ x"`which id 2> /dev/null`" != "x" ]   CFLAGS         += -Iinclude
 -then  
 +if [ -z "${DESTDIR}" ]; then  
 +    # Make sure the user is root  
 +    if [ x"`which id 2> /dev/null`" != "x" ]  
 +    then  
         USERID="`id -u 2> /dev/null`"  
 -fi  
 +    fi  
   
 -if [ x$USERID = "x" -a x$UID != "x" ]  
 -then  
 +    if [ x$USERID = "x" -a x$UID != "x" ]  
 +    then  
         USERID=$UID  
 -fi  
 +    fi  
   
 -if [ x$USERID != "x" -a x$USERID != "x0" ]  
 -then  
 +    if [ x$USERID != "x" -a x$USERID != "x0" ]  
 +    then  
         echo Run it as root ; exit ;  
 +    fi  
  fi  
   
20    
21  --- aircrack-ng-1.1/src/airodump-ng.h.destdir~  2010-01-12 01:26:31.000000000 +0100   iCC             = $(shell find /opt/intel/cc/*/bin/icc)
22  +++ aircrack-ng-1.1/src/airodump-ng.h   2010-08-05 02:46:50.767447489 +0200  --- ./src/airodump-ng.h.oui_destdir~    2010-01-12 01:26:31.000000000 +0100
23    +++ ./src/airodump-ng.h 2011-06-16 17:40:38.000000000 +0200
24  @@ -111,7 +111,6 @@ static uchar ZERO[32] =  @@ -111,7 +111,6 @@ static uchar ZERO[32] =
25   "\x00\x00\x00\x00\x00\x00\x00\x00"   "\x00\x00\x00\x00\x00\x00\x00\x00"
26   "\x00\x00\x00\x00\x00\x00\x00\x00";   "\x00\x00\x00\x00\x00\x00\x00\x00";
# Line 49  Line 29 
29   #define MIN_RAM_SIZE_LOAD_OUI_RAM 32768   #define MIN_RAM_SIZE_LOAD_OUI_RAM 32768
30    
31   int read_pkts=0;   int read_pkts=0;
 --- aircrack-ng-1.1/src/Makefile.destdir~       2010-08-05 03:15:02.505559976 +0200  
 +++ aircrack-ng-1.1/src/Makefile        2010-08-05 03:18:07.395670630 +0200  
 @@ -4,6 +4,7 @@ include $(AC_ROOT)/common.mak  
   
  TEST_DIR       = $(AC_ROOT)/test  
   
 +CPPFLAGS       += -DOUI_PATH='"$(datadir)/aircrack-ng/airodump-ng-oui.txt"'  
  CFLAGS         += -Iinclude  
   
  iCC             = $(shell find /opt/intel/cc/*/bin/icc)  
Legend:
Removed from v.1183  
changed lines
  Added in v.108292
  ViewVC Help
Powered by ViewVC 1.1.30