diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-09-15 12:59:19 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-09-17 21:08:19 -0700 |
commit | e535ac49fd35ca547520725a08d33626d683eb5c (patch) | |
tree | 51287a0fe630af6dfe448691ae96a257e4d81396 | |
parent | d255fa5bfb46e201dfd2a9ad3c1fcc7db39be35d (diff) | |
download | meta-security-e535ac49fd35ca547520725a08d33626d683eb5c.tar.gz |
aircrack: update to 1.3
remove unneeded patch.
minor cleanups
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/aircrack-ng/aircrack-ng_1.3.bb (renamed from recipes-security/aircrack-ng/aircrack-ng_1.2.bb) | 11 | ||||
-rw-r--r-- | recipes-security/aircrack-ng/files/fixup_cflags.patch | 28 |
2 files changed, 4 insertions, 35 deletions
diff --git a/recipes-security/aircrack-ng/aircrack-ng_1.2.bb b/recipes-security/aircrack-ng/aircrack-ng_1.3.bb index 4df072e..d739227 100644 --- a/recipes-security/aircrack-ng/aircrack-ng_1.2.bb +++ b/recipes-security/aircrack-ng/aircrack-ng_1.3.bb | |||
@@ -6,16 +6,13 @@ LICENSE = "GPL-2.0" | |||
6 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8" |
7 | 7 | ||
8 | DEPENDS = "libnl openssl sqlite3 libpcre libpcap" | 8 | DEPENDS = "libnl openssl sqlite3 libpcre libpcap" |
9 | RC = "rc2" | ||
10 | SRC_URI = "http://download.aircrack-ng.org/${BP}-${RC}.tar.gz \ | ||
11 | file://fixup_cflags.patch" | ||
12 | 9 | ||
13 | SRC_URI[md5sum] = "ebe9d537f06f4d6956213af09c4476da" | 10 | SRC_URI = "http://download.aircrack-ng.org/${BP}.tar.gz" |
14 | SRC_URI[sha256sum] = "ba5b3eda44254efc5b7c9f776eb756f7cc323ad5d0813c101e92edb483d157e9" | ||
15 | 11 | ||
16 | inherit autotools-brokensep pkgconfig | 12 | SRC_URI[md5sum] = "c7c5b076dee0c25ee580b0f56f455623" |
13 | SRC_URI[sha256sum] = "8ae08a7c28741f6ace2769267112053366550e7f746477081188ad38410383ca" | ||
17 | 14 | ||
18 | S = "${WORKDIR}/${BP}-rc2" | 15 | inherit autotools-brokensep pkgconfig |
19 | 16 | ||
20 | PACKAGECONFIG ?= "" | 17 | PACKAGECONFIG ?= "" |
21 | CFLAGS += " -I${S}/src/include" | 18 | CFLAGS += " -I${S}/src/include" |
diff --git a/recipes-security/aircrack-ng/files/fixup_cflags.patch b/recipes-security/aircrack-ng/files/fixup_cflags.patch deleted file mode 100644 index e13dd24..0000000 --- a/recipes-security/aircrack-ng/files/fixup_cflags.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Upstream Status: Iinappropriate | ||
2 | |||
3 | Issues do to build env. | ||
4 | |||
5 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
6 | |||
7 | Index: aircrack-ng-1.2-rc2/src/Makefile | ||
8 | =================================================================== | ||
9 | --- aircrack-ng-1.2-rc2.orig/src/Makefile | ||
10 | +++ aircrack-ng-1.2-rc2/src/Makefile | ||
11 | @@ -3,8 +3,6 @@ include $(AC_ROOT)/common.mak | ||
12 | |||
13 | TEST_DIR = $(AC_ROOT)/test | ||
14 | |||
15 | -CFLAGS += -Iinclude | ||
16 | - | ||
17 | iCC = $(shell find /opt/intel/cc/*/bin/icc) | ||
18 | iCFLAGS = -w -mcpu=pentiumpro -march=pentiumpro $(COMMON_CFLAGS) | ||
19 | iOPTFLAGS = -O3 -ip -ipo -D_FILE_OFFSET_BITS=64 | ||
20 | @@ -102,7 +100,7 @@ endif | ||
21 | |||
22 | |||
23 | ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true) | ||
24 | - LIBSQL = -L/usr/local/lib -lsqlite3 | ||
25 | + LIBSQL = -lsqlite3 | ||
26 | else | ||
27 | LIBSQL = | ||
28 | endif | ||