mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
Zheng Ruoqin
49f937b8dc
When switch PATCHTOOL to patch, the key-replay-cve-multiple.patch can't
be apply with "--dry-run" as follows:
checking file src/ap/ieee802_11.c
checking file src/ap/wpa_auth.c
checking file src/ap/wpa_auth.h
checking file src/ap/wpa_auth_ft.c
checking file src/ap/wpa_auth_i.h
checking file src/common/wpa_common.h
checking file src/rsn_supp/wpa.c
checking file src/rsn_supp/wpa_i.h
checking file src/rsn_supp/wpa.c
Hunk #1 FAILED at 709.
Hunk #2 FAILED at 757.
Hunk #3 succeeded at 840 (offset -12 lines).
Hunk #4 FAILED at 868.
Hunk #5 FAILED at 900.
Hunk #6 FAILED at 924.
Hunk #7 succeeded at 1536 (offset -38 lines).
Hunk #8 FAILED at 2386.
Hunk #9 FAILED at 2920.
Hunk #10 succeeded at 2940 (offset -46 lines).
Hunk #11 FAILED at 2998.
8 out of 11 hunks FAILED
checking file src/rsn_supp/wpa_i.h
Hunk #1 FAILED at 32.
1 out of 1 hunk FAILED
checking file src/common/wpa_common.h
Hunk #1 succeeded at 215 with fuzz 1.
checking file src/rsn_supp/wpa.c
checking file src/rsn_supp/wpa_i.h
checking file src/ap/wpa_auth.c
Hunk #1 succeeded at 1898 (offset -3 lines).
Hunk #2 succeeded at 2470 (offset -3 lines).
checking file src/rsn_supp/tdls.c
checking file src/rsn_supp/wpa.c
Hunk #1 succeeded at 2378 (offset -62 lines).
checking file src/rsn_supp/wpa_ft.c
checking file src/rsn_supp/wpa_i.h
Hunk #1 succeeded at 123 (offset -5 lines).
So split the key-replay-cve-multiple.patch to 7 patches.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 543bb9c05a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
59 lines
2.0 KiB
BlitzBasic
59 lines
2.0 KiB
BlitzBasic
SUMMARY = "User space daemon for extended IEEE 802.11 management"
|
|
HOMEPAGE = "http://w1.fi/hostapd/"
|
|
SECTION = "kernel/userland"
|
|
LICENSE = "BSD-3-Clause"
|
|
LIC_FILES_CHKSUM = "file://hostapd/README;md5=8aa4e8c78b59b12016c4cb2d0a8db350"
|
|
|
|
DEPENDS = "libnl openssl"
|
|
|
|
SRC_URI = " \
|
|
http://w1.fi/releases/hostapd-${PV}.tar.gz \
|
|
file://defconfig \
|
|
file://init \
|
|
file://hostapd.service \
|
|
file://0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch \
|
|
file://0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch \
|
|
file://0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch \
|
|
file://0004-Prevent-installation-of-an-all-zero-TK.patch \
|
|
file://0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch \
|
|
file://0006-TDLS-Reject-TPK-TK-reconfiguration.patch \
|
|
file://0007-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch \
|
|
"
|
|
|
|
SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7"
|
|
SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d"
|
|
|
|
S = "${WORKDIR}/hostapd-${PV}"
|
|
B = "${WORKDIR}/hostapd-${PV}/hostapd"
|
|
|
|
inherit update-rc.d systemd pkgconfig distro_features_check
|
|
|
|
CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers"
|
|
|
|
INITSCRIPT_NAME = "hostapd"
|
|
|
|
SYSTEMD_SERVICE_${PN} = "hostapd.service"
|
|
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
|
|
|
|
do_configure_append() {
|
|
install -m 0644 ${WORKDIR}/defconfig ${B}/.config
|
|
}
|
|
|
|
do_compile() {
|
|
export CFLAGS="-MMD -O2 -Wall -g"
|
|
export EXTRA_CFLAGS="${CFLAGS}"
|
|
make V=1
|
|
}
|
|
|
|
do_install() {
|
|
install -d ${D}${sbindir} ${D}${sysconfdir}/init.d ${D}${systemd_unitdir}/system/
|
|
install -m 0644 ${B}/hostapd.conf ${D}${sysconfdir}
|
|
install -m 0755 ${B}/hostapd ${D}${sbindir}
|
|
install -m 0755 ${B}/hostapd_cli ${D}${sbindir}
|
|
install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
|
|
install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system/
|
|
sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service
|
|
}
|
|
|
|
CONFFILES_${PN} += "${sysconfdir}/hostapd.conf"
|