git: 23aeb02e858c - main - net/wifibox: Update to 1.2.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 28 Mar 2023 09:09:04 UTC
The branch main has been updated by ashish:
URL: https://cgit.FreeBSD.org/ports/commit/?id=23aeb02e858c0f9fdb0cc219439c2abc6481b179
commit 23aeb02e858c0f9fdb0cc219439c2abc6481b179
Author: PÁLI Gábor János <pali.gabor@gmail.com>
AuthorDate: 2023-03-28 00:01:02 +0000
Commit: Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2023-03-28 09:07:10 +0000
net/wifibox: Update to 1.2.2
- Add missing `pkg-message` file
Changes: https://github.com/pgj/freebsd-wifibox-port/releases/tag/1.2.2
---
net/wifibox-alpine/Makefile | 72 ++++++++++++++++++++-------------
net/wifibox-alpine/distinfo | 48 ++++++++++++----------
net/wifibox-alpine/pkg-message.iptables | 11 +++++
net/wifibox/Makefile | 2 +-
4 files changed, 84 insertions(+), 49 deletions(-)
diff --git a/net/wifibox-alpine/Makefile b/net/wifibox-alpine/Makefile
index 1cebd430b48a..d324f46c40f7 100644
--- a/net/wifibox-alpine/Makefile
+++ b/net/wifibox-alpine/Makefile
@@ -1,5 +1,5 @@
PORTNAME= wifibox-alpine
-PORTVERSION= 20230213
+PORTVERSION= 20230326
CATEGORIES= net
MAINTAINER= pali.gabor@gmail.com
@@ -87,10 +87,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= 1d7ee312302982362deb03dc74bc32bd99238d82:scripts
+GH_TAGNAME= d0d856b049361e83b2c27ac2bb66d5971ead2f06:scripts
ALPINE_VERSION= 3.17.2
-ALPINE_DATE= 2023.02.11
+ALPINE_DATE= 2023.03.25
_ALPINE_VER= ${ALPINE_VERSION:C@([0-9]+)\.([0-9]+).*@\1.\2@}
@@ -102,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= 20230210
+_LINUXFW_TAG= 20230310
_LINUXFW= linux-firmware-${_LINUXFW_TAG}
MASTER_SITES+= ${_ALPINE_SITE}/releases/x86_64/:rootfs \
@@ -123,12 +123,12 @@ _PACKAGES= baselayout-3.4.0-r0:wifibox \
iw-5.19-r0 \
libcap2-2.66-r0 \
libcap-utils-2.66-r0 \
- libcrypto3-3.0.8-r0 \
+ libcrypto3-3.0.8-r1 \
libmnl-1.0.5-r0 \
libnftnl-1.2.4-r0 \
libnl3-3.7.0-r0 \
- libssl3-3.0.8-r0 \
- linux-lts-5.15.93-r0:wifibox \
+ libssl3-3.0.8-r1 \
+ linux-lts-5.15.104-r0:wifibox \
musl-1.2.3-r4 \
openrc-0.45.2-r0:wifibox
@@ -144,7 +144,7 @@ _IPW2100_FIRMWARE= ipw/ipw2100-1.3 \
ipw/ipw2100-1.3-i
_IPW2200_FIRMWARE= iwi/ipw2200-bss \
iwi/ipw2200-ibss
-_MT76_FIRMWARE= 09c614734880865d1b4033b8cab4e9db86db4b15
+_MT76_FIRMWARE= 021ded363dfeafb8e71bb5a3901449faca9bb011
_LINUX64_KMOD!= (kldstat -qn linux64 && echo "found") || echo ""
@@ -168,15 +168,16 @@ pre-everything::
_BOOT_SERVICES+= uds_passthru
.endif
-.if (${PORT_OPTIONS:MUDS_PASSTHRU} && empty(PORT_OPTIONS:MXX_FORWARDING)) || make(makesum)
+.if (${PORT_OPTIONS:MUDS_PASSTHRU} && empty(PORT_OPTIONS:MXX_FORWARDING)) \
+ || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= socat-1.7.4.4-r0:wifibox
.endif
-.if ${PORT_OPTIONS:MXX_FORWARDING} || make(makesum)
+.if ${PORT_OPTIONS:MXX_FORWARDING} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= socat-with-udp-1.7.4.4-r0:wifibox
.endif
-.if ${PORT_OPTIONS:MUDS_PASSTHRU} || make(makesum)
+.if ${PORT_OPTIONS:MUDS_PASSTHRU} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= uds_passthru-0.1.1-r1:wifibox
.endif
@@ -186,9 +187,9 @@ _BOOT_SERVICES+= wpa_supplicant
_ETC_SRCS= etc/wpa_supplicant
.endif
-.if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT} || make(makesum)
+.if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= pcsc-lite-libs-1.9.9-r0 \
- wpa_supplicant-2.10-r1:wifibox
+ wpa_supplicant-2.10-r3:wifibox
.endif
.if ${PORT_OPTIONS:MAPP_HOSTAPD}
@@ -197,7 +198,7 @@ _BOOT_SERVICES+= hostapd
_ETC_SRCS= etc/hostapd
.endif
-.if ${PORT_OPTIONS:MAPP_HOSTAPD} || make(makesum)
+.if ${PORT_OPTIONS:MAPP_HOSTAPD} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= hostapd-2.10-r2:wifibox
.endif
@@ -206,7 +207,7 @@ _DEFAULT_SERVICES+= mdnsresponderposix
_ETC_SRCS+= etc/optional/mdns
.endif
-.if ${PORT_OPTIONS:MXX_MDNS} || make(makesum)
+.if ${PORT_OPTIONS:MXX_MDNS} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= mbedtls-2.28.2-r0 \
mDNSResponder-1790.80.10-r0:wifibox
.endif
@@ -216,11 +217,11 @@ _BOOT_SERVICES+= forwarding
_ETC_SRCS+= etc/optional/forwarding
.endif
-.if ${PORT_OPTIONS:MXX_FORWARDING} || make(makesum)
+.if ${PORT_OPTIONS:MXX_FORWARDING} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= forwarding-0.1.0-r1:wifibox
.endif
-.if ${PORT_OPTIONS:MXX_TCPDUMP} || make(makesum)
+.if ${PORT_OPTIONS:MXX_TCPDUMP} || make(makesum) || make(fetch-url-list-int)
_PACKAGES+= libpcap-1.10.1-r1 \
tcpdump-4.99.1-r4
.endif
@@ -258,21 +259,24 @@ LINUX_FIRMWARE+= ${L${fw_opt}_FILES}
.endif
.endfor
-.if ${PORT_OPTIONS:MFW_RTW88} || make(makesum)
-_PACKAGES+= rtl8821ce-20230101-r1:wifibox
+.if ${PORT_OPTIONS:MFW_RTW88} || make(makesum) || make(fetch-url-list-int)
+_PACKAGES+= rtl8821ce-20230101-r3:wifibox
.endif
-.if ${PORT_OPTIONS:MFW_RTW89} || make(makesum)
-_PACKAGES+= rtw89-20230117-r1:wifibox
+.if ${PORT_OPTIONS:MFW_RTW89} || make(makesum) || make(fetch-url-list-int)
+_PACKAGES+= rtw89-20230325-r0:wifibox
.endif
-.if ${PORT_OPTIONS:MXX_DRIVER_WL} || make(makesum)
-_PACKAGES+= broadcom-wl-6.30.223.271-r8:wifibox
+.if ${PORT_OPTIONS:MXX_DRIVER_WL} || make(makesum) || make(fetch-url-list-int)
+_PACKAGES+= broadcom-wl-6.30.223.271-r10:wifibox
.endif
.if !empty(LINUX_FIRMWARE)
_LINUXFWFILE= ${_LINUXFW}.tar.gz
_LINUXFWDIR= ${WRKDIR}/${_LINUXFW}
+.endif
+
+.if !empty(LINUX_FIRMWARE) || make(makesum)
DISTFILES+= ${_LINUXFWFILE}:linux_firmware
.endif
@@ -291,19 +295,22 @@ _GUESTDIR= ${WRKSRC}/guest
_ETCDIR= ${_GUESTDIR}/etc
_FIRMWAREDIR= ${_GUESTDIR}/lib/firmware
-.if ${PORT_OPTIONS:MFW_ATMEL}
+.if ${PORT_OPTIONS:MFW_ATMEL} || make(makesum)
DISTFILES+= ${_ATMEL_FIRMWARE}.tar.gz:atmel
.endif
-.if ${PORT_OPTIONS:MFW_B43LEGACY}
+.if ${PORT_OPTIONS:MFW_B43LEGACY} || make(makesum)
DISTFILES+= ${_B43LEGACY_FIRMWARE}.o:openwrt
.endif
.if ${PORT_OPTIONS:MFW_B43}
-DISTFILES+= ${_B43_FIRMWARE}.tar.bz2:b43
EXTRACT_ONLY+= ${_B43_FIRMWARE}.tar.bz2
.endif
+.if ${PORT_OPTIONS:MFW_B43} || make(makesum)
+DISTFILES+= ${_B43_FIRMWARE}.tar.bz2:b43
+.endif
+
.if ${PORT_OPTIONS:MFW_B43*}
BUILD_DEPENDS+= b43-fwcutter>0:sysutils/b43-fwcutter
FW_B43_TARGETDIR= ${_FIRMWAREDIR}/b43
@@ -316,7 +323,7 @@ FW_B43LEGACY_FIRMWARE= ${_DISTDIR}/${_B43LEGACY_FIRMWARE}.o
IGNORE= requires kernel source files in SRC_BASE=${SRC_BASE}
.endif
-.if ${PORT_OPTIONS:MFW_MEDIATEK}
+.if ${PORT_OPTIONS:MFW_MEDIATEK} || make(makesum)
DISTFILES+= ${_MT76_FIRMWARE}.zip:mt76
.endif
@@ -382,4 +389,15 @@ MAKE_ARGS+= VERSION=${PORTVERSION} \
MAKE_ARGS+= FIRMWARE_FILES=${FIRMWARE_FILES}
.endif
+.if make(check-alpine-packages)
+_APK_FETCH!= ${MAKE} fetch-urlall-list | ${GREP} apk | ${GREP} -v distcache
+.endif
+
+check-alpine-packages:
+.for apk in ${_APK_FETCH}
+ @${ECHO} -n "${apk:C@^.*/([0-9A-za-z\._-]*)@\1@} (${apk})..."
+ @${FETCH_CMD} -s ${apk} > /dev/null
+ @${ECHO} "OK"
+.endfor
+
.include <bsd.port.mk>
diff --git a/net/wifibox-alpine/distinfo b/net/wifibox-alpine/distinfo
index 1a3f7addf75f..cbbdd6d82dcb 100644
--- a/net/wifibox-alpine/distinfo
+++ b/net/wifibox-alpine/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1676246602
+TIMESTAMP = 1679795825
SHA256 (wifibox-alpine/alpine-minirootfs-3.17.2-x86_64.tar.gz) = b10fc6a33e462b9ccf704436071771051728d30f5d8b48adcddb9523c4c45328
SIZE (wifibox-alpine/alpine-minirootfs-3.17.2-x86_64.tar.gz) = 3258241
-SHA256 (wifibox-alpine/linux-firmware-20230210.tar.gz) = ccc2ff9d475f368fa915e509fddb2c3815189f9461a008db1af0f096a2bfdbd3
-SIZE (wifibox-alpine/linux-firmware-20230210.tar.gz) = 437057776
+SHA256 (wifibox-alpine/linux-firmware-20230310.tar.gz) = 14c472af10f9b566c4f575aeb30d8a274d54b1660007e7426b7e4ea21dff81aa
+SIZE (wifibox-alpine/linux-firmware-20230310.tar.gz) = 425102192
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
@@ -17,18 +17,18 @@ SHA256 (wifibox-alpine/libcap2-2.66-r0.apk) = 77342435302175fe0e9946d2b226d9d1a1
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.8-r0.apk) = ca6f566a28553e6e5ca61c7adc10a3db0dfb81057a50164d1b8b00003da37c93
-SIZE (wifibox-alpine/libcrypto3-3.0.8-r0.apk) = 1710217
+SHA256 (wifibox-alpine/libcrypto3-3.0.8-r1.apk) = 5f34ba03402e656ca0692257faba31233eee11c7db717db541451dc39b4a7a62
+SIZE (wifibox-alpine/libcrypto3-3.0.8-r1.apk) = 1710291
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.8-r0.apk) = 8c80a1c3261fac3b9030b9b546b4197f1808b6772ff2ce64d148e77247f2a0a6
-SIZE (wifibox-alpine/libssl3-3.0.8-r0.apk) = 246853
-SHA256 (wifibox-alpine/linux-lts-5.15.93-r0.apk) = 7c53145ed6241a756033dfaf26add145e45dd28c4a930887080f499b5281e930
-SIZE (wifibox-alpine/linux-lts-5.15.93-r0.apk) = 7529156
+SHA256 (wifibox-alpine/libssl3-3.0.8-r1.apk) = 3a8a2279188d4aa769448c0b9cc66b189158b3c60a29d20384ba4e44ed64ded7
+SIZE (wifibox-alpine/libssl3-3.0.8-r1.apk) = 246842
+SHA256 (wifibox-alpine/linux-lts-5.15.104-r0.apk) = 629cc425e52d2e72a2553a45d119e3c249f47d40dcd9d0e2b504f3c1c6e59fb8
+SIZE (wifibox-alpine/linux-lts-5.15.104-r0.apk) = 7541612
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
@@ -41,8 +41,8 @@ SHA256 (wifibox-alpine/uds_passthru-0.1.1-r1.apk) = f9128a80d06f06b41a74c470fbc7
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/wpa_supplicant-2.10-r3.apk) = 8ae607d52461795bdc3068ed3c5770be01f4be112b0a2b90f5935cd687ebfa00
+SIZE (wifibox-alpine/wpa_supplicant-2.10-r3.apk) = 864216
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
@@ -55,13 +55,19 @@ SHA256 (wifibox-alpine/libpcap-1.10.1-r1.apk) = 9f297cfaf748b6fb8b701801787483bc
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-r1.apk) = 8f695c93afcb33d10d7b2a849fffd1a05f819954873a9cbc20c2c4220a31addb
-SIZE (wifibox-alpine/rtl8821ce-20230101-r1.apk) = 586842
-SHA256 (wifibox-alpine/rtw89-20230117-r1.apk) = 511dee44e437f4ae4bb6fd2d267becccecec6f13b96581c53a0f1169ec0bd2e7
-SIZE (wifibox-alpine/rtw89-20230117-r1.apk) = 334493
-SHA256 (wifibox-alpine/broadcom-wl-6.30.223.271-r8.apk) = dc95c6cd294307a431ab15ec6fad554a3e57751d30a678ea4cef67018012d9ca
-SIZE (wifibox-alpine/broadcom-wl-6.30.223.271-r8.apk) = 1466268
-SHA256 (wifibox-alpine/09c614734880865d1b4033b8cab4e9db86db4b15.zip) = 9792e2ede967522de2b906cf3164466fb79cece2255fd4f2ad3ef53b4000d02f
-SIZE (wifibox-alpine/09c614734880865d1b4033b8cab4e9db86db4b15.zip) = 6905144
-SHA256 (wifibox-alpine/pgj-freebsd-wifibox-alpine-1d7ee312302982362deb03dc74bc32bd99238d82_GH0.tar.gz) = aa00a6eb5c26529fb16d300740aef472b1e7d910eb241071d9c3b36475140bc1
-SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-1d7ee312302982362deb03dc74bc32bd99238d82_GH0.tar.gz) = 145018
+SHA256 (wifibox-alpine/rtl8821ce-20230101-r3.apk) = d3a14a46a66a7c755842aee1178c212a45ee5e23b3fc2d3edcc41d0cc3aa5f84
+SIZE (wifibox-alpine/rtl8821ce-20230101-r3.apk) = 588646
+SHA256 (wifibox-alpine/rtw89-20230325-r0.apk) = 02a1acff9738a6acfba4e413679e4f01295260294be78ba7405c544f12987ba8
+SIZE (wifibox-alpine/rtw89-20230325-r0.apk) = 342152
+SHA256 (wifibox-alpine/broadcom-wl-6.30.223.271-r10.apk) = 8668102f5409403a9c7407effab3bd34b090ce5f4ec9a10223595b417fe5e221
+SIZE (wifibox-alpine/broadcom-wl-6.30.223.271-r10.apk) = 1465668
+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/021ded363dfeafb8e71bb5a3901449faca9bb011.zip) = bb39cc0a74e7208ce942165f6e3dd2a4ac02bf83a863d4fddb91c0907ca07d68
+SIZE (wifibox-alpine/021ded363dfeafb8e71bb5a3901449faca9bb011.zip) = 6905439
+SHA256 (wifibox-alpine/pgj-freebsd-wifibox-alpine-d0d856b049361e83b2c27ac2bb66d5971ead2f06_GH0.tar.gz) = 8b857eb266d1d0e79ea07069a91e1f0c34f7c6a10a80b9904f5088330b622ad0
+SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-d0d856b049361e83b2c27ac2bb66d5971ead2f06_GH0.tar.gz) = 146040
diff --git a/net/wifibox-alpine/pkg-message.iptables b/net/wifibox-alpine/pkg-message.iptables
new file mode 100644
index 000000000000..3bc3e99f9935
--- /dev/null
+++ b/net/wifibox-alpine/pkg-message.iptables
@@ -0,0 +1,11 @@
+[
+{ type: install
+ message: <<EOM
+
+The package was built with components that need to be aligned with the
+network packet filtering in order to make them work properly. Please
+consult the wifibox-alpine(5) manual page to learn about the details.
+
+EOM
+}
+]
diff --git a/net/wifibox/Makefile b/net/wifibox/Makefile
index 39ac24930454..808bf843ce01 100644
--- a/net/wifibox/Makefile
+++ b/net/wifibox/Makefile
@@ -1,5 +1,5 @@
PORTNAME= wifibox
-PORTVERSION= 1.2.1
+PORTVERSION= 1.2.2
CATEGORIES= net
MAINTAINER= pali.gabor@gmail.com