From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 2/2] hostapd: Update to 2.9 Date: Mon, 23 Sep 2019 20:38:59 +0100 Message-ID: In-Reply-To: <20190920185136.23479-2-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8389099882667657580==" List-Id: --===============8389099882667657580== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Reviewed-by: Michael Tremer > On 20 Sep 2019, at 19:51, Matthias Fischer = wrote: >=20 > For details see: > https://w1.fi/cgit/hostap/plain/hostapd/ChangeLog >=20 > Signed-off-by: Matthias Fischer > --- > lfs/hostapd | 10 +++++----- > ...hostapd-2.9-increase_EAPOL-timeouts.patch} | 4 ++-- > ...-noscan.patch =3D> hostapd-2.9-noscan.patch} | 20 +++++++++---------- > 3 files changed, 17 insertions(+), 17 deletions(-) > rename src/patches/hostapd/{hostapd-2.8-increase_EAPOL-timeouts.patch =3D> = hostapd-2.9-increase_EAPOL-timeouts.patch} (86%) > rename src/patches/hostapd/{hostapd-2.8-noscan.patch =3D> hostapd-2.9-nosca= n.patch} (77%) >=20 > diff --git a/lfs/hostapd b/lfs/hostapd > index 9dabc3b5b..c02c9724c 100644 > --- a/lfs/hostapd > +++ b/lfs/hostapd > @@ -24,7 +24,7 @@ >=20 > include Config >=20 > -VER =3D 2.8 > +VER =3D 2.9 >=20 > THISAPP =3D hostapd-$(VER) > DL_FILE =3D $(THISAPP).tar.gz > @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) > DIR_APP =3D $(DIR_SRC)/$(THISAPP) > TARGET =3D $(DIR_INFO)/$(THISAPP) > PROG =3D hostapd > -PAK_VER =3D 48 > +PAK_VER =3D 49 >=20 > DEPS =3D "" >=20 > @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) >=20 > $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >=20 > -$(DL_FILE)_MD5 =3D ed2c254e5f400838cb9d8e7b6e43b86c > +$(DL_FILE)_MD5 =3D f188fc53a495fe7af3b6d77d3c31dee8 >=20 > install : $(TARGET) >=20 > @@ -78,8 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > @$(PREBUILD) > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >=20 > - 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 >=20 > cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config > cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr(a)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/hos= tapd/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 =3D 1; > #endif /* CONFIG_OCV */ > #ifdef CONFIG_IEEE80211N > @@ -13,9 +13,9 @@ diff U3 hostapd/config_file.c hostapd/config_file.c > conf->ieee80211n =3D atoi(pos); > } else if (os_strcmp(buf, "ht_capab") =3D=3D 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 @@ >=20 > 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; >=20 > @@ -38,8 +38,8 @@ diff U3 src/ap/hw_features.c src/ap/hw_features.c >=20 > 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; > } > --=20 > 2.18.0 >=20 --===============8389099882667657580==--