git: e96e2a91ccd8 - 2022Q3 - net/wifibox: Update to 1.1.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Ashish SHUKLA <ashish_at_FreeBSD.org>
Date: Wed, 20 Jul 2022 11:57:49 UTC
The branch 2022Q3 has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e96e2a91ccd89c061a02ceb94bf8648b6941fcce

commit e96e2a91ccd89c061a02ceb94bf8648b6941fcce
Author:     PÁLI Gábor János <pali.gabor@gmail.com>
AuthorDate: 2022-07-10 21:19:52 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2022-07-20 11:54:47 +0000

    net/wifibox: Update to 1.1.1
    
    - Update Linux to 5.15.53
    - Replace the in-tree driver for Realtek RTL8821CE
    - Update linux-firmware to 20220708
    - Increase guest memory to 64 MB by default for flavors other than
      `iwlwifi` which can fix crashes under load
    
    MFH:            2022Q3
    (cherry picked from commit 69e65b73a5bcbbaf08a5db2c4260043069626395)
---
 net/wifibox-alpine/Makefile | 26 ++++++++++++++++----------
 net/wifibox-alpine/distinfo | 24 +++++++++++++-----------
 net/wifibox/Makefile        |  2 +-
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/net/wifibox-alpine/Makefile b/net/wifibox-alpine/Makefile
index 54a3719c4aae..992c7ecfa237 100644
--- a/net/wifibox-alpine/Makefile
+++ b/net/wifibox-alpine/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wifibox-alpine
-PORTVERSION=	20220625
+PORTVERSION=	20220712
 CATEGORIES=	net
 
 MAINTAINER=	pali.gabor@gmail.com
@@ -78,10 +78,10 @@ _GITHUB_SITE=	https://github.com/pgj/freebsd-wifibox-alpine/releases/download
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	pgj
 GH_PROJECT=	freebsd-wifibox-alpine:scripts
-GH_TAGNAME=	51b3ad35e4ac0505f4bbb3a5e07eabce14ff48d7:scripts
+GH_TAGNAME=	f8fd8cdb1a0e545272917fe1dc1f9544cf74e383:scripts
 
 ALPINE_VERSION=	3.16.0
-ALPINE_DATE=	2022.06.25
+ALPINE_DATE=	2022.07.09
 _ALPINE_VER=	${ALPINE_VERSION:C@([0-9]+)\.([0-9]+).*@\1.\2@}
 
 .if defined(ALPINE_DATE)
@@ -92,7 +92,7 @@ _ALPINE_SITE=	https://mirror.fit.cvut.cz/alpine/v${_ALPINE_VER}
 .endif
 
 _LINUXFW_SITE=	https://git.kernel.org/pub/scm/linux/kernel/git/firmware/
-_LINUXFW_TAG=	20220610
+_LINUXFW_TAG=	20220708
 _LINUXFW=	linux-firmware-${_LINUXFW_TAG}
 
 MASTER_SITES+=	${_ALPINE_SITE}/releases/x86_64/:rootfs \
@@ -116,11 +116,13 @@ _PACKAGES=	baselayout-3.2.0-r19:wifibox \
 		libnftnl-1.2.1-r0 \
 		libnl3-3.5.0-r0 \
 		libssl1.1-1.1.1o-r0 \
-		linux-lts-5.15.49-r0:wifibox \
+		linux-lts-5.15.53-r0:wifibox \
 		musl-1.2.3-r0 \
 		openrc-0.44.10-r0:wifibox
 
-_GUEST_MEM=	45M
+.if !defined(_GUEST_MEM)
+_GUEST_MEM=	64M
+.endif
 
 _BOOT_SERVICES=		networking urandom bootmisc modules hostname hwclock sysctl syslog
 _DEFAULT_SERVICES=	acpid crond iptables udhcpd
@@ -211,16 +213,20 @@ LINUX_FIRMWARE+=	${L${fw_opt}_FILES}
 .endif
 .endfor
 
-.if ${PORT_OPTIONS:MXX_DRIVER_WL}
-_GUEST_MEM=	50M
+.if ${FLAVOR:U} == iwlwifi
+_GUEST_MEM=	45M
+.endif
+
+.if ${PORT_OPTIONS:MFW_RTW88} || make(makesum)
+_PACKAGES+=	rtl8821ce-20220601-r0:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MXX_DRIVER_WL} || make(makesum)
-_PACKAGES+=	broadcom-wl-6.30.223.271-r3:wifibox
+_PACKAGES+=	broadcom-wl-6.30.223.271-r4:wifibox
 .endif
 
 .if ${PORT_OPTIONS:MXX_DRIVER_RTW89} || make(makesum)
-_PACKAGES+=	rtw89-20220421-r3:wifibox
+_PACKAGES+=	rtw89-20220630-r0:wifibox
 .endif
 
 .if !empty(LINUX_FIRMWARE)
diff --git a/net/wifibox-alpine/distinfo b/net/wifibox-alpine/distinfo
index 080905340495..b3df095e9611 100644
--- a/net/wifibox-alpine/distinfo
+++ b/net/wifibox-alpine/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1656272069
+TIMESTAMP = 1657644281
 SHA256 (wifibox-alpine/alpine-minirootfs-3.16.0-x86_64.tar.gz) = 49cb0d0702a8bde1f7aa1620f53e97cea514ce53540100812c1119b6128a4134
 SIZE (wifibox-alpine/alpine-minirootfs-3.16.0-x86_64.tar.gz) = 2712602
-SHA256 (wifibox-alpine/linux-firmware-20220610.tar.gz) = 09bb5eb8aa02dfee8e6ca52799c214ed83c33b7c43193b99db1ff6219b452adb
-SIZE (wifibox-alpine/linux-firmware-20220610.tar.gz) = 420091554
+SHA256 (wifibox-alpine/linux-firmware-20220708.tar.gz) = 67a678f1d0a80fc32703efcea1831f78c410abbd513b5b8985daac6223d9bf91
+SIZE (wifibox-alpine/linux-firmware-20220708.tar.gz) = 407009280
 SHA256 (wifibox-alpine/baselayout-3.2.0-r19.apk) = 12fb2ed201f5bc5ee18111ce1deb4775a5365128aca1cc78cfb9aa6e210b73eb
 SIZE (wifibox-alpine/baselayout-3.2.0-r19.apk) = 14271
 SHA256 (wifibox-alpine/busybox-1.35.0-r0.apk) = 976d072c283df22b60be50c32df4ad51eb76dd11d0be932ceb7a578d9a0b5d76
@@ -23,8 +23,8 @@ SHA256 (wifibox-alpine/libnl3-3.5.0-r0.apk) = 6c2b08987842a852fed9e4946ee53b0cd7
 SIZE (wifibox-alpine/libnl3-3.5.0-r0.apk) = 325448
 SHA256 (wifibox-alpine/libssl1.1-1.1.1o-r0.apk) = 164997f353a103cc45d55db112de76b36c772a7524ca7b8bf43162dc4545e58e
 SIZE (wifibox-alpine/libssl1.1-1.1.1o-r0.apk) = 213137
-SHA256 (wifibox-alpine/linux-lts-5.15.49-r0.apk) = 6b6915b2be6626ed2461ef63627712e92db9eef28308a6a8b023f52173893f49
-SIZE (wifibox-alpine/linux-lts-5.15.49-r0.apk) = 7658570
+SHA256 (wifibox-alpine/linux-lts-5.15.53-r0.apk) = 5b32c4aac7861759fe715a8bdfc926e7d98172750328e4a429d5997911d1c112
+SIZE (wifibox-alpine/linux-lts-5.15.53-r0.apk) = 7638975
 SHA256 (wifibox-alpine/musl-1.2.3-r0.apk) = 607b64f5007e92bd88a938aa05c5b50cd6ce2ced3315ad811057cbaea0663e6d
 SIZE (wifibox-alpine/musl-1.2.3-r0.apk) = 383304
 SHA256 (wifibox-alpine/openrc-0.44.10-r0.apk) = d0a67e0491890df595ef2aae4f3f267db869da7dc9372549690dcd3f3519f308
@@ -39,10 +39,12 @@ SHA256 (wifibox-alpine/wpa_supplicant-2.10-r0.apk) = abc08bd813bc4b7831e294f9cc4
 SIZE (wifibox-alpine/wpa_supplicant-2.10-r0.apk) = 816535
 SHA256 (wifibox-alpine/hostapd-2.10-r1.apk) = 8e8ae07dc40c34e9eb750fc5eb813cc3f64eff4b08340043985419d06aceebbe
 SIZE (wifibox-alpine/hostapd-2.10-r1.apk) = 542948
-SHA256 (wifibox-alpine/broadcom-wl-6.30.223.271-r3.apk) = df7bdcaafbdec3d96c2d8786bbd7f3a1588147447fb144135a461e469f3f66b1
-SIZE (wifibox-alpine/broadcom-wl-6.30.223.271-r3.apk) = 1463983
-SHA256 (wifibox-alpine/rtw89-20220421-r3.apk) = a8896ccec3a8e152603f06f4fe8e15e3f9f8a6b37473e3b5569440bb5a76fcce
-SIZE (wifibox-alpine/rtw89-20220421-r3.apk) = 852608
+SHA256 (wifibox-alpine/rtl8821ce-20220601-r0.apk) = d0e31eed23c4e717ec8f26df427cedc3bdeb8d788c756c3de12b422ee9df32e6
+SIZE (wifibox-alpine/rtl8821ce-20220601-r0.apk) = 598338
+SHA256 (wifibox-alpine/broadcom-wl-6.30.223.271-r4.apk) = 8423185626392d91623985c1a91cad05ea1869aeea3bd1882c68dd00fbf5bb30
+SIZE (wifibox-alpine/broadcom-wl-6.30.223.271-r4.apk) = 1464895
+SHA256 (wifibox-alpine/rtw89-20220630-r0.apk) = 19e954d85660c8db7e0205c405f39bd7b7334ba2389dc2603e8272ac035d11a5
+SIZE (wifibox-alpine/rtw89-20220630-r0.apk) = 852676
 SHA256 (wifibox-alpine/atmel-firmware-1.3.tar.gz) = f53160b0b4a824754957d8488f1eba68d3c6379d48c563464bd3924e7be19b3d
 SIZE (wifibox-alpine/atmel-firmware-1.3.tar.gz) = 470254
 SHA256 (wifibox-alpine/wl_apsta-3.130.20.0.o) = 7dba610b1d96dd14e901bcbce14cd6ecd1b1ac6f5c0035b0d6b6dc46a7c3ef90
@@ -51,5 +53,5 @@ SHA256 (wifibox-alpine/broadcom-wl-6.30.163.46.tar.bz2) = a07c3b6b277833c7dbe61d
 SIZE (wifibox-alpine/broadcom-wl-6.30.163.46.tar.bz2) = 7684610
 SHA256 (wifibox-alpine/b6e865e2cc7080c91ec34a9dd3648d25f7ce04c6.zip) = 6b8015702c0df7ca21a377b21971606a084141747c2ffabf0fea7558b3664026
 SIZE (wifibox-alpine/b6e865e2cc7080c91ec34a9dd3648d25f7ce04c6.zip) = 6498334
-SHA256 (wifibox-alpine/pgj-freebsd-wifibox-alpine-51b3ad35e4ac0505f4bbb3a5e07eabce14ff48d7_GH0.tar.gz) = 3ca65f864c0f3311b0c5283c5b99d590dc5508284a4dddd1144017a5eb52fbdc
-SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-51b3ad35e4ac0505f4bbb3a5e07eabce14ff48d7_GH0.tar.gz) = 140045
+SHA256 (wifibox-alpine/pgj-freebsd-wifibox-alpine-f8fd8cdb1a0e545272917fe1dc1f9544cf74e383_GH0.tar.gz) = 56855339476bfc9153cc093ec930051f37c565d96114f263889b9a724e60c897
+SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-f8fd8cdb1a0e545272917fe1dc1f9544cf74e383_GH0.tar.gz) = 140316
diff --git a/net/wifibox/Makefile b/net/wifibox/Makefile
index 79a3c4edc3fc..8b826b7bda76 100644
--- a/net/wifibox/Makefile
+++ b/net/wifibox/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wifibox
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	net
 
 MAINTAINER=	pali.gabor@gmail.com