[arch-commits] Commit in hostapd/trunk (4 files)
Sergej Pupykin
spupykin at archlinux.org
Thu Apr 25 12:38:40 UTC 2019
Date: Thursday, April 25, 2019 @ 12:38:39
Author: spupykin
Revision: 453806
upgpkg: hostapd 2.8-1
Added:
hostapd/trunk/hostapd-noscan.patch
(from rev 453805, hostapd/trunk/hostapd-2.3-noscan.patch)
Modified:
hostapd/trunk/PKGBUILD
hostapd/trunk/openvswitch.patch
Deleted:
hostapd/trunk/hostapd-2.3-noscan.patch
--------------------------+
PKGBUILD | 10 ++---
hostapd-2.3-noscan.patch | 76 ---------------------------------------------
hostapd-noscan.patch | 76 +++++++++++++++++++++++++++++++++++++++++++++
openvswitch.patch | 48 +++++++++-------------------
4 files changed, 97 insertions(+), 113 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-04-25 12:38:34 UTC (rev 453805)
+++ PKGBUILD 2019-04-25 12:38:39 UTC (rev 453806)
@@ -1,7 +1,7 @@
# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
pkgname=hostapd
-pkgver=2.7
+pkgver=2.8
pkgrel=1
pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
arch=('x86_64')
@@ -13,14 +13,14 @@
source=(https://w1.fi/releases/$pkgname-$pkgver.tar.gz{,.asc}
config
hostapd.service
- hostapd-2.3-noscan.patch
+ hostapd-noscan.patch
openvswitch.patch)
-sha256sums=('21b0dda3cc3abe75849437f6b9746da461f88f0ea49dd621216936f87440a141'
+sha256sums=('929f522be6eeec38c53147e7bc084df028f65f148a3f7e4fa6c4c3f955cee4b0'
'SKIP'
'a39e011bf0c3f2d21db8816a7e608a99b9d598c7b559d58d026f10e4359d428d'
'989bc6855f44c0b360e3d4cd4a146c35b7c12f8a0ced627b4b033f58edcade8e'
- '46a1967d7ec2fb190adde23c1bbd59f54c29902ae257276daef909dc842287f2'
- 'eeb07b5a3b971b3108ce8c5c947f4600d98ec9b338b8b88a96a7774cef269e49')
+ '5ad1aadcd7682e517cab6afb474df6b9abad1a08dbe2bb40571a1b91c33f6f09'
+ '64c06b5f6f58923446fd9351c596c759dec130997677f8b9f013c8ce360fbd98')
prepare() {
cd $pkgname-$pkgver
Deleted: hostapd-2.3-noscan.patch
===================================================================
--- hostapd-2.3-noscan.patch 2019-04-25 12:38:34 UTC (rev 453805)
+++ hostapd-2.3-noscan.patch 2019-04-25 12:38:39 UTC (rev 453806)
@@ -1,76 +0,0 @@
-diff -wbBur hostapd-2.6/hostapd/config_file.c hostapd-2.6.my/hostapd/config_file.c
---- hostapd-2.6/hostapd/config_file.c 2016-10-02 21:51:11.000000000 +0300
-+++ hostapd-2.6.my/hostapd/config_file.c 2016-10-04 21:14:04.986440035 +0300
-@@ -2863,6 +2863,8 @@
- }
- #endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211N
-+ } else if (os_strcmp(buf, "noscan") == 0) {
-+ conf->noscan = atoi(pos);
- } else if (os_strcmp(buf, "ieee80211n") == 0) {
- conf->ieee80211n = atoi(pos);
- } else if (os_strcmp(buf, "ht_capab") == 0) {
-diff -wbBur hostapd-2.6/src/ap/ap_config.h hostapd-2.6.my/src/ap/ap_config.h
---- hostapd-2.6/src/ap/ap_config.h 2016-10-02 21:51:11.000000000 +0300
-+++ hostapd-2.6.my/src/ap/ap_config.h 2016-10-04 21:14:04.986440035 +0300
-@@ -664,6 +664,7 @@
-
- int ht_op_mode_fixed;
- u16 ht_capab;
-+ int noscan;
- int ieee80211n;
- int secondary_channel;
- int no_pri_sec_switch;
-diff -wbBur hostapd-2.6/src/ap/hw_features.c hostapd-2.6.my/src/ap/hw_features.c
---- hostapd-2.6/src/ap/hw_features.c 2016-10-02 21:51:11.000000000 +0300
-+++ hostapd-2.6.my/src/ap/hw_features.c 2016-10-04 21:15:19.323105847 +0300
-@@ -226,7 +226,7 @@
- {
- int pri_chan, sec_chan;
-
-- if (!iface->conf->secondary_channel)
-+ if (!iface->conf->secondary_channel || iface->conf->noscan)
- return 1; /* HT40 not used */
-
- pri_chan = iface->conf->channel;
-@@ -474,7 +474,7 @@
- int ret;
-
- /* Check that HT40 is used and PRI / SEC switch is allowed */
-- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
-+ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch || iface->conf->noscan)
- return 0;
-
- hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
-@@ -794,7 +794,7 @@
- if (!hostapd_is_usable_chan(iface, iface->conf->channel, 1))
- return 0;
-
-- if (!iface->conf->secondary_channel)
-+ if (!iface->conf->secondary_channel || iface->conf->noscan)
- return 1;
-
- return hostapd_is_usable_chan(iface, iface->conf->channel +
-diff -wbBur hostapd-2.6/src/ap/ieee802_11_ht.c hostapd-2.6.my/src/ap/ieee802_11_ht.c
---- hostapd-2.6/src/ap/ieee802_11_ht.c 2016-10-02 21:51:11.000000000 +0300
-+++ hostapd-2.6.my/src/ap/ieee802_11_ht.c 2016-10-04 21:14:04.989773368 +0300
-@@ -252,6 +252,9 @@
- return;
- }
-
-+ if (iface->conf->noscan)
-+ return;
-+
- if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) {
- wpa_printf(MSG_DEBUG,
- "Ignore too short 20/40 BSS Coexistence Management frame");
-@@ -368,6 +371,9 @@
- if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
- return;
-
-+ if (iface->conf->noscan)
-+ return;
-+
- wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
- " in Association Request", MAC2STR(sta->addr));
-
Copied: hostapd/trunk/hostapd-noscan.patch (from rev 453805, hostapd/trunk/hostapd-2.3-noscan.patch)
===================================================================
--- hostapd-noscan.patch (rev 0)
+++ hostapd-noscan.patch 2019-04-25 12:38:39 UTC (rev 453806)
@@ -0,0 +1,76 @@
+diff -wbBur hostapd-2.8/hostapd/config_file.c hostapd-2.8.q/hostapd/config_file.c
+--- hostapd-2.8/hostapd/config_file.c 2019-04-21 10:10:22.000000000 +0300
++++ hostapd-2.8.q/hostapd/config_file.c 2019-04-25 14:59:57.594749041 +0300
+@@ -2858,6 +2858,8 @@
+ bss->wpa_gmk_rekey = atoi(pos);
+ } else if (os_strcmp(buf, "wpa_ptk_rekey") == 0) {
+ bss->wpa_ptk_rekey = atoi(pos);
++ } else if (os_strcmp(buf, "noscan") == 0) {
++ conf->noscan = atoi(pos);
+ } else if (os_strcmp(buf, "wpa_group_update_count") == 0) {
+ char *endp;
+ unsigned long val = strtoul(pos, &endp, 0);
+@@ -3390,6 +3392,8 @@
+ bss->ieee80211w = 1;
+ #endif /* CONFIG_OCV */
+ #ifdef CONFIG_IEEE80211N
++ } else if (os_strcmp(buf, "noscan") == 0) {
++ conf->noscan = atoi(pos);
+ } else if (os_strcmp(buf, "ieee80211n") == 0) {
+ conf->ieee80211n = atoi(pos);
+ } else if (os_strcmp(buf, "ht_capab") == 0) {
+diff -wbBur hostapd-2.8/src/ap/ap_config.h hostapd-2.8.q/src/ap/ap_config.h
+--- hostapd-2.8/src/ap/ap_config.h 2019-04-21 10:10:22.000000000 +0300
++++ hostapd-2.8.q/src/ap/ap_config.h 2019-04-25 15:01:32.981414600 +0300
+@@ -801,6 +801,7 @@
+
+ int ht_op_mode_fixed;
+ u16 ht_capab;
++ int noscan;
+ int ieee80211n;
+ int secondary_channel;
+ int no_pri_sec_switch;
+diff -wbBur hostapd-2.8/src/ap/hw_features.c hostapd-2.8.q/src/ap/hw_features.c
+--- hostapd-2.8/src/ap/hw_features.c 2019-04-21 10:10:22.000000000 +0300
++++ hostapd-2.8.q/src/ap/hw_features.c 2019-04-25 14:58:10.278083605 +0300
+@@ -477,7 +477,7 @@
+ int ret;
+
+ /* Check that HT40 is used and PRI / SEC switch is allowed */
+- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
++ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch || iface->conf->noscan)
+ return 0;
+
+ hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
+@@ -730,7 +730,7 @@
+ if (!hostapd_is_usable_chan(iface, iface->conf->channel, 1))
+ return 0;
+
+- if (!iface->conf->secondary_channel)
++ if (!iface->conf->secondary_channel || iface->conf->noscan)
+ return 1;
+
+ if (!iface->conf->ht40_plus_minus_allowed)
+diff -wbBur hostapd-2.8/src/ap/ieee802_11_ht.c hostapd-2.8.q/src/ap/ieee802_11_ht.c
+--- hostapd-2.8/src/ap/ieee802_11_ht.c 2019-04-21 10:10:22.000000000 +0300
++++ hostapd-2.8.q/src/ap/ieee802_11_ht.c 2019-04-25 14:58:10.278083605 +0300
+@@ -252,6 +252,9 @@
+ return;
+ }
+
++ if (iface->conf->noscan)
++ return;
++
+ if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) {
+ wpa_printf(MSG_DEBUG,
+ "Ignore too short 20/40 BSS Coexistence Management frame");
+@@ -412,6 +415,9 @@
+ if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
+ return;
+
++ if (iface->conf->noscan)
++ return;
++
+ wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
+ " in Association Request", MAC2STR(sta->addr));
+
Modified: openvswitch.patch
===================================================================
--- openvswitch.patch 2019-04-25 12:38:34 UTC (rev 453805)
+++ openvswitch.patch 2019-04-25 12:38:39 UTC (rev 453806)
@@ -1,8 +1,7 @@
-diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak
-index 9434078..7d8786c 100644
---- a/src/drivers/drivers.mak
-+++ b/src/drivers/drivers.mak
-@@ -145,6 +145,10 @@ DRV_WPA_OBJS += ../src/drivers/driver_wext.o
+diff -wbBur hostapd-2.8.q/src/drivers/drivers.mak hostapd-2.8/src/drivers/drivers.mak
+--- hostapd-2.8.q/src/drivers/drivers.mak 2019-04-21 10:10:22.000000000 +0300
++++ hostapd-2.8/src/drivers/drivers.mak 2019-04-25 15:05:36.981411804 +0300
+@@ -136,6 +136,10 @@
NEED_RFKILL=y
endif
@@ -13,11 +12,10 @@
ifdef NEED_NETLINK
DRV_OBJS += ../src/drivers/netlink.o
endif
-diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk
-index 8da4c53..4cee638 100644
---- a/src/drivers/drivers.mk
-+++ b/src/drivers/drivers.mk
-@@ -132,6 +132,10 @@ DRV_WPA_OBJS += src/drivers/driver_wext.c
+diff -wbBur hostapd-2.8.q/src/drivers/drivers.mk hostapd-2.8/src/drivers/drivers.mk
+--- hostapd-2.8.q/src/drivers/drivers.mk 2019-04-21 10:10:22.000000000 +0300
++++ hostapd-2.8/src/drivers/drivers.mk 2019-04-25 15:05:36.981411804 +0300
+@@ -128,6 +128,10 @@
NEED_RFKILL=y
endif
@@ -28,12 +26,11 @@
ifdef NEED_NETLINK
DRV_OBJS += src/drivers/netlink.c
endif
-diff --git a/src/drivers/linux_ioctl.c b/src/drivers/linux_ioctl.c
-index 837971d..f666e27 100644
---- a/src/drivers/linux_ioctl.c
-+++ b/src/drivers/linux_ioctl.c
-@@ -14,6 +14,69 @@
- #include "utils/common.h"
+diff -wbBur hostapd-2.8.q/src/drivers/linux_ioctl.c hostapd-2.8/src/drivers/linux_ioctl.c
+--- hostapd-2.8.q/src/drivers/linux_ioctl.c 2019-04-21 10:10:22.000000000 +0300
++++ hostapd-2.8/src/drivers/linux_ioctl.c 2019-04-25 15:05:36.981411804 +0300
+@@ -15,6 +15,69 @@
+ #include "common/linux_bridge.h"
#include "linux_ioctl.h"
+#ifdef CONFIG_OPENVSWITCH
@@ -102,15 +99,7 @@
int linux_set_iface_flags(int sock, const char *ifname, int dev_up)
{
-@@ -118,7 +181,6 @@ int linux_set_ifhwaddr(int sock, const char *ifname, const u8 *addr)
- return 0;
- }
-
--
- #ifndef SIOCBRADDBR
- #define SIOCBRADDBR 0x89a0
- #endif
-@@ -162,6 +224,11 @@ int linux_br_add_if(int sock, const char *brname, const char *ifname)
+@@ -152,6 +215,11 @@
struct ifreq ifr;
int ifindex;
@@ -122,7 +111,7 @@
ifindex = if_nametoindex(ifname);
if (ifindex == 0)
return -1;
-@@ -184,6 +251,11 @@ int linux_br_del_if(int sock, const char *brname, const char *ifname)
+@@ -177,6 +245,11 @@
struct ifreq ifr;
int ifindex;
@@ -134,7 +123,7 @@
ifindex = if_nametoindex(ifname);
if (ifindex == 0)
return -1;
-@@ -206,6 +278,11 @@ int linux_br_get(char *brname, const char *ifname)
+@@ -199,6 +272,11 @@
char path[128], brlink[128], *pos;
ssize_t res;
@@ -146,8 +135,3 @@
os_snprintf(path, sizeof(path), "/sys/class/net/%s/brport/bridge",
ifname);
res = readlink(path, brlink, sizeof(brlink));
-@@ -219,3 +296,4 @@ int linux_br_get(char *brname, const char *ifname)
- os_strlcpy(brname, pos, IFNAMSIZ);
- return 0;
- }
-+
More information about the arch-commits
mailing list