summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/vars.mk2
-rw-r--r--package/aircrack-ng/Makefile21
-rw-r--r--package/aircrack-ng/patches/patch-common_mak27
-rw-r--r--package/aircrack-ng/patches/patch-src_osdep_linux_c26
-rw-r--r--target/config/Config.in.cpu3
-rw-r--r--toolchain/elf2flt/patches/v2021.08/0006-elf2flt-xtensa-fix-text-relocations.patch21
6 files changed, 13 insertions, 87 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index 047135c00..01a69ce68 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -198,7 +198,7 @@ ifneq ($(ADK_TARGET_USE_LD_BIND_NOW),)
TARGET_LDFLAGS+= -Wl,-z,now
endif
-ifeq ($(ADK_TARGET_ARCH_RISCV64),y)
+ifeq ($(ADK_TARGET_ARCH_RISCV64)$(ADK_TARGET_ARCH_RISCV32),y)
ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
TARGET_CFLAGS+= -fPIC
endif
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;
- }
-
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index eaf0eea02..2c89b9a50 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -1146,6 +1146,7 @@ config ADK_TARGET_CPU_RISCV32_RV32IMAC
bool "rv32imac"
select ADK_TARGET_SUPPORTS_THREADS
select ADK_TARGET_SUPPORTS_NPTL
+ select ADK_TARGET_SUPPORTS_LT
select ADK_TARGET_ABI_ILP32
depends on ADK_TARGET_ARCH_RISCV32
@@ -1153,6 +1154,7 @@ config ADK_TARGET_CPU_RISCV32_RV32IMAFC
bool "rv32imafc"
select ADK_TARGET_SUPPORTS_THREADS
select ADK_TARGET_SUPPORTS_NPTL
+ select ADK_TARGET_SUPPORTS_LT
select ADK_TARGET_ABI_ILP32F
depends on ADK_TARGET_ARCH_RISCV32
@@ -1160,6 +1162,7 @@ config ADK_TARGET_CPU_RISCV32_RV32IMADC
bool "rv32imadc"
select ADK_TARGET_SUPPORTS_THREADS
select ADK_TARGET_SUPPORTS_NPTL
+ select ADK_TARGET_SUPPORTS_LT
select ADK_TARGET_ABI_ILP32D
depends on ADK_TARGET_ARCH_RISCV32
diff --git a/toolchain/elf2flt/patches/v2021.08/0006-elf2flt-xtensa-fix-text-relocations.patch b/toolchain/elf2flt/patches/v2021.08/0006-elf2flt-xtensa-fix-text-relocations.patch
index be5b0c33e..fc8784a1b 100644
--- a/toolchain/elf2flt/patches/v2021.08/0006-elf2flt-xtensa-fix-text-relocations.patch
+++ b/toolchain/elf2flt/patches/v2021.08/0006-elf2flt-xtensa-fix-text-relocations.patch
@@ -23,24 +23,3 @@ diff -Nur elf2flt-v2021.08.orig/elf2flt.c elf2flt-v2021.08/elf2flt.c
default:
goto bad_resolved_reloc;
#elif defined(TARGET_riscv64)
-diff -Nur elf2flt-v2021.08.orig/elf2flt.c.orig elf2flt-v2021.08/elf2flt.c.orig
---- elf2flt-v2021.08.orig/elf2flt.c.orig 2023-01-09 11:08:22.417478947 +0100
-+++ elf2flt-v2021.08/elf2flt.c.orig 2023-01-09 11:08:28.637676113 +0100
-@@ -349,8 +349,15 @@
- static bool
- ro_reloc_data_section_should_be_in_text(asection *s)
- {
-- return (s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
-- (SEC_DATA | SEC_READONLY | SEC_RELOC);
-+ if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
-+ (SEC_DATA | SEC_READONLY | SEC_RELOC)) {
-+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa)
-+ if (!strcmp(".eh_frame", s->name))
-+ return false;
-+#endif
-+ return true;
-+ }
-+ return false;
- }
-
- static uint32_t *