diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/aircrack-ng/Makefile | 21 | ||||
| -rw-r--r-- | package/aircrack-ng/patches/patch-common_mak | 27 | ||||
| -rw-r--r-- | package/aircrack-ng/patches/patch-src_osdep_linux_c | 26 |
3 files changed, 9 insertions, 65 deletions
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index 40437b144..154e19922 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -4,31 +4,28 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= aircrack-ng -PKG_VERSION:= 1.2 +PKG_VERSION:= 1.7 PKG_RELEASE:= 1 -PKG_HASH:= d93ac16aade5b4d37ab8cdf6ce4b855835096ccf83deb65ffdeff6d666eaff36 +PKG_HASH:= 05a704e3c8f7792a17315080a21214a4448fd2452c1b0dd5226a3a55f90b58c3 PKG_DESCR:= set of tools for auditing wireless networks PKG_SECTION:= net/wifi -PKG_DEPENDS:= libpcap libnl libressl -PKG_BUILDDEP:= libpcap libnl libressl -PKG_NEEDS:= threads +PKG_DEPENDS:= libpcap libnl libressl zlib +PKG_BUILDDEP:= libpcap libnl libressl zlib +PKG_NEEDS:= threads c++ PKG_URL:= http://www.aircrack-ng.org/ 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}-rc4.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-rc4 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AIRCRACK_NG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual - -XAKE_FLAGS+= CC="$(TARGET_CC)" \ - TOOL_PREFIX="$(TARGET_CROSS)" \ - OSNAME="Linux" prefix="/usr" +AUTOTOOL_STYLE:= autogen +XAKE_FLAGS+= V=1 +CONFIGURE_ARGS+= --with-libpcap-include='$(STAGING_TARGET_DIR)/usr/include' aircrack-ng-install: $(INSTALL_DIR) $(IDIR_AIRCRACK_NG)/usr/bin diff --git a/package/aircrack-ng/patches/patch-common_mak b/package/aircrack-ng/patches/patch-common_mak deleted file mode 100644 index 9a8bf9c3c..000000000 --- a/package/aircrack-ng/patches/patch-common_mak +++ /dev/null @@ -1,27 +0,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 -- 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 deleted file mode 100644 index 1811eb90a..000000000 --- a/package/aircrack-ng/patches/patch-src_osdep_linux_c +++ /dev/null @@ -1,26 +0,0 @@ - When search for wireless-tools, also check $PATH ---- 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" - }; -+ char *envpath, *token; - - // Also search in other known location just in case we haven't found it yet - nbelems = sizeof(paths) / sizeof(char *); -@@ -273,6 +274,14 @@ static char * wiToolsPath(const char * t - return path; - } - -+ /* search again in $PATH */ -+ for (envpath = getenv("PATH"); ; envpath = NULL) { -+ if ((token = strtok(envpath, ":")) == NULL) -+ break; -+ if ((path = searchInside(token, tool)) != NULL) -+ return path; -+ } -+ - return NULL; - } - |