From nobody Mon Jun 27 11:34:35 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2B02C86827F; Mon, 27 Jun 2022 11:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LWlxm0Zwmz3K8w; Mon, 27 Jun 2022 11:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656329676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=or9V8Wn56bwsFyowwt/fJPBN6y5kqL5QDGDXJ2SWfxc=; b=kQX5/zOlK4djZ7bLo65duMYKb/bFs9doMvROVGeI6qFvL/k6Sx5AfnCaTcWK1V3ClyoTuW zx09/PWDzW6yuWmUSmvtfow8xG2JJ8G5VLF6IG4feeEG5efrXEa9Yn9g/6SY7xni5uuMwp FLMS1ShJm9GHUVeD/Xh1rHesoXFbAjZHt+ucAP8jPIq0k/ujsV8Evsht0dY1kI7pB2Eck0 H37CAeF43hGr8KfvX9miuG9ErCvO7lJJ/yyk1FR/IvAulVrXgv81cOIxAE84CcdDvC1Tz2 aHxIEUpeHDZQ1lx7OTHeQR4RgNdUx0noFT/27ZnrVLZvzfznVeKpAvsndjN6bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E88A227896; Mon, 27 Jun 2022 11:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25RBYZlf064789; Mon, 27 Jun 2022 11:34:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25RBYZbO064788; Mon, 27 Jun 2022 11:34:35 GMT (envelope-from git) Date: Mon, 27 Jun 2022 11:34:35 GMT Message-Id: <202206271134.25RBYZbO064788@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 466b6f0c645f - main - net/wifibox*: Update to 1.1.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 466b6f0c645fe1cc208bb15c77ba24ebb2813b77 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656329676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=or9V8Wn56bwsFyowwt/fJPBN6y5kqL5QDGDXJ2SWfxc=; b=CJl98xEl9Ux87da6pNFjLfJqeRxmQeeRSzXVZyPL9bc34ZJ3VrvNEZvVzwKb2HfRYmmZaU RKvwQ7kMP9RnhGD9hRr/45cSrTeAR4UtPdL08aWnqiTCkKkGn9gY9hbfrzkGtIKaWyC0OY 1KZaFd+0zkJZe2Y4XK7zMtQ9FzeXY3w/ChIqTu/dp14PEb4XjR01AuzTbxJw6K4tdvKqwt lKraDLGR9WOU0rCDjtavC8lEyo+Ac7R975AyFF5UywBQ7NQna9ME8p7NJlx8xN+8O003AQ YQs1dpap4Pxn5wvtTHT4JHvJa2WtWxEi9uWVVkcLuJe3lnHJpxsCVt1n/4ai2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656329676; a=rsa-sha256; cv=none; b=RjtI1IvkaWUxMm7CrSTmEKX3/tZrZoBca8qzqiX/T+IpSbj8ahcLFz4gZERplO3Gq/kfmH oDVmEk9j5khZ1F7IsHaHnW9LkVnyL+83pXpYx9jR/gj5mXO37bc9301e67b85UNKqb4zQ6 HzImi+2xT9QGd/SPMvM9BE7C+WtwbQxjWKb23+AEvZsRWqlcTIXTvhXIG8sQTude5yjcYH QJR14LL/4TmzFcUr28m52KlGedk5ToRCxDu5KKftLX0QdBiUSRqRbheOZXqUdO/SndE7CA 3Q+//6SPlhfiAz4C7HT54mt+di90YV6lLEi0e9DluJdbSbzPO9cA+xPYKFhk9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=466b6f0c645fe1cc208bb15c77ba24ebb2813b77 commit 466b6f0c645fe1cc208bb15c77ba24ebb2813b77 Author: PÁLI Gábor János AuthorDate: 2022-06-27 05:41:13 +0000 Commit: Ashish SHUKLA CommitDate: 2022-06-27 11:32:32 +0000 net/wifibox*: Update to 1.1.0 - Update net/wifibox-core to 0.10.0 - Update to Linux 5.15.49, linux-firmware 20220610, Alpine 3.16.0 - Update WPA Supplicant to 2.10 - Add support for hostapd(8) -- see port options - Add support for AMD RZ608 Wi-Fi 6E - Expose NAT and networking configuration of the guest Changes: https://github.com/pgj/freebsd-wifibox/releases/tag/0.10.0 --- net/wifibox-alpine/Makefile | 122 +++++++++++++++++++++++++++++++++---------- net/wifibox-alpine/distinfo | 96 +++++++++++++++++----------------- net/wifibox-alpine/pkg-plist | 10 +++- net/wifibox-core/Makefile | 22 ++------ net/wifibox-core/distinfo | 6 +-- net/wifibox-core/pkg-plist | 2 - net/wifibox/Makefile | 2 +- 7 files changed, 158 insertions(+), 102 deletions(-) diff --git a/net/wifibox-alpine/Makefile b/net/wifibox-alpine/Makefile index 682d17233ede..54a3719c4aae 100644 --- a/net/wifibox-alpine/Makefile +++ b/net/wifibox-alpine/Makefile @@ -1,5 +1,5 @@ PORTNAME= wifibox-alpine -PORTVERSION= 20220430 +PORTVERSION= 20220625 CATEGORIES= net MAINTAINER= pali.gabor@gmail.com @@ -20,12 +20,14 @@ BUILD_DEPENDS= patchelf>0:sysutils/patchelf \ ${flavor}_PKGNAMESUFFIX= -${flavor} .endfor +OPTIONS_DEFINE= UDS_PASSTHRU OPTIONS_SUB= yes -OPTIONS_SINGLE= COMPRESSION +OPTIONS_SINGLE= COMPRESSION APPLICATION OPTIONS_SINGLE_COMPRESSION= COMP_GZIP COMP_LZO COMP_LZ4 COMP_XZ COMP_ZSTD +OPTIONS_SINGLE_APPLICATION= APP_HOSTAPD APP_WPA_SUPPLICANT -OPTIONS_DEFAULT= COMP_XZ +OPTIONS_DEFAULT= COMP_XZ APP_WPA_SUPPLICANT UDS_PASSTHRU COMP_GZIP_DESC= gzip COMP_LZO_DESC= lzo @@ -33,6 +35,12 @@ COMP_LZ4_DESC= lz4 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) + +UDS_PASSTHRU_RUN_DEPENDS= socat>0:net/socat + .if ${FLAVOR:U} == default OPTIONS_GROUP= FIRMWARE EXTRAS OPTIONS_GROUP_FIRMWARE= FW_ATH10K FW_ATH11K FW_ATMEL FW_B43 FW_B43LEGACY FW_BRCM\ @@ -70,9 +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= dac84c054786b6eb6f329662748d9a199b05f2df:scripts +GH_TAGNAME= 51b3ad35e4ac0505f4bbb3a5e07eabce14ff48d7:scripts -ALPINE_VERSION= 3.15.4 +ALPINE_VERSION= 3.16.0 +ALPINE_DATE= 2022.06.25 _ALPINE_VER= ${ALPINE_VERSION:C@([0-9]+)\.([0-9]+).*@\1.\2@} .if defined(ALPINE_DATE) @@ -83,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= 20220411 +_LINUXFW_TAG= 20220610 _LINUXFW= linux-firmware-${_LINUXFW_TAG} MASTER_SITES+= ${_ALPINE_SITE}/releases/x86_64/:rootfs \ @@ -97,26 +106,26 @@ 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-r18:wifibox \ - busybox-1.34.1-r5:wifibox \ - ifupdown-ng-0.11.3-r0:wifibox \ - iptables-1.8.7-r1:wifibox \ +_PACKAGES= baselayout-3.2.0-r19:wifibox \ + busybox-1.35.0-r0:wifibox \ + ifupdown-ng-0.12.1-r0:wifibox \ + iptables-1.8.8-r0:wifibox \ iw-5.16-r0:community \ - libcrypto1.1-1.1.1n-r0 \ - libmnl-1.0.4-r2 \ + libcrypto1.1-1.1.1o-r0 \ + libmnl-1.0.5-r0 \ libnftnl-1.2.1-r0 \ libnl3-3.5.0-r0 \ - libssl1.1-1.1.1n-r0 \ - linux-lts-5.15.36-r0:wifibox \ - musl-1.2.2-r7 \ - openrc-0.44.7-r5:wifibox \ - pcsc-lite-libs-1.9.4-r0 \ - socat-1.7.4.2-r0:wifibox \ - wpa_passthru-0.1.1-r0:wifibox \ - wpa_supplicant-2.9-r17:wifibox + libssl1.1-1.1.1o-r0 \ + linux-lts-5.15.49-r0:wifibox \ + musl-1.2.3-r0 \ + openrc-0.44.10-r0:wifibox _GUEST_MEM= 45M +_BOOT_SERVICES= networking urandom bootmisc modules hostname hwclock sysctl syslog +_DEFAULT_SERVICES= acpid crond iptables udhcpd +_SYSINIT_SERVICES= devfs dmesg hwdrivers mdev + _ATMEL_FIRMWARE= atmel-firmware-1.3 _B43LEGACY_FIRMWARE= wl_apsta-3.130.20.0 _B43_FIRMWARE= broadcom-wl-6.30.163.46 @@ -124,21 +133,56 @@ _IPW2100_FIRMWARE= ipw/ipw2100-1.3 \ ipw/ipw2100-1.3-i _IPW2200_FIRMWARE= iwi/ipw2200-bss \ iwi/ipw2200-ibss -_MT76_FIRMWARE= eecbb49920732b9b364f15c1ef0066342544b22b +_MT76_FIRMWARE= b6e865e2cc7080c91ec34a9dd3648d25f7ce04c6 + +_LINUX64_KMOD!= (kldstat -qn linux64 && echo "found") || echo "" + +.if empty(_LINUX64_KMOD) +IGNORE= needs the linux64 kernel module to build +.endif pre-everything:: .if !defined(FIRMWARE_FILES) @${ECHO_MSG} "===> NOTICE:" @${ECHO_MSG} - @${ECHO_MSG} "Use the FIRMWARE_FILES make(1) variable to keep only the firmware" - @${ECHO_MSG} "files that are used by the driver to reduce the size of the disk" - @${ECHO_MSG} "image." + @${ECHO_MSG} "Use the FIRMWARE_FILES make(1) variable to keep only the firmware files that" + @${ECHO_MSG} "are used by the driver to reduce the size of the disk image." @${ECHO_MSG} @sleep 1 .endif .include +.if ${PORT_OPTIONS:MUDS_PASSTHRU} +_BOOT_SERVICES+= uds_passthru +.endif + +.if ${PORT_OPTIONS:MUDS_PASSTHRU} || make(makesum) +_PACKAGES+= socat-1.7.4.3-r0:wifibox \ + uds_passthru-0.1.0-r0:wifibox +.endif + +.if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT} +_VIRTFS_MOUNTS= app_config:/etc/wpa_supplicant +_BOOT_SERVICES+= wpa_supplicant +_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 +.endif + +.if ${PORT_OPTIONS:MAPP_HOSTAPD} +_VIRTFS_MOUNTS= app_config:/etc/hostapd +_BOOT_SERVICES+= hostapd +_ETC_SRCS= etc/hostapd +.endif + +.if ${PORT_OPTIONS:MAPP_HOSTAPD} || make(makesum) +_PACKAGES+= hostapd-2.10-r1:wifibox +.endif + .for flavor in ${_FLAVORS} .if ${FLAVOR:U} == ${flavor} PORT_OPTIONS+= FW_${flavor:tu} @@ -168,12 +212,15 @@ LINUX_FIRMWARE+= ${L${fw_opt}_FILES} .endfor .if ${PORT_OPTIONS:MXX_DRIVER_WL} -_PACKAGES+= broadcom-wl-6.30.223.271-r0:wifibox _GUEST_MEM= 50M .endif -.if ${PORT_OPTIONS:MXX_DRIVER_RTW89} -_PACKAGES+= rtw89-20220421-r0:wifibox +.if ${PORT_OPTIONS:MXX_DRIVER_WL} || make(makesum) +_PACKAGES+= broadcom-wl-6.30.223.271-r3:wifibox +.endif + +.if ${PORT_OPTIONS:MXX_DRIVER_RTW89} || make(makesum) +_PACKAGES+= rtw89-20220421-r3:wifibox .endif .if !empty(LINUX_FIRMWARE) @@ -193,7 +240,9 @@ DISTFILES+= ${package:C@^([^:]*):wifibox$@\1@}.apk:main_packages _APK_FILES+= ${_DISTDIR}/${package:C@^([^:]*):.*$@\1@}.apk .endfor -_FIRMWAREDIR= ${WRKSRC}/guest/lib/firmware +_GUESTDIR= ${WRKSRC}/guest +_ETCDIR= ${_GUESTDIR}/etc +_FIRMWAREDIR= ${_GUESTDIR}/lib/firmware .if ${PORT_OPTIONS:MFW_ATMEL} DISTFILES+= ${_ATMEL_FIRMWARE}.tar.gz:atmel @@ -225,6 +274,12 @@ DISTFILES+= ${_MT76_FIRMWARE}.zip:mt76 .endif pre-build: +.if ${PORT_OPTIONS:MAPP_WPA_SUPPLICANT} + ${MKDIR} ${_ETCDIR}/wpa_supplicant +.endif +.if ${PORT_OPTIONS:MAPP_HOSTAPD} + ${MKDIR} ${_ETCDIR}/hostapd +.endif ${MKDIR} ${_FIRMWAREDIR} .for fw in ${PORT_OPTIONS:MFW_B43*} .if ${fw} @@ -258,6 +313,12 @@ pre-build: .endif post-install: +.if empty(PORT_OPTIONS:MUDS_PASSTHRU) + ${RM} ${STAGEDIR}${PREFIX}/etc/wifibox/appliance/uds_passthru.conf.sample +.endif +.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 @@ -265,6 +326,11 @@ WRKSRC= ${WRKSRC_scripts} MAKE_ARGS+= VERSION=${PORTVERSION} \ MINIROOTFS=${_DISTDIR}/${_MINIROOTFS} \ PACKAGES="${_APK_FILES}" \ + BOOT_SERVICES="${_BOOT_SERVICES}" \ + DEFAULT_SERVICES="${_DEFAULT_SERVICES}" \ + SYSINIT_SERVICES="${_SYSINIT_SERVICES}" \ + ETC_SRCS="${_ETC_SRCS}" \ + EXTRA_VIRTFS_MOUNTS="${_VIRTFS_MOUNTS}" \ SQUASHFS_COMP=${PORT_OPTIONS:MCOMP_*:S/COMP_//:tl} .if defined(FIRMWARE_FILES) diff --git a/net/wifibox-alpine/distinfo b/net/wifibox-alpine/distinfo index a7202a101a94..080905340495 100644 --- a/net/wifibox-alpine/distinfo +++ b/net/wifibox-alpine/distinfo @@ -1,53 +1,55 @@ -TIMESTAMP = 1651343100 -SHA256 (wifibox-alpine/alpine-minirootfs-3.15.4-x86_64.tar.gz) = 6abd0409ccd6b27cb5311e0d475af5a284515eb219626334b29b1c3141d47653 -SIZE (wifibox-alpine/alpine-minirootfs-3.15.4-x86_64.tar.gz) = 2730061 -SHA256 (wifibox-alpine/linux-firmware-20220411.tar.gz) = 533ae621b3eacf6a4696dab52a9dbc5727403a175c413b1682ab3f9cfb37872f -SIZE (wifibox-alpine/linux-firmware-20220411.tar.gz) = 406388354 -SHA256 (wifibox-alpine/baselayout-3.2.0-r18.apk) = 196cf83e0fe370a2206e1590e04694a1851e3911b0471ec09483752421036cc6 -SIZE (wifibox-alpine/baselayout-3.2.0-r18.apk) = 14329 -SHA256 (wifibox-alpine/busybox-1.34.1-r5.apk) = 88f636a987ac58d170feb386b4ebe412eda698561462e22d9fecd017d94b965a -SIZE (wifibox-alpine/busybox-1.34.1-r5.apk) = 340006 -SHA256 (wifibox-alpine/ifupdown-ng-0.11.3-r0.apk) = 7ed998628731d73f1aca736895a3486ec596ee1d1517d0a6a2a6053a39b351fb -SIZE (wifibox-alpine/ifupdown-ng-0.11.3-r0.apk) = 29480 -SHA256 (wifibox-alpine/iptables-1.8.7-r1.apk) = 3f2b6c01e101ff23be57d6d6a35880f2669020a584563a5b383fbca409fbc66f -SIZE (wifibox-alpine/iptables-1.8.7-r1.apk) = 467201 -SHA256 (wifibox-alpine/iw-5.16-r0.apk) = 3632bc7cf956f32a449fdbe80faba00bfdde342a6ff8ffa55c6008b818eccc54 -SIZE (wifibox-alpine/iw-5.16-r0.apk) = 99354 -SHA256 (wifibox-alpine/libcrypto1.1-1.1.1n-r0.apk) = bbc4f71851655a61eff270ce01f9a90575344ac645b9b0661ae37af77c952977 -SIZE (wifibox-alpine/libcrypto1.1-1.1.1n-r0.apk) = 1208228 -SHA256 (wifibox-alpine/libmnl-1.0.4-r2.apk) = 6d3215caa5a9f2faac42cf3c2d0999a3ad12f8e95e75839d14ead8e3682d14df -SIZE (wifibox-alpine/libmnl-1.0.4-r2.apk) = 9393 -SHA256 (wifibox-alpine/libnftnl-1.2.1-r0.apk) = e5b2985212f6cbcf5bbf43ac3235fc0189d6206b9df9d8e012b86b739c7c5b4b -SIZE (wifibox-alpine/libnftnl-1.2.1-r0.apk) = 70513 -SHA256 (wifibox-alpine/libnl3-3.5.0-r0.apk) = 4bb7863bf7bdeccf07940381974ece2100d5a2ada4061a2aa727da9e252f4bb1 -SIZE (wifibox-alpine/libnl3-3.5.0-r0.apk) = 326405 -SHA256 (wifibox-alpine/libssl1.1-1.1.1n-r0.apk) = 53429d8132c27be764485c8d13fc1d234f90b8627c21eff2307d1ecaf7bf3289 -SIZE (wifibox-alpine/libssl1.1-1.1.1n-r0.apk) = 213209 -SHA256 (wifibox-alpine/linux-lts-5.15.36-r0.apk) = 329a417bb74c2786d6d2a61702ba124e14cb1dc9a623879fd61f4a64c95571fd -SIZE (wifibox-alpine/linux-lts-5.15.36-r0.apk) = 7662464 -SHA256 (wifibox-alpine/musl-1.2.2-r7.apk) = 618c363879225e0d8075420970eefaafc81e34be9cf717772af76331cb3e9c29 -SIZE (wifibox-alpine/musl-1.2.2-r7.apk) = 383152 -SHA256 (wifibox-alpine/openrc-0.44.7-r5.apk) = 7651ff29cabcdb2ab86bf6e0e74c2e67da98a578d8031b536a6e7bfa9a7f7642 -SIZE (wifibox-alpine/openrc-0.44.7-r5.apk) = 366800 -SHA256 (wifibox-alpine/pcsc-lite-libs-1.9.4-r0.apk) = fe7bdd35bf95247e86961cfa83f16b7071c18798b08b2c69b33213e63515e682 -SIZE (wifibox-alpine/pcsc-lite-libs-1.9.4-r0.apk) = 18252 -SHA256 (wifibox-alpine/socat-1.7.4.2-r0.apk) = 07e21fdadf9fc16638e2a252e42f5adbe9af2c02e595af280507f8b42b155f1f -SIZE (wifibox-alpine/socat-1.7.4.2-r0.apk) = 69693 -SHA256 (wifibox-alpine/wpa_passthru-0.1.1-r0.apk) = bf44c8a8dc83b6b2c90e6aa3e53210b559f93826bb5aac98bb1c4a925b69e0b0 -SIZE (wifibox-alpine/wpa_passthru-0.1.1-r0.apk) = 2807 -SHA256 (wifibox-alpine/wpa_supplicant-2.9-r17.apk) = 282c7bbb22d1d3ec42fbe60773b73c0876893ef2043f64bbde47cdbfa940b567 -SIZE (wifibox-alpine/wpa_supplicant-2.9-r17.apk) = 747042 -SHA256 (wifibox-alpine/broadcom-wl-6.30.223.271-r0.apk) = 5d372281131c0587d9e7de2cbf1e8b2d99f543f00f4090be5cb70c5ea3df2149 -SIZE (wifibox-alpine/broadcom-wl-6.30.223.271-r0.apk) = 1461668 -SHA256 (wifibox-alpine/rtw89-20220421-r0.apk) = 5da0165c41227254d2426d4a75a5072200d6dff4860f995378935b76990ef32f -SIZE (wifibox-alpine/rtw89-20220421-r0.apk) = 852386 +TIMESTAMP = 1656272069 +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/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 +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.49-r0.apk) = 6b6915b2be6626ed2461ef63627712e92db9eef28308a6a8b023f52173893f49 +SIZE (wifibox-alpine/linux-lts-5.15.49-r0.apk) = 7658570 +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/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/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/eecbb49920732b9b364f15c1ef0066342544b22b.zip) = 63d17bd14b28167c3b18865525097ba3669725b03952f08770a515c64584e062 -SIZE (wifibox-alpine/eecbb49920732b9b364f15c1ef0066342544b22b.zip) = 4434101 -SHA256 (wifibox-alpine/pgj-freebsd-wifibox-alpine-dac84c054786b6eb6f329662748d9a199b05f2df_GH0.tar.gz) = e13eb1761706cd417d94de10009257fbb828f6d8aee68c27b6d5d7631344f4e1 -SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-dac84c054786b6eb6f329662748d9a199b05f2df_GH0.tar.gz) = 126093 +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 diff --git a/net/wifibox-alpine/pkg-plist b/net/wifibox-alpine/pkg-plist index 17f2471b4a92..3ed29d104e52 100644 --- a/net/wifibox-alpine/pkg-plist +++ b/net/wifibox-alpine/pkg-plist @@ -1,5 +1,10 @@ -@sample etc/wifibox/interfaces.conf.sample -@sample etc/wifibox/udhcpd.conf.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 +etc/wifibox/app_config man/man5/wifibox-alpine.5.gz share/wifibox/bhyve.conf share/wifibox/disk.img @@ -9,6 +14,7 @@ share/wifibox/vmlinuz /var/run/wifibox/appliance/run /var/run/wifibox/appliance/spool/cron/crontabs /var/run/wifibox/appliance/spool/mail +%%APP_HOSTAPD%%%%UDS_PASSTHRU%%@dir /var/run/hostapd @dir /var/run/wifibox/appliance/cache/apk @dir /var/run/wifibox/appliance/cache/misc @dir /var/run/wifibox/appliance/cache diff --git a/net/wifibox-core/Makefile b/net/wifibox-core/Makefile index 1657ac495c25..648ad2e4e550 100644 --- a/net/wifibox-core/Makefile +++ b/net/wifibox-core/Makefile @@ -1,5 +1,5 @@ PORTNAME= wifibox-core -PORTVERSION= 0.9.0 +PORTVERSION= 0.10.0 CATEGORIES= net MAINTAINER= pali.gabor@gmail.com @@ -12,14 +12,11 @@ ONLY_FOR_ARCHS= amd64 RUN_DEPENDS= grub2-bhyve>0:sysutils/grub2-bhyve -OPTIONS_DEFINE= BHYVE_PLUS WPA_PASSTHRU -OPTIONS_DEFAULT= WPA_PASSTHRU +OPTIONS_DEFINE= BHYVE_PLUS +OPTIONS_DEFAULT= # OPTIONS_EXCLUDE_FreeBSD_12= BHYVE_PLUS BHYVE_PLUS_DESC= Use bhyve+ (experimental) -WPA_PASSTHRU_DESC= WPA Supplicant pass-through - -WPA_PASSTHRU_RUN_DEPENDS= socat>0:net/socat .include @@ -42,17 +39,4 @@ MAKE_ARGS+= BHYVE=${LOCALBASE}/sbin/bhyve \ VMM_KO=${KMODDIR}/vmm.ko .endif -.include - -.if ${PORT_OPTIONS:MWPA_PASSTHRU} -_WPA_PASSTHRU_ENABLED= yes -.else -_WPA_PASSTHRU_ENABLED= no -.endif - -post-install: - ${SED} -I '' -E \ - 's%^enabled=no$$%enabled=${_WPA_PASSTHRU_ENABLED}%' \ - ${STAGEDIR}${PREFIX}/etc/wifibox/wpa_ctrl.conf.sample - .include diff --git a/net/wifibox-core/distinfo b/net/wifibox-core/distinfo index 091277b0f550..ab19835e8833 100644 --- a/net/wifibox-core/distinfo +++ b/net/wifibox-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651599935 -SHA256 (pgj-freebsd-wifibox-0.9.0_GH0.tar.gz) = c16768ec0f7803590dea65902d48ab7e6463c9c0177f18c99925ec75075219ed -SIZE (pgj-freebsd-wifibox-0.9.0_GH0.tar.gz) = 15370 +TIMESTAMP = 1656275716 +SHA256 (pgj-freebsd-wifibox-0.10.0_GH0.tar.gz) = 948a54e405da9d99c69b3ea72e44a19479a457ecefcc7ed415a8365d740c06c3 +SIZE (pgj-freebsd-wifibox-0.10.0_GH0.tar.gz) = 14681 diff --git a/net/wifibox-core/pkg-plist b/net/wifibox-core/pkg-plist index 06b66f76eb36..de8c504c49d7 100644 --- a/net/wifibox-core/pkg-plist +++ b/net/wifibox-core/pkg-plist @@ -1,7 +1,5 @@ @sample etc/wifibox/bhyve.conf.sample @sample etc/wifibox/core.conf.sample -@sample etc/wifibox/wpa_ctrl.conf.sample -@sample etc/wifibox/wpa_supplicant/wpa_supplicant.conf.sample @sample etc/devd/wifibox.conf.sample etc/rc.d/wifibox man/man5/wifibox-guest.5.gz diff --git a/net/wifibox/Makefile b/net/wifibox/Makefile index b892390bf154..79a3c4edc3fc 100644 --- a/net/wifibox/Makefile +++ b/net/wifibox/Makefile @@ -1,5 +1,5 @@ PORTNAME= wifibox -PORTVERSION= 1.0.0 +PORTVERSION= 1.1.0 CATEGORIES= net MAINTAINER= pali.gabor@gmail.com