diff options
| -rw-r--r-- | package/aircrack-ng/Makefile | 6 | ||||
| -rw-r--r-- | package/aircrack-ng/patches/patch-common_mak | 15 | ||||
| -rw-r--r-- | package/aircrack-ng/patches/patch-src_osdep_linux_c | 8 |
3 files changed, 18 insertions, 11 deletions
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index fcf618885..40437b144 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= aircrack-ng PKG_VERSION:= 1.2 PKG_RELEASE:= 1 -PKG_HASH:= ba5b3eda44254efc5b7c9f776eb756f7cc323ad5d0813c101e92edb483d157e9 +PKG_HASH:= d93ac16aade5b4d37ab8cdf6ce4b855835096ccf83deb65ffdeff6d666eaff36 PKG_DESCR:= set of tools for auditing wireless networks PKG_SECTION:= net/wifi PKG_DEPENDS:= libpcap libnl libressl @@ -17,8 +17,8 @@ PKG_SITES:= http://download.aircrack-ng.org/ # do not build parallel, otherwise libosdep.a may not be ready when compiling airtun-ng PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-rc2.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-rc2 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-rc4.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-rc4 include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/aircrack-ng/patches/patch-common_mak b/package/aircrack-ng/patches/patch-common_mak index 57583f21d..9a8bf9c3c 100644 --- a/package/aircrack-ng/patches/patch-common_mak +++ b/package/aircrack-ng/patches/patch-common_mak @@ -1,10 +1,17 @@ ---- 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) +--- aircrack-ng-1.2-rc4.orig/common.mak 2015-12-31 20:42:10.000000000 +0100 ++++ aircrack-ng-1.2-rc4/common.mak 2017-06-06 21:16:36.954790985 +0200 +@@ -1,6 +1,6 @@ + PKG_CONFIG ?= pkg-config + +-NEWSSE = true ++NEWSSE = false + # Newer version of the core can be enabled via SIMDCORE + # but should be automatically flipped on thru autodetection + SIMDCORE = false +@@ -231,16 +231,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 diff --git a/package/aircrack-ng/patches/patch-src_osdep_linux_c b/package/aircrack-ng/patches/patch-src_osdep_linux_c index 8a0bc6913..1811eb90a 100644 --- a/package/aircrack-ng/patches/patch-src_osdep_linux_c +++ b/package/aircrack-ng/patches/patch-src_osdep_linux_c @@ -1,7 +1,7 @@ When search for wireless-tools, also check $PATH ---- 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 +--- aircrack-ng-1.2-rc4.orig/src/osdep/linux.c 2016-02-15 00:34:57.000000000 +0100 ++++ aircrack-ng-1.2-rc4/src/osdep/linux.c 2017-06-06 20:36:32.460367791 +0200 +@@ -263,6 +263,7 @@ static char * wiToolsPath(const char * t "/usr/local/bin", "/tmp" }; @@ -9,7 +9,7 @@ // 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 +@@ -273,6 +274,14 @@ static char * wiToolsPath(const char * t return path; } |