From patchwork Fri Sep 20 18:51:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 2415 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 46ZjVq4YCkz42Md for ; Fri, 20 Sep 2019 18:51:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46ZjVp3bkgz2Pg; Fri, 20 Sep 2019 18:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1569005506; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=0VDwEer47tQSuSpQENf6OVA61nditRwgNNEa0QZG8Lc=; b=E9IB5m/bkHhDdLZhV1AtdpiXKUWtx7a2iyo9aLfcqULj4Sls41XzwG9NvliQF4MGUGbJwj OiskBaNbazTszBAw2ZDGANyIwZcvLzZZh/AUFmI1dOWe5mnaNlLU62OlSp1w8qkmPfTiKH PCH9oibkd6v/5RriXT+QGZP0sCB9WN9RvVi7qeVYKJV/8RavhJSB7YTF6YFR7hee/EYxFE O6rCATnim5FleSJl3nWOFvUaFyx8QfXPykOm1V+lIYBNhJ5/Kfvv08rjf0tEZt3+fOSij5 V5Vy4JQsWh/SSDhitd94bx5tezCBOCcZhtKZaQZ1iDWwa5YuS1j+YdUzyuWliQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1569005506; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=0VDwEer47tQSuSpQENf6OVA61nditRwgNNEa0QZG8Lc=; b=0Qyfp1KVpOHTb2wqJK4uXl7pMx8iypBFya+ldAOHprqt3cCplq7Qs1V1CEGIxb2AyEXZuY wzk/Ng08SV4c3uAA== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46ZjVp0Zk1z2yjw; Fri, 20 Sep 2019 18:51:46 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46ZjVm56Cjz2y2d for ; Fri, 20 Sep 2019 18:51:44 +0000 (UTC) Received: from Devel.localdomain (p4FF56DD1.dip0.t-ipconnect.de [79.245.109.209]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 46ZjVm399rz2Ly for ; Fri, 20 Sep 2019 18:51:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1569005504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=0VDwEer47tQSuSpQENf6OVA61nditRwgNNEa0QZG8Lc=; b=+il13x9x9zi3hwoznw5iPoc8GpSIYVFZ+tMMOcAtjrjU6Ps9KG5N9ciAxP305NvCaPYSit G+2D4yqWx9Lt/CDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1569005504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=0VDwEer47tQSuSpQENf6OVA61nditRwgNNEa0QZG8Lc=; b=AgdOnwhtXl2nL4LqVYVvht8rKyoGjeMD8ZVrBH+psAy5vkuCk1Ffn21WrraPoUh58YCYiB DwIPRNtiDo7egsgQf4eYBrnH0kV+HcHeHABj8y7RMDEJL/Q4YbRIC+sA0roHj8bv/FXfj+ DLrhed1e608qvuqvVpjhHU3TSuXM2BS6TV/zyD/UUTDJY8WQ1CN1fTewTmjF7PXVgprtLf 7edURemdlELzRPde6sHExlUZKzpv2W/0NAma3k3vwWcEyT/QW37RP1RtLoTU3pgXPuQr2q 3tp/S4x6HtPy2kbKhHqDwxrBj3IekGyAA3Jq9i0K6Aa2u7zkFzpBMSjcr7MrsQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 2/2] hostapd: Update to 2.9 Date: Fri, 20 Sep 2019 20:51:36 +0200 Message-Id: <20190920185136.23479-2-matthias.fischer@ipfire.org> In-Reply-To: <20190920185136.23479-1-matthias.fischer@ipfire.org> References: <20190920185136.23479-1-matthias.fischer@ipfire.org> 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.29 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 Reviewed-by: Michael Tremer --- lfs/hostapd | 10 +++++----- ...hostapd-2.9-increase_EAPOL-timeouts.patch} | 4 ++-- ...-noscan.patch => hostapd-2.9-noscan.patch} | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) rename src/patches/hostapd/{hostapd-2.8-increase_EAPOL-timeouts.patch => hostapd-2.9-increase_EAPOL-timeouts.patch} (86%) rename src/patches/hostapd/{hostapd-2.8-noscan.patch => hostapd-2.9-noscan.patch} (77%) diff --git a/lfs/hostapd b/lfs/hostapd index 9dabc3b5b..c02c9724c 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -24,7 +24,7 @@ include Config -VER = 2.8 +VER = 2.9 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 = 48 +PAK_VER = 49 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ed2c254e5f400838cb9d8e7b6e43b86c +$(DL_FILE)_MD5 = f188fc53a495fe7af3b6d77d3c31dee8 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.8-increase_EAPOL-timeouts.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.8-noscan.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.9-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.8-increase_EAPOL-timeouts.patch b/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch similarity index 86% rename from src/patches/hostapd/hostapd-2.8-increase_EAPOL-timeouts.patch rename to src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch index 4be4cd526..87aec005b 100644 --- a/src/patches/hostapd/hostapd-2.8-increase_EAPOL-timeouts.patch +++ b/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch @@ -1,6 +1,6 @@ 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 +--- a/src/ap/wpa_auth.c Wed Aug 7 15:25:25 2019 ++++ b/src/ap/wpa_auth.c Fri Sep 20 17:35:23 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.8-noscan.patch b/src/patches/hostapd/hostapd-2.9-noscan.patch similarity index 77% rename from src/patches/hostapd/hostapd-2.8-noscan.patch rename to src/patches/hostapd/hostapd-2.9-noscan.patch index a323aab47..c4df23029 100644 --- a/src/patches/hostapd/hostapd-2.8-noscan.patch +++ b/src/patches/hostapd/hostapd-2.9-noscan.patch @@ -1,7 +1,7 @@ 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 @@ +--- a/hostapd/config_file.c Wed Aug 7 15:25:25 2019 ++++ b/hostapd/config_file.c Fri Sep 20 17:36:33 2019 +@@ -3411,6 +3411,10 @@ bss->ieee80211w = 1; #endif /* CONFIG_OCV */ #ifdef CONFIG_IEEE80211N @@ -13,9 +13,9 @@ diff U3 hostapd/config_file.c hostapd/config_file.c conf->ieee80211n = atoi(pos); } else if (os_strcmp(buf, "ht_capab") == 0) { 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 @@ +--- a/src/ap/ap_config.h Wed Aug 7 15:25:25 2019 ++++ b/src/ap/ap_config.h Fri Sep 20 17:38:06 2019 +@@ -932,6 +932,8 @@ int ht_op_mode_fixed; u16 ht_capab; @@ -25,8 +25,8 @@ diff U3 src/ap/ap_config.h src/ap/ap_config.h 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 +--- a/src/ap/hw_features.c Wed Aug 7 15:25:25 2019 ++++ b/src/ap/hw_features.c Fri Sep 20 17:39:02 2019 @@ -477,7 +477,8 @@ int ret; @@ -38,8 +38,8 @@ diff U3 src/ap/hw_features.c src/ap/hw_features.c hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); 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 +--- a/src/ap/ieee802_11_ht.c Wed Aug 7 15:25:25 2019 ++++ b/src/ap/ieee802_11_ht.c Fri Sep 20 17:41:24 2019 @@ -252,6 +252,9 @@ return; }