From patchwork Sun Jun 9 20:10:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 2290 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 387738887DE for ; Sun, 9 Jun 2019 11:10:16 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 45MBpb2bRnz51tcd; Sun, 9 Jun 2019 11:10:15 +0100 (BST) Received: from Devel.localdomain (p57B19E92.dip0.t-ipconnect.de [87.177.158.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 45MBpX3MPPz5P2DJ for ; Sun, 9 Jun 2019 11:10:12 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1560075012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=9JnIEueJwtFSIi+PxmDsmweJHBxfvYm0K0cfVFARX60=; b=TRbhAVyLp+LGF1DJwIjPm6Sdm/TnMAm6Pb7OUO6eck6/X7sYjywj3DmgIW8+IToIE4dPHH 686UiW0FmpAwVjLPJswhcl4AZGI3c0feenm0JD8IQjA9ZicaOXGXKBGsxf9+qBpF8kzzTs mkxzOKvox7eu4MZ9N1R09ZR7IeP9D+gzEdIRA0wloCrcAyRzhI45lE1vNDBSc3PdWrvRoa 1mBp5EkAEjYBMD5FdlrUOYF/2Btn5UqdFVzKECs+jVCqoEwJl6eEambtrHEZhtqdk59Btn nMYvwdx+s4pr2SpWJmzqb+N6r+9iCq693mxgqimeexFC+oHtOpr4DDorndHpnw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1560075012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=9JnIEueJwtFSIi+PxmDsmweJHBxfvYm0K0cfVFARX60=; b=WLW4oYpAXFydQ453GuKFk2mq0gZ4QrKZPugoH1+LTljFoXq5NeaRKsDHB+vXId43gYPFHG Qa/kTiDKu4CGbGAQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] hostapd: Update to 2.8 Date: Sun, 9 Jun 2019 12:10:07 +0200 Message-Id: <20190609101007.32022-1-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.18.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=mfischer smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" For details see: https://w1.fi/cgit/hostap/plain/hostapd/ChangeLog Signed-off-by: Matthias Fischer --- lfs/hostapd | 10 ++-- ...hostapd-2.8-increase_EAPOL-timeouts.patch} | 8 +-- ...-noscan.patch => hostapd-2.8-noscan.patch} | 50 +++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) rename src/patches/hostapd/{hostapd-2.7-increase_EAPOL-timeouts.patch => hostapd-2.8-increase_EAPOL-timeouts.patch} (77%) rename src/patches/hostapd/{hostapd-2.7-noscan.patch => hostapd-2.8-noscan.patch} (64%) diff --git a/lfs/hostapd b/lfs/hostapd index ce399df75..9dabc3b5b 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -24,7 +24,7 @@ include Config -VER = 2.7 +VER = 2.8 THISAPP = hostapd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 47 +PAK_VER = 48 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8d3799f3a3c247cff47d41503698721b +$(DL_FILE)_MD5 = ed2c254e5f400838cb9d8e7b6e43b86c install : $(TARGET) @@ -78,8 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.7-increase_EAPOL-timeouts.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.7-noscan.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.8-increase_EAPOL-timeouts.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.8-noscan.patch cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile diff --git a/src/patches/hostapd/hostapd-2.7-increase_EAPOL-timeouts.patch b/src/patches/hostapd/hostapd-2.8-increase_EAPOL-timeouts.patch similarity index 77% rename from src/patches/hostapd/hostapd-2.7-increase_EAPOL-timeouts.patch rename to src/patches/hostapd/hostapd-2.8-increase_EAPOL-timeouts.patch index 285b54c61..4be4cd526 100644 --- a/src/patches/hostapd/hostapd-2.7-increase_EAPOL-timeouts.patch +++ b/src/patches/hostapd/hostapd-2.8-increase_EAPOL-timeouts.patch @@ -1,7 +1,7 @@ -diff U3 a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c ---- a/src/ap/wpa_auth.c Sun Dec 2 20:34:59 2018 -+++ b/src/ap/wpa_auth.c Mon Mar 4 15:47:26 2019 -@@ -63,9 +63,9 @@ +diff U3 src/ap/wpa_auth.c src/ap/wpa_auth.c +--- a/src/ap/wpa_auth.c Sun Apr 21 09:10:22 2019 ++++ b/src/ap/wpa_auth.c Sun Jun 9 01:05:24 2019 +@@ -65,9 +65,9 @@ struct wpa_group *group); static u8 * ieee80211w_kde_add(struct wpa_state_machine *sm, u8 *pos); diff --git a/src/patches/hostapd/hostapd-2.7-noscan.patch b/src/patches/hostapd/hostapd-2.8-noscan.patch similarity index 64% rename from src/patches/hostapd/hostapd-2.7-noscan.patch rename to src/patches/hostapd/hostapd-2.8-noscan.patch index 31219c8c5..a323aab47 100644 --- a/src/patches/hostapd/hostapd-2.7-noscan.patch +++ b/src/patches/hostapd/hostapd-2.8-noscan.patch @@ -1,21 +1,9 @@ -diff U3 a/src/ap/ap_config.h b/src/ap/ap_config.h ---- a/src/ap/ap_config.h Sun Dec 2 20:34:59 2018 -+++ b/src/ap/ap_config.h Mon Mar 4 15:58:05 2019 -@@ -779,6 +779,8 @@ - - int ht_op_mode_fixed; - u16 ht_capab; -+ int noscan; -+ int no_ht_coex; - int ieee80211n; - int secondary_channel; - int no_pri_sec_switch; -diff U3 a/hostapd/config_file.c b/hostapd/config_file.c ---- a/hostapd/config_file.c Sun Dec 2 20:34:59 2018 -+++ b/hostapd/config_file.c Mon Mar 4 15:56:51 2019 -@@ -3317,6 +3317,10 @@ - } - #endif /* CONFIG_IEEE80211W */ +diff U3 hostapd/config_file.c hostapd/config_file.c +--- a/hostapd/config_file.c Sun Apr 21 09:10:22 2019 ++++ b/hostapd/config_file.c Sun Jun 9 01:08:21 2019 +@@ -3390,6 +3390,10 @@ + bss->ieee80211w = 1; + #endif /* CONFIG_OCV */ #ifdef CONFIG_IEEE80211N + } else if (os_strcmp(buf, "noscan") == 0) { + conf->noscan = atoi(pos); @@ -24,10 +12,22 @@ diff U3 a/hostapd/config_file.c b/hostapd/config_file.c } else if (os_strcmp(buf, "ieee80211n") == 0) { conf->ieee80211n = atoi(pos); } else if (os_strcmp(buf, "ht_capab") == 0) { -diff U3 a/src/ap/hw_features.c b/src/ap/hw_features.c ---- a/src/ap/hw_features.c Sun Dec 2 20:34:59 2018 -+++ b/src/ap/hw_features.c Mon Mar 4 15:59:08 2019 -@@ -480,7 +480,8 @@ +diff U3 src/ap/ap_config.h src/ap/ap_config.h +--- a/src/ap/ap_config.h Sun Apr 21 09:10:22 2019 ++++ b/src/ap/ap_config.h Sun Jun 9 01:06:42 2019 +@@ -801,6 +801,8 @@ + + int ht_op_mode_fixed; + u16 ht_capab; ++ int noscan; ++ int no_ht_coex; + int ieee80211n; + int secondary_channel; + int no_pri_sec_switch; +diff U3 src/ap/hw_features.c src/ap/hw_features.c +--- a/src/ap/hw_features.c Sun Apr 21 09:10:22 2019 ++++ b/src/ap/hw_features.c Sun Jun 9 01:09:41 2019 +@@ -477,7 +477,8 @@ int ret; /* Check that HT40 is used and PRI / SEC switch is allowed */ @@ -37,9 +37,9 @@ diff U3 a/src/ap/hw_features.c b/src/ap/hw_features.c return 0; hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); -diff U3 a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c ---- a/src/ap/ieee802_11_ht.c Sun Dec 2 20:34:59 2018 -+++ b/src/ap/ieee802_11_ht.c Mon Mar 4 16:02:13 2019 +diff U3 src/ap/ieee802_11_ht.c src/ap/ieee802_11_ht.c +--- a/src/ap/ieee802_11_ht.c Sun Apr 21 09:10:22 2019 ++++ b/src/ap/ieee802_11_ht.c Sun Jun 9 01:13:09 2019 @@ -252,6 +252,9 @@ return; }