Bump buildroot to 2019.02
This commit is contained in:
@@ -1,58 +0,0 @@
|
||||
Added option to disable stack-protector support auto-detection in gcc.
|
||||
|
||||
Downloaded from upstream commit:
|
||||
http://trac.aircrack-ng.org/changeset/2889/
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
Index: /trunk/INSTALLING
|
||||
===================================================================
|
||||
--- trunk/INSTALLING (revision 2888)
|
||||
+++ trunk/INSTALLING (revision 2889)
|
||||
@@ -83,4 +83,6 @@
|
||||
* macport: Set this flag to true to compile on OS X with macports.
|
||||
|
||||
+* stackprotector: Allows to enable/disable auto-detection of stack-protector support in gcc
|
||||
+
|
||||
Example:
|
||||
|
||||
Index: /trunk/common.mak
|
||||
===================================================================
|
||||
--- trunk/common.mak (revision 2888)
|
||||
+++ trunk/common.mak (revision 2889)
|
||||
@@ -64,4 +64,13 @@
|
||||
ifeq ($(PCRE), true)
|
||||
COMMON_CFLAGS += $(shell $(PKG_CONFIG) --cflags libpcre) -DHAVE_PCRE
|
||||
+endif
|
||||
+
|
||||
+STACK_PROTECTOR = true
|
||||
+ifeq ($(stackprotector), false)
|
||||
+ STACK_PROTECTOR = false
|
||||
+endif
|
||||
+
|
||||
+ifeq ($(STACKPROTECTOR), false)
|
||||
+ STACK_PROTECTOR = false
|
||||
endif
|
||||
|
||||
@@ -235,12 +244,14 @@
|
||||
endif
|
||||
|
||||
-ifeq ($(GCC_OVER49), 0)
|
||||
- ifeq ($(GCC_OVER41), 1)
|
||||
- COMMON_CFLAGS += -fstack-protector
|
||||
+ifeq ($(STACK_PROTECTOR), true)
|
||||
+ ifeq ($(GCC_OVER49), 0)
|
||||
+ ifeq ($(GCC_OVER41), 1)
|
||||
+ COMMON_CFLAGS += -fstack-protector
|
||||
+ endif
|
||||
endif
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(GCC_OVER49), 1)
|
||||
- COMMON_CFLAGS += -fstack-protector-strong
|
||||
+
|
||||
+ ifeq ($(GCC_OVER49), 1)
|
||||
+ COMMON_CFLAGS += -fstack-protector-strong
|
||||
+ endif
|
||||
endif
|
||||
|
||||
@@ -3,11 +3,8 @@ config BR2_PACKAGE_AIRCRACK_NG
|
||||
depends on BR2_USE_MMU # uses fork()
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
# libnl has issues when linking statically
|
||||
# they need fixing in libnl itself
|
||||
select BR2_PACKAGE_LIBNL if !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_ZLIB
|
||||
depends on !BR2_STATIC_LIBS # dlfcn.h
|
||||
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT
|
||||
help
|
||||
A set of tools for auditing wireless networks
|
||||
|
||||
@@ -16,6 +13,7 @@ config BR2_PACKAGE_AIRCRACK_NG
|
||||
|
||||
http://www.aircrack-ng.org/
|
||||
|
||||
comment "aircrack-ng needs a toolchain w/ threads, C++"
|
||||
comment "aircrack-ng needs a toolchain w/ dynamic library, threads, C++"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
|
||||
|| !BR2_INSTALL_LIBSTDCPP
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
# From http://www.aircrack-ng.org/downloads.html
|
||||
sha1 2b2fbe50fedb606b3bd96a34d49f07760e8e618a aircrack-ng-1.2-rc4.tar.gz
|
||||
md5 3bbc7d5035a98ec01e78774d05c3fcce aircrack-ng-1.2-rc4.tar.gz
|
||||
sha1 7b63c7ce01cb65a4775833c6cadf7ddd82bf46d5 aircrack-ng-1.5.2.tar.gz
|
||||
md5 2648c192d206e953c67dca64967d2982 aircrack-ng-1.5.2.tar.gz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 fc51fd3a97223f2fd47b057202d4a6b0daaedf23b5a1f5ff8723c192fc1e021d LICENSE
|
||||
|
||||
@@ -4,69 +4,73 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AIRCRACK_NG_VERSION = 1.2-rc4
|
||||
AIRCRACK_NG_VERSION = 1.5.2
|
||||
AIRCRACK_NG_SITE = http://download.aircrack-ng.org
|
||||
AIRCRACK_NG_LICENSE = GPL-2.0+
|
||||
AIRCRACK_NG_LICENSE_FILES = LICENSE
|
||||
AIRCRACK_NG_DEPENDENCIES = openssl zlib host-pkgconf
|
||||
AIRCRACK_NG_DEPENDENCIES = \
|
||||
$(if $(BR2_PACKAGE_CMOCKA),cmocka) \
|
||||
$(if $(BR2_PACKAGE_LIBNL),libnl) \
|
||||
$(if $(BR2_PACKAGE_OPENSSL),openssl) \
|
||||
$(if $(BR2_PACKAGE_PCRE),pcre) \
|
||||
$(if $(BR2_PACKAGE_ZLIB),zlib) \
|
||||
host-pkgconf
|
||||
AIRCRACK_NG_AUTORECONF = YES
|
||||
# Enable buddy-ng, easside-ng, tkiptun-ng, wesside-ng
|
||||
AIRCRACK_NG_MAKE_OPTS = unstable=true
|
||||
|
||||
# Account for libpthread in static
|
||||
AIRCRACK_NG_LDFLAGS = $(TARGET_LDFLAGS) \
|
||||
$(if $(BR2_STATIC_LIBS),-lpthread -lz)
|
||||
|
||||
# libnl support has issues when building static
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
AIRCRACK_NG_MAKE_OPTS += libnl=false
|
||||
else
|
||||
AIRCRACK_NG_MAKE_OPTS += libnl=true
|
||||
AIRCRACK_NG_DEPENDENCIES += libnl
|
||||
endif
|
||||
AIRCRACK_NG_CONF_OPTS = --with-experimental
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y)
|
||||
AIRCRACK_NG_MAKE_OPTS += STACK_PROTECTOR=true
|
||||
AIRCRACK_NG_CONF_OPTS += --with-opt
|
||||
else
|
||||
AIRCRACK_NG_MAKE_OPTS += STACK_PROTECTOR=false
|
||||
AIRCRACK_NG_CONF_OPTS += --without-opt
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DUMA),y)
|
||||
AIRCRACK_NG_DEPENDENCIES += duma
|
||||
AIRCRACK_NG_CONF_OPTS += --with-duma
|
||||
else
|
||||
AIRCRACK_NG_CONF_OPTS += --without-duma
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HWLOC),y)
|
||||
AIRCRACK_NG_DEPENDENCIES += hwloc
|
||||
AIRCRACK_NG_CONF_OPTS += --enable-hwloc
|
||||
else
|
||||
AIRCRACK_NG_CONF_OPTS += --disable-hwloc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JEMALLOC),y)
|
||||
AIRCRACK_NG_DEPENDENCIES += jemalloc
|
||||
AIRCRACK_NG_CONF_OPTS += --with-jemalloc
|
||||
else
|
||||
AIRCRACK_NG_CONF_OPTS += --without-jemalloc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
AIRCRACK_NG_DEPENDENCIES += libgcrypt
|
||||
AIRCRACK_NG_CONF_OPTS += \
|
||||
--with-gcrypt \
|
||||
--with-libgcrypt-prefix=$(STAGING_DIR)/usr
|
||||
else
|
||||
AIRCRACK_NG_CONF_OPTS += --without-gcrypt
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBPCAP),y)
|
||||
AIRCRACK_NG_DEPENDENCIES += libpcap
|
||||
AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=yes \
|
||||
$(if $(BR2_STATIC_LIBS),LIBPCAP="-lpcap `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`")
|
||||
else
|
||||
AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=no
|
||||
AIRCRACK_NG_CONF_OPTS += \
|
||||
--with-libpcap-include=$(STAGING_DIR)/usr/include \
|
||||
--with-libpcap-lib=$(STAGING_DIR)/usr/lib
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
AIRCRACK_NG_CONF_ENV += \
|
||||
LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PCRE),y)
|
||||
AIRCRACK_NG_DEPENDENCIES += pcre
|
||||
AIRCRACK_NG_MAKE_OPTS += pcre=true
|
||||
else
|
||||
AIRCRACK_NG_MAKE_OPTS += pcre=false
|
||||
endif
|
||||
|
||||
# Duplicate -lpthread, because it is also needed by sqlite
|
||||
ifeq ($(BR2_PACKAGE_SQLITE),y)
|
||||
AIRCRACK_NG_DEPENDENCIES += sqlite
|
||||
AIRCRACK_NG_MAKE_OPTS += sqlite=true LIBSQL="-lsqlite3 $(if $(BR2_STATIC_LIBS),-lpthread)"
|
||||
AIRCRACK_NG_CONF_OPTS += --with-sqlite3
|
||||
else
|
||||
AIRCRACK_NG_MAKE_OPTS += sqlite=false
|
||||
AIRCRACK_NG_CONF_OPTS += --without-sqlite3
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
|
||||
AIRCRACK_NG_MAKE_OPTS += NEWSSE=true
|
||||
else
|
||||
AIRCRACK_NG_MAKE_OPTS += NEWSSE=false
|
||||
endif
|
||||
|
||||
define AIRCRACK_NG_BUILD_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(AIRCRACK_NG_LDFLAGS)" \
|
||||
$(MAKE) -C $(@D) $(AIRCRACK_NG_MAKE_OPTS)
|
||||
endef
|
||||
|
||||
define AIRCRACK_NG_INSTALL_TARGET_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \
|
||||
prefix=/usr $(AIRCRACK_NG_MAKE_OPTS) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user