File aircrack-ng-remove_usr_local.patch of Package aircrack-ng

File aircrack-ng-remove_usr_local.patch of Package aircrack-ng (Revision c432102b9a441ffa229ecdf94ba4c2ec)

Currently displaying revision c432102b9a441ffa229ecdf94ba4c2ec , Show latest

--- scripts/airodump-ng-oui-update.orig	2010-07-20 09:08:34.000000000 +0200
+++ scripts/airodump-ng-oui-update	2010-07-20 09:08:44.000000000 +0200
@@ -4,7 +4,7 @@
 WGET=`which wget 2>/dev/null`
 OUI_DOWNLOAD_URL="http://standards.ieee.org/regauth/oui/oui.txt"
 
-OUI_PATH="/usr/local/etc/aircrack-ng"
+OUI_PATH="/etc/aircrack-ng"
 AIRODUMP_NG_OUI="${OUI_PATH}/airodump-ng-oui.txt"
 OUI_IEEE="${OUI_PATH}/oui.txt"
 USERID=""
--- scripts/airdriver-ng.orig	2010-07-20 09:07:08.000000000 +0200
+++ scripts/airdriver-ng	2010-07-20 09:07:57.000000000 +0200
@@ -113,7 +113,7 @@
 
 #firmware preparation
 #possible paths, ordered by importance
-FIRMPATHS="/lib/firmware /usr/lib/firmware /lib/hotplug/firmware /usr/local/lib/firmware /usr/firmware"
+FIRMPATHS="/lib/firmware /usr/local/lib/firmware"
 
 for i in $FIRMPATHS
 do
--- scripts/airgraph-ng/airgraph-ng.py.orig	2010-07-20 09:08:52.000000000 +0200
+++ scripts/airgraph-ng/airgraph-ng.py	2010-07-20 09:09:54.000000000 +0200
@@ -42,10 +42,7 @@
 		print "Psyco optimizer not installed, You may want to download and install it!"
 
 try:
-	sys.path.append("./lib/")
-	# The previous line works fine and find the lib if psyco isn't installed
-	# When psyco is installed, it does not work anymore and a full path has to be used
-	sys.path.append("/usr/local/bin/lib/")
+	sys.path.append("/usr/lib/aircrack-ng/")
 	import lib_Airgraphviz
 	dot_libs = lib_Airgraphviz #i dont think i need this but ill look at it later
 except ImportError:
--- scripts/airdrop-ng/install.py.orig	2010-07-20 09:15:51.000000000 +0200
+++ scripts/airdrop-ng/install.py	2010-07-20 09:16:46.000000000 +0200
@@ -22,7 +22,7 @@
 		self.deps = ["make", "svn", "tar", "gcc"]
 
 		for depends in self.deps:
-			if (os.path.isfile("/usr/bin/" + depends) or os.path.isfile("/usr/sbin/" + depends) or os.path.isfile("/usr/local/bin/" + depends) or os.path.isfile("/usr/local/sbin/" + depends) or os.path.isfile ("/bin/" + depends) ) == True:
+			if (os.path.isfile("/usr/bin/" + depends) or os.path.isfile("/usr/sbin/" + depends) or os.path.isfile ("/bin/" + depends) ) == True:
 				pass
 			else:
 				self.a = 1
--- src/osdep/linux.c.orig	2010-07-20 09:17:24.000000000 +0200
+++ src/osdep/linux.c	2010-07-20 09:17:39.000000000 +0200
@@ -238,11 +238,8 @@
         static const char * paths [] = {
                 "/sbin",
                 "/usr/sbin",
-                "/usr/local/sbin",
                 "/bin",
-                "/usr/bin",
-                "/usr/local/bin",
-                "/tmp"
+                "/usr/bin"
         };
 
         nbelems = sizeof(paths) / sizeof(char *);
--- src/Makefile.orig	2010-07-20 09:17:46.000000000 +0200
+++ src/Makefile	2010-07-20 09:18:03.000000000 +0200
@@ -99,16 +99,16 @@
 LIBSSL		= -lssl -lcrypto $(LDFLAGS)
 LIBSQL		=
 ifeq ($(SQLITE), true)
-	LIBSQL		= -L/usr/local/lib -lsqlite3
+	LIBSQL		= -lsqlite3
 else
 	ifeq ($(sqlite), true)
-		LIBSQL          = -L/usr/local/lib -lsqlite3
+		LIBSQL          = -lsqlite3
 	else
 		ifeq ($(SQLITE), TRUE)
-			LIBSQL          = -L/usr/local/lib -lsqlite3
+			LIBSQL          = -lsqlite3
 		else
 			ifeq ($(sqlite), TRUE)
-				LIBSQL          = -L/usr/local/lib -lsqlite3
+				LIBSQL          = -lsqlite3
 			endif
 		endif
 	endif
--- src/airodump-ng.h.orig	2010-07-20 09:18:10.000000000 +0200
+++ src/airodump-ng.h	2010-07-20 09:18:19.000000000 +0200
@@ -111,7 +111,7 @@
 "\x00\x00\x00\x00\x00\x00\x00\x00"
 "\x00\x00\x00\x00\x00\x00\x00\x00";
 
-#define OUI_PATH "/usr/local/etc/aircrack-ng/airodump-ng-oui.txt"
+#define OUI_PATH "/etc/aircrack-ng/airodump-ng-oui.txt"
 #define MIN_RAM_SIZE_LOAD_OUI_RAM 32768
 
 int read_pkts=0;
--- common.mak.orig	2010-07-20 09:16:55.000000000 +0200
+++ common.mak	2010-07-20 09:17:18.000000000 +0200
@@ -31,16 +31,16 @@
 endif
 
 ifeq ($(SQLITE), true)
-    COMMON_CFLAGS	+= -I/usr/local/include -DHAVE_SQLITE
+    COMMON_CFLAGS	+= -DHAVE_SQLITE
 else
     ifeq ($(sqlite), true)
-        COMMON_CFLAGS	+= -I/usr/local/include -DHAVE_SQLITE
+        COMMON_CFLAGS	+= -DHAVE_SQLITE
     else
         ifeq ($(SQLITE), TRUE)
-            COMMON_CFLAGS	+= -I/usr/local/include -DHAVE_SQLITE
+            COMMON_CFLAGS	+= -DHAVE_SQLITE
         else
             ifeq ($(sqlite), TRUE)
-                COMMON_CFLAGS	+= -I/usr/local/include -DHAVE_SQLITE
+                COMMON_CFLAGS	+= -DHAVE_SQLITE
             endif
         endif
     endif
@@ -77,4 +77,4 @@
 datadir         = $(prefix)/share
 docdir          = $(datadir)/doc/aircrack-ng
 libdir		= $(prefix)/lib
-etcdir		= $(prefix)/etc/aircrack-ng 
\ No newline at end of file
+etcdir		= $(prefix)/etc/aircrack-ng