Date: Tue, 7 Feb 2023 17:31:09 GMT From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e18273038049 - main - net/wifibox: Update to 1.2.0 Message-ID: <202302071731.317HV9Us003085@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=e18273038049070e2f249bd40e81f231bd288d24 commit e18273038049070e2f249bd40e81f231bd288d24 Author: PÁLI Gábor János <pali.gabor@gmail.com> AuthorDate: 2023-02-05 16:28:18 +0000 Commit: Ashish SHUKLA <ashish@FreeBSD.org> CommitDate: 2023-02-07 17:29:44 +0000 net/wifibox: Update to 1.2.0 Changes: https://github.com/pgj/freebsd-wifibox-port/releases/tag/1.2.0 --- net/wifibox-alpine/Makefile | 132 +++++++++++++++++++++++++++--------------- net/wifibox-alpine/distinfo | 116 ++++++++++++++++++++----------------- net/wifibox-alpine/flavors.mk | 2 +- net/wifibox-alpine/pkg-plist | 4 +- net/wifibox-core/Makefile | 15 ++++- net/wifibox-core/distinfo | 6 +- net/wifibox/Makefile | 2 +- 7 files changed, 168 insertions(+), 109 deletions(-) diff --git a/net/wifibox-alpine/Makefile b/net/wifibox-alpine/Makefile index 64de235af298..f506201a840a 100644 --- a/net/wifibox-alpine/Makefile +++ b/net/wifibox-alpine/Makefile @@ -1,5 +1,5 @@ PORTNAME= wifibox-alpine -PORTVERSION= 20220712 +PORTVERSION= 20230201 CATEGORIES= net MAINTAINER= pali.gabor@gmail.com @@ -12,8 +12,9 @@ LICENSE_FILE= ${WRKSRC_scripts}/LICENSE ONLY_FOR_ARCHS= amd64 EXTRACT_ONLY= ${_DISTFILES:M*_GH0.tar.gz} -BUILD_DEPENDS= patchelf>0:sysutils/patchelf \ - squashfs-tools>0:sysutils/squashfs-tools +BUILD_DEPENDS= gtar>0:archivers/gtar \ + patchelf>0:sysutils/patchelf \ + squashfs-tools-ng>0:sysutils/squashfs-tools-ng .include "${.CURDIR}/flavors.mk" @@ -25,32 +26,39 @@ OPTIONS_DEFINE= UDS_PASSTHRU OPTIONS_SUB= yes OPTIONS_SINGLE= COMPRESSION APPLICATION -OPTIONS_SINGLE_COMPRESSION= COMP_GZIP COMP_LZO COMP_LZ4 COMP_XZ COMP_ZSTD +OPTIONS_SINGLE_COMPRESSION= COMP_GZIP COMP_LZ4 COMP_LZO COMP_XZ COMP_ZSTD OPTIONS_SINGLE_APPLICATION= APP_HOSTAPD APP_WPA_SUPPLICANT +OPTIONS_GROUP= EXTRAS +OPTIONS_GROUP_EXTRAS= XX_MDNS XX_FORWARDING XX_TCPDUMP + OPTIONS_DEFAULT= COMP_XZ APP_WPA_SUPPLICANT UDS_PASSTHRU COMP_GZIP_DESC= gzip -COMP_LZO_DESC= lzo COMP_LZ4_DESC= lz4 +COMP_LZO_DESC= lzo COMP_XZ_DESC= xz COMP_ZSTD_DESC= zstd UDS_PASSTHRU_DESC= Control socket pass-through APP_HOSTAPD_DESC= Access Point (hostapd) APP_WPA_SUPPLICANT_DESC= WPA Supplicant (wpa_supplicant) +XX_MDNS_DESC= mDNS Responder Daemon +XX_FORWARDING_DESC= User-space forwarding +XX_TCPDUMP_DESC= Packet analysis with tcpdump UDS_PASSTHRU_RUN_DEPENDS= socat>0:net/socat .if ${FLAVOR:U} == default -OPTIONS_GROUP= FIRMWARE EXTRAS +OPTIONS_GROUP+= FIRMWARE OPTIONS_GROUP_FIRMWARE= FW_ATH10K FW_ATH11K FW_ATMEL FW_B43 FW_B43LEGACY FW_BRCM\ FW_IPW2100 FW_IPW2200 FW_IWL3945 FW_IWL4965 FW_IWLWIFI\ - FW_MEDIATEK FW_MARVELL FW_RT61 FW_RTLWIFI FW_RTW88 FW_TI -OPTIONS_GROUP_EXTRAS= XX_DRIVER_WL XX_DRIVER_RTW89 + FW_MEDIATEK FW_MARVELL FW_RT61 FW_RTLWIFI FW_RTW88 FW_RTW89\ + FW_TI +OPTIONS_GROUP_EXTRAS+= XX_DRIVER_WL OPTIONS_DEFAULT+= FW_ATH10K FW_ATH11K FW_BRCM FW_IWLWIFI FW_MEDIATEK\ - FW_MARVELL FW_RT61 FW_RTLWIFI FW_RTW88 + FW_MARVELL FW_RT61 FW_RTLWIFI FW_RTW88 FW_RTW89 FW_ATH10K_DESC= Qualcomm Atheros 802.11ac FW_ATH11K_DESC= Qualcomm Atheros 802.11ax @@ -68,10 +76,10 @@ FW_MARVELL_DESC= Marvell 88W8xxx (TopDog) 802.11b/g/n FW_RT61_DESC= Ralink RT2xxx (RT61) 802.11a/b/g FW_RTLWIFI_DESC= Realtek 802.11n FW_RTW88_DESC= Realtek 802.11ac +FW_RTW89_DESC= Realtek 802.11ax FW_TI_DESC= Texas Instruments WL1xxx 802.11b/g/n XX_DRIVER_WL_DESC= Broadcom 802.11 STA driver (+ firmware, exclusive) -XX_DRIVER_RTW89_DESC= Realtek 802.11ax driver (+ firmware) .endif _GITHUB_SITE= https://github.com/pgj/freebsd-wifibox-alpine/releases/download @@ -79,10 +87,11 @@ _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= f8fd8cdb1a0e545272917fe1dc1f9544cf74e383:scripts +GH_TAGNAME= 8439c9ac04c3220f148f81aedc15b9660d0d8509:scripts + +ALPINE_VERSION= 3.17.1 +ALPINE_DATE= 2023.01.28 -ALPINE_VERSION= 3.16.0 -ALPINE_DATE= 2022.07.09 _ALPINE_VER= ${ALPINE_VERSION:C@([0-9]+)\.([0-9]+).*@\1.\2@} .if defined(ALPINE_DATE) @@ -93,7 +102,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= 20220708 +_LINUXFW_TAG= 20230117 _LINUXFW= linux-firmware-${_LINUXFW_TAG} MASTER_SITES+= ${_ALPINE_SITE}/releases/x86_64/:rootfs \ @@ -107,25 +116,24 @@ MASTER_SITES+= ${_ALPINE_SITE}/releases/x86_64/:rootfs \ https://github.com/openwrt/mt76/archive/:mt76 _MINIROOTFS= alpine-minirootfs-${ALPINE_VERSION}-x86_64.tar.gz -_PACKAGES= baselayout-3.2.0-r19:wifibox \ - busybox-1.35.0-r0:wifibox \ +_PACKAGES= baselayout-3.4.0-r0:wifibox \ + busybox-1.35.0-r3:wifibox \ ifupdown-ng-0.12.1-r0:wifibox \ iptables-1.8.8-r0:wifibox \ - iw-5.16-r0:community \ - libcrypto1.1-1.1.1o-r0 \ + iw-5.19-r0 \ + libcap2-2.66-r0 \ + libcap-utils-2.66-r0 \ + libcrypto3-3.0.7-r2 \ libmnl-1.0.5-r0 \ - libnftnl-1.2.1-r0 \ - libnl3-3.5.0-r0 \ - libssl1.1-1.1.1o-r0 \ - linux-lts-5.15.53-r0:wifibox \ - musl-1.2.3-r0 \ - openrc-0.44.10-r0:wifibox - -.if !defined(_GUEST_MEM) -_GUEST_MEM= 64M -.endif - -_BOOT_SERVICES= networking urandom bootmisc modules hostname hwclock sysctl syslog + libnftnl-1.2.4-r0 \ + libnl3-3.7.0-r0 \ + libssl3-3.0.7-r2 \ + linux-lts-5.15.90-r0:wifibox \ + musl-1.2.3-r4 \ + openrc-0.45.2-r0:wifibox + +_BOOT_SERVICES= bootmisc defaults modules hostname hwclock networking sysctl \ + syslog urandom _DEFAULT_SERVICES= acpid crond iptables udhcpd _SYSINIT_SERVICES= devfs dmesg hwdrivers mdev @@ -136,7 +144,7 @@ _IPW2100_FIRMWARE= ipw/ipw2100-1.3 \ ipw/ipw2100-1.3-i _IPW2200_FIRMWARE= iwi/ipw2200-bss \ iwi/ipw2200-ibss -_MT76_FIRMWARE= b6e865e2cc7080c91ec34a9dd3648d25f7ce04c6 +_MT76_FIRMWARE= 5b509e80384ab019ac11aa90c81ec0dbb5b0d7f2 _LINUX64_KMOD!= (kldstat -qn linux64 && echo "found") || echo "" @@ -160,9 +168,16 @@ pre-everything:: _BOOT_SERVICES+= uds_passthru .endif +.if (${PORT_OPTIONS:MUDS_PASSTHRU} && empty(PORT_OPTIONS:MXX_FORWARDING)) || make(makesum) +_PACKAGES+= socat-1.7.4.4-r0:wifibox +.endif + +.if ${PORT_OPTIONS:MXX_FORWARDING} || make(makesum) +_PACKAGES+= socat-with-udp-1.7.4.4-r0:wifibox +.endif + .if ${PORT_OPTIONS:MUDS_PASSTHRU} || make(makesum) -_PACKAGES+= socat-1.7.4.3-r0:wifibox \ - uds_passthru-0.1.0-r0:wifibox +_PACKAGES+= uds_passthru-0.1.1-r1:wifibox .endif .if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT} @@ -172,8 +187,8 @@ _ETC_SRCS= etc/wpa_supplicant .endif .if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT} || make(makesum) -_PACKAGES+= pcsc-lite-libs-1.9.6-r0 \ - wpa_supplicant-2.10-r0:wifibox +_PACKAGES+= pcsc-lite-libs-1.9.9-r0 \ + wpa_supplicant-2.10-r1:wifibox .endif .if ${PORT_OPTIONS:MAPP_HOSTAPD} @@ -183,7 +198,35 @@ _ETC_SRCS= etc/hostapd .endif .if ${PORT_OPTIONS:MAPP_HOSTAPD} || make(makesum) -_PACKAGES+= hostapd-2.10-r1:wifibox +_PACKAGES+= hostapd-2.10-r2:wifibox +.endif + +.if ${PORT_OPTIONS:MXX_MDNS} +_DEFAULT_SERVICES+= mdnsresponderposix +_ETC_SRCS+= etc/optional/mdns +.endif + +.if ${PORT_OPTIONS:MXX_MDNS} || make(makesum) +_PACKAGES+= mbedtls-2.28.2-r0 \ + mDNSResponder-1790.80.10-r0:wifibox +.endif + +.if ${PORT_OPTIONS:MXX_FORWARDING} +_BOOT_SERVICES+= forwarding +_ETC_SRCS+= etc/optional/forwarding +.endif + +.if ${PORT_OPTIONS:MXX_FORWARDING} || make(makesum) +_PACKAGES+= forwarding-0.1.0-r1:wifibox +.endif + +.if ${PORT_OPTIONS:MXX_TCPDUMP} || make(makesum) +_PACKAGES+= libpcap-1.10.1-r1 \ + tcpdump-4.99.1-r4 +.endif + +.if ${PORT_OPTIONS:MXX_MDNS} || ${PORT_OPTIONS:MXX_FORWARDING} +PKGMESSAGE= pkg-message.iptables .endif .for flavor in ${_FLAVORS} @@ -206,6 +249,7 @@ LFW_MARVELL_FILES= mwl* LFW_RT61_FILES= rt*.bin LFW_RTLWIFI_FILES= rtlwifi LFW_RTW88_FILES= rtw88 +LFW_RTW89_FILES= rtw89 LFW_TI_FILES= ti-connectivity .for fw_opt in ${PORT_OPTIONS:MFW_*} @@ -214,20 +258,16 @@ LINUX_FIRMWARE+= ${L${fw_opt}_FILES} .endif .endfor -.if ${FLAVOR:U} == iwlwifi -_GUEST_MEM= 45M -.endif - .if ${PORT_OPTIONS:MFW_RTW88} || make(makesum) -_PACKAGES+= rtl8821ce-20220601-r0:wifibox +_PACKAGES+= rtl8821ce-20230101-r0:wifibox .endif -.if ${PORT_OPTIONS:MXX_DRIVER_WL} || make(makesum) -_PACKAGES+= broadcom-wl-6.30.223.271-r4:wifibox +.if ${PORT_OPTIONS:MFW_RTW89} || make(makesum) +_PACKAGES+= rtw89-20230117-r0:wifibox .endif -.if ${PORT_OPTIONS:MXX_DRIVER_RTW89} || make(makesum) -_PACKAGES+= rtw89-20220630-r0:wifibox +.if ${PORT_OPTIONS:MXX_DRIVER_WL} || make(makesum) +_PACKAGES+= broadcom-wl-6.30.223.271-r7:wifibox .endif .if !empty(LINUX_FIRMWARE) @@ -326,8 +366,6 @@ post-install: .if ${PORT_OPTIONS:MAPP_HOSTAPD} && ${PORT_OPTIONS:MUDS_PASSTHRU} ${MKDIR} ${STAGEDIR}/var/run/hostapd .endif - ${PRINTF} "cpus=1\nmemory=${_GUEST_MEM}\n" \ - > ${STAGEDIR}${PREFIX}/share/wifibox/bhyve.conf WRKSRC= ${WRKSRC_scripts} MAKE_ARGS+= VERSION=${PORTVERSION} \ diff --git a/net/wifibox-alpine/distinfo b/net/wifibox-alpine/distinfo index b3df095e9611..a0ee0342b716 100644 --- a/net/wifibox-alpine/distinfo +++ b/net/wifibox-alpine/distinfo @@ -1,57 +1,67 @@ -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-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 -SIZE (wifibox-alpine/busybox-1.35.0-r0.apk) = 341254 +TIMESTAMP = 1675236940 +SHA256 (wifibox-alpine/alpine-minirootfs-3.17.1-x86_64.tar.gz) = 602c903f27eb8f4b2983f5216cb5f3f4312b90ac5c314933e76c29969b82f410 +SIZE (wifibox-alpine/alpine-minirootfs-3.17.1-x86_64.tar.gz) = 3252080 +SHA256 (wifibox-alpine/linux-firmware-20230117.tar.gz) = b50362c9fedb05083a3efdf461888813ec654f1864a41ce73b5aa8feba1542a8 +SIZE (wifibox-alpine/linux-firmware-20230117.tar.gz) = 488295349 +SHA256 (wifibox-alpine/baselayout-3.4.0-r0.apk) = 685d44019c003bb38b7d079e1b84f000bc40a65f24da7801c200dbfb25af0e05 +SIZE (wifibox-alpine/baselayout-3.4.0-r0.apk) = 14580 +SHA256 (wifibox-alpine/busybox-1.35.0-r3.apk) = 437c26d129b566cab370955766cd9e853bbf331c596e5423054a13bfad755b44 +SIZE (wifibox-alpine/busybox-1.35.0-r3.apk) = 343126 SHA256 (wifibox-alpine/ifupdown-ng-0.12.1-r0.apk) = 95b661045ef53e22a28038f735efcfbc6ae23a3b25034df7bfade1c270d4b835 SIZE (wifibox-alpine/ifupdown-ng-0.12.1-r0.apk) = 30021 SHA256 (wifibox-alpine/iptables-1.8.8-r0.apk) = 68441976ea0152094619db62acccb2ba499918c0b6ecee4b410b63cb8d1d6555 SIZE (wifibox-alpine/iptables-1.8.8-r0.apk) = 463203 -SHA256 (wifibox-alpine/iw-5.16-r0.apk) = 7f15257785fb784cdd7a6489749559456241158dddddba363dd12c9a46f2e54d -SIZE (wifibox-alpine/iw-5.16-r0.apk) = 99193 -SHA256 (wifibox-alpine/libcrypto1.1-1.1.1o-r0.apk) = e739df69f3e8c4fc9ff298262969b6666d27734dee1fbf16097189957bb6b8c2 -SIZE (wifibox-alpine/libcrypto1.1-1.1.1o-r0.apk) = 1212701 -SHA256 (wifibox-alpine/libmnl-1.0.5-r0.apk) = 9da10898d53da7e8dbc3b2f6646f383e7f0b5833f6d16f2cadf394142bebfe07 -SIZE (wifibox-alpine/libmnl-1.0.5-r0.apk) = 9403 -SHA256 (wifibox-alpine/libnftnl-1.2.1-r0.apk) = 9c7bd7d03b9e3237c18e95939fa7a9ba3c99a63934e53c2eae5a3b4dd65fa790 -SIZE (wifibox-alpine/libnftnl-1.2.1-r0.apk) = 70586 -SHA256 (wifibox-alpine/libnl3-3.5.0-r0.apk) = 6c2b08987842a852fed9e4946ee53b0cd7f815177a0ff2c0046709a4d608f6ad -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.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 -SIZE (wifibox-alpine/openrc-0.44.10-r0.apk) = 344405 -SHA256 (wifibox-alpine/socat-1.7.4.3-r0.apk) = dde6a219b383cf3c1b3101de3ab3907dc37a823438642633f4015023d5e3aef5 -SIZE (wifibox-alpine/socat-1.7.4.3-r0.apk) = 69740 -SHA256 (wifibox-alpine/uds_passthru-0.1.0-r0.apk) = d52e8ce222ad0a03256f44ff63cececd9218b618c4cd5e4410251d6c33164869 -SIZE (wifibox-alpine/uds_passthru-0.1.0-r0.apk) = 2708 -SHA256 (wifibox-alpine/pcsc-lite-libs-1.9.6-r0.apk) = b2392684aec6bc182076fa90412209287a37c74ec8557898802b12d34c54e54e -SIZE (wifibox-alpine/pcsc-lite-libs-1.9.6-r0.apk) = 18292 -SHA256 (wifibox-alpine/wpa_supplicant-2.10-r0.apk) = abc08bd813bc4b7831e294f9cc414481f130b4409eef0fab0aa82cac4909e59d -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/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 -SIZE (wifibox-alpine/wl_apsta-3.130.20.0.o) = 652866 -SHA256 (wifibox-alpine/broadcom-wl-6.30.163.46.tar.bz2) = a07c3b6b277833c7dbe61daa511f908cd66c5e2763eb7a0859abc36cd9335c2d -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-f8fd8cdb1a0e545272917fe1dc1f9544cf74e383_GH0.tar.gz) = 56855339476bfc9153cc093ec930051f37c565d96114f263889b9a724e60c897 -SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-f8fd8cdb1a0e545272917fe1dc1f9544cf74e383_GH0.tar.gz) = 140316 +SHA256 (wifibox-alpine/iw-5.19-r0.apk) = ad4f24da293c7acbbaea0a725bd257a896d20c856548c67084481ab934c6a736 +SIZE (wifibox-alpine/iw-5.19-r0.apk) = 101791 +SHA256 (wifibox-alpine/libcap2-2.66-r0.apk) = 77342435302175fe0e9946d2b226d9d1a12e714849ddd7d4f421c93e63ca04f8 +SIZE (wifibox-alpine/libcap2-2.66-r0.apk) = 23461 +SHA256 (wifibox-alpine/libcap-utils-2.66-r0.apk) = 72d232845f50b2d2d8897640d4b57f8b9b5be1ca81312597b0215ab0561f2e1b +SIZE (wifibox-alpine/libcap-utils-2.66-r0.apk) = 26399 +SHA256 (wifibox-alpine/libcrypto3-3.0.7-r2.apk) = 8f4177a26e25d9550e15cfa822cd1aa547c1168b0483483c1ea5614fce7bed46 +SIZE (wifibox-alpine/libcrypto3-3.0.7-r2.apk) = 1707139 +SHA256 (wifibox-alpine/libmnl-1.0.5-r0.apk) = ca68dd99193cc4936422da14c50930da17e894b7fac2d76cef3c1817581c2c0d +SIZE (wifibox-alpine/libmnl-1.0.5-r0.apk) = 9352 +SHA256 (wifibox-alpine/libnftnl-1.2.4-r0.apk) = 365b32343824555ebb2c6d03c5cab0364ff2f743aed2c0c4d0e44151989f05eb +SIZE (wifibox-alpine/libnftnl-1.2.4-r0.apk) = 70349 +SHA256 (wifibox-alpine/libnl3-3.7.0-r0.apk) = ede0b4fa32c44ed13ef23616856f173d6f9fd7de1787426e8009cbd04f03802d +SIZE (wifibox-alpine/libnl3-3.7.0-r0.apk) = 341514 +SHA256 (wifibox-alpine/libssl3-3.0.7-r2.apk) = 125c7f4c79671b98ed297515172be318943a6a35fa9f418b1ac49e2d689b07a2 +SIZE (wifibox-alpine/libssl3-3.0.7-r2.apk) = 246098 +SHA256 (wifibox-alpine/linux-lts-5.15.90-r0.apk) = 37ab00cffc025bfa8acd7bda49e1b60e81fd26b8f48cc4c8b0cab1f27f3177e8 +SIZE (wifibox-alpine/linux-lts-5.15.90-r0.apk) = 7526873 +SHA256 (wifibox-alpine/musl-1.2.3-r4.apk) = 2a77f358c803ae9e2ec35ccf4906019df9b92d96c13e207d92ccabd13aec80eb +SIZE (wifibox-alpine/musl-1.2.3-r4.apk) = 388955 +SHA256 (wifibox-alpine/openrc-0.45.2-r0.apk) = 8c1517e9ff8ea97921932e8c1025e00d294a18b6c8f651641cd88110b31aa129 +SIZE (wifibox-alpine/openrc-0.45.2-r0.apk) = 340778 +SHA256 (wifibox-alpine/socat-1.7.4.4-r0.apk) = bc4f963342af0bc4ef3039c04ddd9f737583c81f62615cae814b0137ea0ca92b +SIZE (wifibox-alpine/socat-1.7.4.4-r0.apk) = 69653 +SHA256 (wifibox-alpine/socat-with-udp-1.7.4.4-r0.apk) = ce181eec04ab2daab5f0e1808596c70cc254861697c981310bef924375fff20f +SIZE (wifibox-alpine/socat-with-udp-1.7.4.4-r0.apk) = 73118 +SHA256 (wifibox-alpine/uds_passthru-0.1.1-r1.apk) = f9128a80d06f06b41a74c470fbc7415e9019b0641f3cf5ca72ede422f2cc53e6 +SIZE (wifibox-alpine/uds_passthru-0.1.1-r1.apk) = 2739 +SHA256 (wifibox-alpine/pcsc-lite-libs-1.9.9-r0.apk) = fc3c54c0d03a6168236b9448f49bda06e9df8fb1614e42c91d9b9efa6c9fc7d3 +SIZE (wifibox-alpine/pcsc-lite-libs-1.9.9-r0.apk) = 18473 +SHA256 (wifibox-alpine/wpa_supplicant-2.10-r1.apk) = 4c47b6ac8e5d8d8c84ea9a3690d2048c361514907c72ebe5356b888ee59c54a7 +SIZE (wifibox-alpine/wpa_supplicant-2.10-r1.apk) = 825189 +SHA256 (wifibox-alpine/hostapd-2.10-r2.apk) = a3bf79e0b8f67d03d187cf98eea337561a05875fb9573523c831ef3d1cdaf50b +SIZE (wifibox-alpine/hostapd-2.10-r2.apk) = 500495 +SHA256 (wifibox-alpine/mbedtls-2.28.2-r0.apk) = 5b1398a46b6120a2c190d949a3d10e48037d8cfa182e8f4c8f8122ef6f776ed5 +SIZE (wifibox-alpine/mbedtls-2.28.2-r0.apk) = 317238 +SHA256 (wifibox-alpine/mDNSResponder-1790.80.10-r0.apk) = 4b575bf0ac5f72e1bd5ed28062356dd3988c6d5498bf35bef7ab215065468449 +SIZE (wifibox-alpine/mDNSResponder-1790.80.10-r0.apk) = 183906 +SHA256 (wifibox-alpine/forwarding-0.1.0-r1.apk) = 79d24af3e49fc7e2738e2ff8fc13b6773f339b7c1788c4253128664ac16ea9a1 +SIZE (wifibox-alpine/forwarding-0.1.0-r1.apk) = 2305 +SHA256 (wifibox-alpine/libpcap-1.10.1-r1.apk) = 9f297cfaf748b6fb8b701801787483bc0d0863e6e7215f922b4e805fc1446cfd +SIZE (wifibox-alpine/libpcap-1.10.1-r1.apk) = 107997 +SHA256 (wifibox-alpine/tcpdump-4.99.1-r4.apk) = 531927fe8dcbd785e67355b7f819c4ab734c3bddefc9dac16237925e16b44ad2 +SIZE (wifibox-alpine/tcpdump-4.99.1-r4.apk) = 414439 +SHA256 (wifibox-alpine/rtl8821ce-20230101-r0.apk) = 57ca6547d29247c35d7770dcc34ee48d183a13146bde3335e2869872e0497a32 +SIZE (wifibox-alpine/rtl8821ce-20230101-r0.apk) = 584323 +SHA256 (wifibox-alpine/rtw89-20230117-r0.apk) = d4fd5af23823c25c8284b30a565340d3940c97d31a4c37b57f424802e4e80276 +SIZE (wifibox-alpine/rtw89-20230117-r0.apk) = 334420 +SHA256 (wifibox-alpine/broadcom-wl-6.30.223.271-r7.apk) = 378b52c1afad70126967a4aa5d1b45e563e99dce682c1d1c91c2453096bddec0 +SIZE (wifibox-alpine/broadcom-wl-6.30.223.271-r7.apk) = 1466109 +SHA256 (wifibox-alpine/5b509e80384ab019ac11aa90c81ec0dbb5b0d7f2.zip) = 3b9ab19a1288f4c0d4a20001f7932dcdf4d12173c8662ad33e033a771a3b4b92 +SIZE (wifibox-alpine/5b509e80384ab019ac11aa90c81ec0dbb5b0d7f2.zip) = 6900820 +SHA256 (wifibox-alpine/pgj-freebsd-wifibox-alpine-8439c9ac04c3220f148f81aedc15b9660d0d8509_GH0.tar.gz) = 5f2be2b574dd24d142e06c6c7554f721a4d559724932eed818965c382aa00514 +SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-8439c9ac04c3220f148f81aedc15b9660d0d8509_GH0.tar.gz) = 145010 diff --git a/net/wifibox-alpine/flavors.mk b/net/wifibox-alpine/flavors.mk index 95a088698aaa..4c116fe9c42c 100644 --- a/net/wifibox-alpine/flavors.mk +++ b/net/wifibox-alpine/flavors.mk @@ -1,3 +1,3 @@ -_FLAVORS= ath10k ath11k brcm iwlwifi mediatek marvell rt61 rtlwifi rtw88 +_FLAVORS= ath10k ath11k brcm iwlwifi mediatek marvell rt61 rtlwifi rtw88 rtw89 FLAVORS= default ${_FLAVORS} FLAVOR?= default diff --git a/net/wifibox-alpine/pkg-plist b/net/wifibox-alpine/pkg-plist index 3ed29d104e52..8be7df51d915 100644 --- a/net/wifibox-alpine/pkg-plist +++ b/net/wifibox-alpine/pkg-plist @@ -1,12 +1,14 @@ +@sample(,,640) etc/wifibox/appliance/hostname.sample @sample(,,640) etc/wifibox/appliance/interfaces.conf.sample @sample(,,640) etc/wifibox/appliance/iptables.sample @sample(,,640) etc/wifibox/appliance/udhcpd.conf.sample %%UDS_PASSTHRU%%@sample(,,640) etc/wifibox/appliance/uds_passthru.conf.sample %%APP_WPA_SUPPLICANT%%@sample(,,640) etc/wifibox/wpa_supplicant/wpa_supplicant.conf.sample %%APP_HOSTAPD%%@sample(,,640) etc/wifibox/hostapd/hostapd.conf.sample +%%XX_MDNS%%@sample(,,640) etc/wifibox/appliance/mdnsd-services.conf.sample +%%XX_FORWARDING%%@sample(,,640) etc/wifibox/appliance/forwarding.conf.sample etc/wifibox/app_config man/man5/wifibox-alpine.5.gz -share/wifibox/bhyve.conf share/wifibox/disk.img share/wifibox/grub.cfg share/wifibox/vmlinuz diff --git a/net/wifibox-core/Makefile b/net/wifibox-core/Makefile index 933e40dbe947..99fdcf027c1c 100644 --- a/net/wifibox-core/Makefile +++ b/net/wifibox-core/Makefile @@ -1,5 +1,5 @@ PORTNAME= wifibox-core -PORTVERSION= 0.10.0 +PORTVERSION= 0.11.0 CATEGORIES= net MAINTAINER= pali.gabor@gmail.com @@ -14,9 +14,17 @@ ONLY_FOR_ARCHS= amd64 RUN_DEPENDS= grub2-bhyve>0:sysutils/grub2-bhyve OPTIONS_DEFINE= BHYVE_PLUS -OPTIONS_DEFAULT= # + +OPTIONS_SINGLE= RECOVERY +OPTIONS_SINGLE_RECOVERY= RECOVER_RESTART_VMM RECOVER_SUSPEND_GUEST RECOVER_NONE + +OPTIONS_DEFAULT= RECOVER_RESTART_VMM OPTIONS_EXCLUDE_FreeBSD_12= BHYVE_PLUS +RECOVER_RESTART_VMM_DESC= Restart the vmm(4) kernel module on resume +RECOVER_SUSPEND_GUEST_DESC= Stop the guest on suspend, start on resume +RECOVER_NONE_DESC= No recovery for suspend/resume + BHYVE_PLUS_DESC= Use bhyve+ (experimental) .include <bsd.port.options.mk> @@ -33,7 +41,8 @@ GH_PROJECT= freebsd-wifibox NO_BUILD= yes MAKE_ARGS+= GUEST_ROOT=${LOCALBASE}/share/wifibox \ GUEST_MAN=${LOCALBASE}/man/man5/wifibox-alpine.5.gz \ - VERSION=${PORTVERSION} + VERSION=${PORTVERSION} \ + RECOVERY_METHOD=${PORT_OPTIONS:MRECOVER_*:S/RECOVER_//:tl} .if defined(_BHYVE_PLUS) MAKE_ARGS+= BHYVE=${LOCALBASE}/sbin/bhyve \ BHYVECTL=${LOCALBASE}/sbin/bhyvectl \ diff --git a/net/wifibox-core/distinfo b/net/wifibox-core/distinfo index ab19835e8833..0aae0960a5ef 100644 --- a/net/wifibox-core/distinfo +++ b/net/wifibox-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656275716 -SHA256 (pgj-freebsd-wifibox-0.10.0_GH0.tar.gz) = 948a54e405da9d99c69b3ea72e44a19479a457ecefcc7ed415a8365d740c06c3 -SIZE (pgj-freebsd-wifibox-0.10.0_GH0.tar.gz) = 14681 +TIMESTAMP = 1672447163 +SHA256 (pgj-freebsd-wifibox-0.11.0_GH0.tar.gz) = c0dfbc052adbe4f4b80b2edd1c2d6d8f2079a8dc083a267741626cddf2589e6e +SIZE (pgj-freebsd-wifibox-0.11.0_GH0.tar.gz) = 15217 diff --git a/net/wifibox/Makefile b/net/wifibox/Makefile index 61abf7abee35..e2d93d5cbc27 100644 --- a/net/wifibox/Makefile +++ b/net/wifibox/Makefile @@ -1,5 +1,5 @@ PORTNAME= wifibox -PORTVERSION= 1.1.1 +PORTVERSION= 1.2.0 CATEGORIES= net MAINTAINER= pali.gabor@gmail.com
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302071731.317HV9Us003085>