diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/aircrack-ng/Makefile | 24 | ||||
| -rw-r--r-- | package/aircrack-ng/patches/patch-common_mak | 20 | ||||
| -rw-r--r-- | package/aircrack-ng/patches/patch-src_osdep_linux_c | 16 | ||||
| -rw-r--r-- | package/aircrack-ng/patches/patch-src_version_h | 9 |
4 files changed, 40 insertions, 29 deletions
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index 119f75e86..0e7780645 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -4,28 +4,28 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= aircrack-ng -PKG_VERSION:= 1.1 -PKG_RELEASE:= 2 -PKG_HASH:= b136b549b7d2a2751c21793100075ea43b28de9af4c1969508bb95bcc92224ad +PKG_VERSION:= 1.2 +PKG_RELEASE:= 1 +PKG_HASH:= ba5b3eda44254efc5b7c9f776eb756f7cc323ad5d0813c101e92edb483d157e9 PKG_DESCR:= set of tools for auditing wireless networks PKG_SECTION:= net/wifi -PKG_DEPENDS:= libpthread libpcap -PKG_BUILDDEP:= libpcap +PKG_DEPENDS:= libpthread libpcap libnl +PKG_BUILDDEP:= libpcap libnl 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 -PKG_CHOICES_AIRCRACK_NG:= WITHOUT_SSL WITH_LIBRESSL WITH_OPENSSL -PKGCD_WITHOUT_SSL:= use no ssl +PKG_CHOICES_AIRCRACK_NG:= WITH_LIBRESSL WITH_OPENSSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCB_WITH_LIBRESSL:= libressl -PKGCS_WITH_LIBRESSL:= libressl ca-certificates +PKGCS_WITH_LIBRESSL:= libressl PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCB_WITH_OPENSSL:= openssl -PKGCS_WITH_OPENSSL:= libopenssl ca-certificates +PKGCS_WITH_OPENSSL:= libopenssl -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-rc2.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-rc2 include $(ADK_TOPDIR)/mk/package.mk @@ -33,8 +33,8 @@ $(eval $(call PKG_template,AIRCRACK_NG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE} CONFIG_STYLE:= manual -XAKE_FLAGS+= CC="$(TARGET_CC)" TOOL_PREFIX="$(TARGET_CROSS)" \ - CFLAGS="$(TARGET_CFLAGS) -Wall" \ +XAKE_FLAGS+= CC="$(TARGET_CC)" \ + TOOL_PREFIX="$(TARGET_CROSS)" \ OSNAME="Linux" prefix="/usr" aircrack-ng-install: 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" |