summaryrefslogtreecommitdiff
path: root/package/aircrack-ng/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2015-11-07 22:07:36 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2015-11-11 21:40:32 +0100
commit03e9c40f2a0c377e634aa8bd7c3962f7e06552af (patch)
tree5b1d8bec4c2c8bc8c000b9e23919f6b9d493d56e /package/aircrack-ng/patches
parent135c5ca4c2d66d0f4ddcb2246624ad61c975ef05 (diff)
aricrack-ng: update and fix compile, ssl always required
Diffstat (limited to 'package/aircrack-ng/patches')
-rw-r--r--package/aircrack-ng/patches/patch-common_mak20
-rw-r--r--package/aircrack-ng/patches/patch-src_osdep_linux_c16
-rw-r--r--package/aircrack-ng/patches/patch-src_version_h9
3 files changed, 28 insertions, 17 deletions
diff --git a/package/aircrack-ng/patches/patch-common_mak b/package/aircrack-ng/patches/patch-common_mak
new file mode 100644
index 000000000..57583f21d
--- /dev/null
+++ b/package/aircrack-ng/patches/patch-common_mak
@@ -0,0 +1,20 @@
+--- aircrack-ng-1.2-rc2.orig/common.mak 2015-04-02 07:24:02.000000000 +0200
++++ aircrack-ng-1.2-rc2/common.mak 2015-11-07 21:30:08.000000000 +0100
+@@ -144,17 +144,6 @@ ifeq ($(GCC_OVER49), 0)
+ GCC_OVER49 = $(shell expr 4.9 \<= `$(CC) -dumpversion | awk -F. '{ print $1$2 }'`)
+ endif
+
+-
+-ifeq ($(GCC_OVER49), 0)
+- ifeq ($(GCC_OVER41), 1)
+- COMMON_CFLAGS += -fstack-protector
+- endif
+-endif
+-
+-ifeq ($(GCC_OVER49), 1)
+- COMMON_CFLAGS += -fstack-protector-strong
+-endif
+-
+ ifeq ($(GCC_OVER45), 1)
+ CFLAGS += -Wno-unused-but-set-variable -Wno-array-bounds
+ endif
diff --git a/package/aircrack-ng/patches/patch-src_osdep_linux_c b/package/aircrack-ng/patches/patch-src_osdep_linux_c
index 84b816e13..8a0bc6913 100644
--- a/package/aircrack-ng/patches/patch-src_osdep_linux_c
+++ b/package/aircrack-ng/patches/patch-src_osdep_linux_c
@@ -1,17 +1,17 @@
When search for wireless-tools, also check $PATH
---- aircrack-ng-1.1.orig/src/osdep/linux.c 2009-07-25 03:48:40.000000000 +0200
-+++ aircrack-ng-1.1/src/osdep/linux.c 2012-01-12 16:22:05.772390762 +0100
-@@ -244,6 +244,7 @@ static char * wiToolsPath(const char * t
+--- aircrack-ng-1.2-rc2.orig/src/osdep/linux.c 2015-04-09 06:47:28.000000000 +0200
++++ aircrack-ng-1.2-rc2/src/osdep/linux.c 2015-11-07 21:28:22.000000000 +0100
+@@ -264,6 +264,7 @@ static char * wiToolsPath(const char * t
"/usr/local/bin",
"/tmp"
};
+ char *envpath, *token;
- nbelems = sizeof(paths) / sizeof(char *);
-
-@@ -254,6 +255,14 @@ static char * wiToolsPath(const char * t
- return path;
- }
+ // Also search in other known location just in case we haven't found it yet
+ nbelems = sizeof(paths) / sizeof(char *);
+@@ -274,6 +275,14 @@ static char * wiToolsPath(const char * t
+ return path;
+ }
+ /* search again in $PATH */
+ for (envpath = getenv("PATH"); ; envpath = NULL) {
diff --git a/package/aircrack-ng/patches/patch-src_version_h b/package/aircrack-ng/patches/patch-src_version_h
deleted file mode 100644
index 6cd968cc6..000000000
--- a/package/aircrack-ng/patches/patch-src_version_h
+++ /dev/null
@@ -1,9 +0,0 @@
---- aircrack-ng-1.0.orig/src/version.h 2009-09-01 11:30:48.000000000 +0200
-+++ aircrack-ng-1.0/src/version.h 2009-12-04 22:53:25.000000000 +0100
-@@ -2,5 +2,6 @@
- #define _MIN 0
- #define _SUB_MIN 0
- #define _BETA 0
-+#define _REVISION 1
- #define _RC 0
- #define WEBSITE "http://www.aircrack-ng.org"