Move to Linux 5.15.49 + Alpine 3.16.0.

3 files changed, 24 insertions, 36 deletions

diff --git a/aports/wpa_supplicant/APKBUILD b/aports/wpa_supplicant/APKBUILD
index 0d9f843..5e7e18b 100644
--- a/aports/wpa_supplicant/APKBUILD
+++ b/aports/wpa_supplicant/APKBUILD
@@ -1,27 +1,20 @@
 # Maintainer: Gabor Pali <pali.gabor@gmail.com>
 
 pkgname=wpa_supplicant
-pkgver=2.9
-pkgrel=18
+pkgver=2.10
+pkgrel=0 # base: 1
 pkgdesc="utility providing key negotiation for WPA wireless networks"
 url="https://w1.fi/wpa_supplicant/"
-arch="x86_64"
+arch="all"
 options="!check" # has no tests
 license="BSD-3-Clause"
 subpackages=
 makedepends="linux-headers openssl1.1-compat-dev dbus-dev libnl3-dev pcsc-lite-dev"
 source="https://w1.fi/releases/wpa_supplicant-$pkgver.tar.gz
-
 	wpa_supplicant.initd
 	wpa_supplicant.confd
-
 	eloop.patch
 	no-tools.patch
-	CVE-2019-16275.patch
-	CVE-2021-0326.patch
-	CVE-2021-27803.patch
-	CVE-2021-30004.patch::https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15
-
 	config"
 
 # secfixes:
@@ -78,14 +71,10 @@ package() {
 }
 
 sha512sums="
-37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8  wpa_supplicant-2.9.tar.gz
+021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1  wpa_supplicant-2.10.tar.gz
 92c4cbaa9776a354275640c9411d2f547f4c0e00415af4ab30039f1a0be6a11082d49e2514905010f0abcc4a9276353276da9864e3d5f7264a0f0767c8cc9d78  wpa_supplicant.initd
 c7e4041fe41743c5e63a07edc9234d0c44c4c0f193a180b27342b43f3be45fb87b42ee0f9e4a20614cf6ad58cf64d25f74d1e75e2e1d521c2f6d45cdc5737eae  wpa_supplicant.confd
 2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232  eloop.patch
-39cb1a0706bdaf1797dc88543a62c5b68497a2f733e8b42e8eb1e1bb39a6513fc10bfdde8f7fcb0ad8370aba6325c7613b2b9a390be4a07c4e556a2c6c618d86  no-tools.patch
-63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38  CVE-2019-16275.patch
-e212dd6a2c56c086c14a2c96f479f7a8e6521b6a24c648eb03363db078398e64a38e343ff6faa327d5a0244a7969ecd34c5844d676c697eeb8eb842101fa9cf9  CVE-2021-0326.patch
-af8b4a526a6833de4921fcbbd1b03da7e027276c909d512bd59a95e9767ffe8580135f9aee8947c4317681c4fe130f7ec50cba947f8375313f832a66c66b2cd5  CVE-2021-27803.patch
-674328dc44246ce10939a769ed70c71e94e61600592d54ed9088dacbed1fd3dd3d0a834c75825d1448380ec8c076eb30e0d72e601794f507c12db3b6e724af5e  CVE-2021-30004.patch
-5aeebaad14f9d43bac8d7322a5a001a54d2cbc83376528f08eaff60217b170c67a44b5a634c3c14c90eec134aee844d9b79c471c45cd601948f492d645ec9678  config
+3278eff7118f9dc9e177adc3ed91cad562a8edde396af8619321ac8552a86e9c7de25212d5578ea17cbe4b6dc928d83cd6e9a7f0d41e07576656e6e9274107d6  no-tools.patch
+0e1af7084026c3b50b3a77636758f1ce3c1004e1e6d7eb71038e42c5c63866e2bbee3b0933b1131b80a6f2f6848983847a017ba2555a3162f0ccd3aa57fcf257  config
 "
diff --git a/aports/wpa_supplicant/config b/aports/wpa_supplicant/config
index 9b940cb..ab425d0 100644
--- a/aports/wpa_supplicant/config
+++ b/aports/wpa_supplicant/config
@@ -201,10 +201,10 @@ CONFIG_SMARTCARD=y
 CONFIG_PCSC=y
 
 # Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
-#CONFIG_HT_OVERRIDES=y
+CONFIG_HT_OVERRIDES=y
 
 # Support VHT overrides (disable VHT, mask MCS rates, etc.)
-#CONFIG_VHT_OVERRIDES=y
+CONFIG_VHT_OVERRIDES=y
 
 # Development testing
 CONFIG_EAPOL_TEST=n
@@ -542,7 +542,7 @@ CONFIG_P2P=y
 # For exponential module:
 #CONFIG_AUTOSCAN_EXPONENTIAL=y
 # For periodic module:
-#CONFIG_AUTOSCAN_PERIODIC=y
+CONFIG_AUTOSCAN_PERIODIC=y
 
 # Password (and passphrase, etc.) backend for external storage
 # These optional mechanisms can be used to add support for storing passwords
diff --git a/aports/wpa_supplicant/no-tools.patch b/aports/wpa_supplicant/no-tools.patch
index 3282352..f3bf3cd 100644
--- a/aports/wpa_supplicant/no-tools.patch
+++ b/aports/wpa_supplicant/no-tools.patch
@@ -1,9 +1,6 @@
---- wpa_supplicant-2.9/wpa_supplicant/Makefile.orig
-+++ wpa_supplicant-2.9/wpa_supplicant/Makefile
-@@ -44,12 +44,8 @@
- CONFIG_TDLS_TESTING=y
- endif
- 
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -1,9 +1,5 @@
 -BINALL=wpa_supplicant wpa_cli
 +BINALL=wpa_supplicant
  
@@ -14,27 +11,29 @@
  ALL = $(BINALL)
  ALL += systemd/wpa_supplicant.service
  ALL += systemd/wpa_supplicant@.service
-@@ -1805,7 +1801,7 @@
+@@ -1812,7 +1808,7 @@
  OBJS_priv += ../src/drivers/driver_common.o
  
- OBJS += wpa_supplicant.o events.o blacklist.o wpas_glue.o scan.o
+ OBJS += wpa_supplicant.o events.o bssid_ignore.o wpas_glue.o scan.o
 -OBJS_t := $(OBJS) $(OBJS_l2) eapol_test.o
 +OBJS_t := $(OBJS) $(OBJS_l2)
  OBJS_t += ../src/radius/radius_client.o
  OBJS_t += ../src/radius/radius.o
- ifndef CONFIG_AP
-@@ -1903,10 +1899,6 @@
+ OBJS_t2 := $(OBJS) $(OBJS_l2) preauth_test.o
+@@ -1894,12 +1890,6 @@
  	$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
  	@$(E) "  LD " $@
  
+-_OBJS_VAR := OBJS_t
+-include ../src/objs.mk
 -eapol_test: $(OBJS_t)
 -	$(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS)
 -	@$(E) "  LD " $@
 -
+ _OBJS_VAR := OBJS_t2
+ include ../src/objs.mk
  preauth_test: $(OBJS_t2)
- 	$(Q)$(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS)
- 	@$(E) "  LD " $@
-@@ -2007,8 +1999,6 @@
+@@ -2030,8 +2020,6 @@
  	mv -f $< $@
  win_if_list.exe: win_if_list
  	mv -f $< $@
@@ -43,12 +42,12 @@
  
  WINALL=wpa_supplicant.exe wpa_cli.exe wpa_passphrase.exe win_if_list.exe
  
-@@ -2040,7 +2030,7 @@
+@@ -2064,7 +2052,7 @@
  	$(MAKE) -C ../src clean
  	$(MAKE) -C dbus clean
  	rm -f core *~ *.o *.d *.gcno *.gcda *.gcov
--	rm -f eap_*.so $(ALL) $(WINALL) eapol_test preauth_test
-+	rm -f eap_*.so $(ALL) $(WINALL) preauth_test
+-	rm -f eap_*.so $(WINALL) eapol_test preauth_test
++	rm -f eap_*.so $(WINALL) preauth_test
  	rm -f wpa_priv
  	rm -f nfc_pw_token
  	rm -f lcov.info