From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../aircrack-ng/aircrack-ng_1.2.bb | 37 ---------------------- .../aircrack-ng/aircrack-ng_1.3.bb | 34 ++++++++++++++++++++ .../aircrack-ng/files/fixup_cflags.patch | 28 ---------------- 3 files changed, 34 insertions(+), 65 deletions(-) delete mode 100644 meta-security/recipes-security/aircrack-ng/aircrack-ng_1.2.bb create mode 100644 meta-security/recipes-security/aircrack-ng/aircrack-ng_1.3.bb delete mode 100644 meta-security/recipes-security/aircrack-ng/files/fixup_cflags.patch (limited to 'meta-security/recipes-security/aircrack-ng') diff --git a/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.2.bb b/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.2.bb deleted file mode 100644 index 4df072e0b..000000000 --- a/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.2.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Aircrack-ng is a set of tools for auditing wireless networks" -DESCRIPTION = "Aircrack-ng is an 802.11 WEP and WPA-PSK keys cracking program that can recover keys once enough data packets have been captured. It implements the standard FMS attack along with some optimizations like KoreK attacks, as well as the PTW attack, thus making the attack much faster compared to other WEP cracking tools." -SECTION = "security" -LICENSE = "GPL-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8" - -DEPENDS = "libnl openssl sqlite3 libpcre libpcap" -RC = "rc2" -SRC_URI = "http://download.aircrack-ng.org/${BP}-${RC}.tar.gz \ - file://fixup_cflags.patch" - -SRC_URI[md5sum] = "ebe9d537f06f4d6956213af09c4476da" -SRC_URI[sha256sum] = "ba5b3eda44254efc5b7c9f776eb756f7cc323ad5d0813c101e92edb483d157e9" - -inherit autotools-brokensep pkgconfig - -S = "${WORKDIR}/${BP}-rc2" - -PACKAGECONFIG ?= "" -CFLAGS += " -I${S}/src/include" - -OEMAKE_EXTRA = "sqlite=true experimental=true pcre=true \ - prefix=${prefix} \ - " - -do_compile () { - make ${OEMAKE_EXTRA} TOOL_PREFIX=${TARGET_SYS}- -} - -do_install () { - make DESTDIR=${D} ${OEMAKE_EXTRA} ext_scripts=true install -} - -FILES_${PN} += "/usr/local/" - -RDEPENDS_${PN} = "libpcap" diff --git a/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.3.bb b/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.3.bb new file mode 100644 index 000000000..d73922778 --- /dev/null +++ b/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.3.bb @@ -0,0 +1,34 @@ +SUMMARY = "Aircrack-ng is a set of tools for auditing wireless networks" +DESCRIPTION = "Aircrack-ng is an 802.11 WEP and WPA-PSK keys cracking program that can recover keys once enough data packets have been captured. It implements the standard FMS attack along with some optimizations like KoreK attacks, as well as the PTW attack, thus making the attack much faster compared to other WEP cracking tools." +SECTION = "security" +LICENSE = "GPL-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8" + +DEPENDS = "libnl openssl sqlite3 libpcre libpcap" + +SRC_URI = "http://download.aircrack-ng.org/${BP}.tar.gz" + +SRC_URI[md5sum] = "c7c5b076dee0c25ee580b0f56f455623" +SRC_URI[sha256sum] = "8ae08a7c28741f6ace2769267112053366550e7f746477081188ad38410383ca" + +inherit autotools-brokensep pkgconfig + +PACKAGECONFIG ?= "" +CFLAGS += " -I${S}/src/include" + +OEMAKE_EXTRA = "sqlite=true experimental=true pcre=true \ + prefix=${prefix} \ + " + +do_compile () { + make ${OEMAKE_EXTRA} TOOL_PREFIX=${TARGET_SYS}- +} + +do_install () { + make DESTDIR=${D} ${OEMAKE_EXTRA} ext_scripts=true install +} + +FILES_${PN} += "/usr/local/" + +RDEPENDS_${PN} = "libpcap" diff --git a/meta-security/recipes-security/aircrack-ng/files/fixup_cflags.patch b/meta-security/recipes-security/aircrack-ng/files/fixup_cflags.patch deleted file mode 100644 index e13dd24ba..000000000 --- a/meta-security/recipes-security/aircrack-ng/files/fixup_cflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream Status: Iinappropriate - -Issues do to build env. - -Signed-off-by: Armin Kuster - -Index: aircrack-ng-1.2-rc2/src/Makefile -=================================================================== ---- aircrack-ng-1.2-rc2.orig/src/Makefile -+++ aircrack-ng-1.2-rc2/src/Makefile -@@ -3,8 +3,6 @@ include $(AC_ROOT)/common.mak - - TEST_DIR = $(AC_ROOT)/test - --CFLAGS += -Iinclude -- - iCC = $(shell find /opt/intel/cc/*/bin/icc) - iCFLAGS = -w -mcpu=pentiumpro -march=pentiumpro $(COMMON_CFLAGS) - iOPTFLAGS = -O3 -ip -ipo -D_FILE_OFFSET_BITS=64 -@@ -102,7 +100,7 @@ endif - - - ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true) -- LIBSQL = -L/usr/local/lib -lsqlite3 -+ LIBSQL = -lsqlite3 - else - LIBSQL = - endif -- cgit v1.2.3