Skip to content

Commit

Permalink
net/wifibox: Update to 0.8.3
Browse files Browse the repository at this point in the history
- Add a pkg-message for facilitating initial configuration
- Base sample configuration defaults on the `WPA_PASSTHRU` port option

This commit is required to be able to merge it to quarterly branch

Changes:	https://github.com/pgj/freebsd-wifibox/releases/tag/0.8.3
                https://github.com/pgj/freebsd-wifibox-image/releases/tag/snapshot-20220428
MFH:		2022Q2 (usability fixes)
  • Loading branch information
pgj authored and wahjava committed May 7, 2022
1 parent ec7e879 commit d2dee87
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 12 deletions.
21 changes: 16 additions & 5 deletions net/wifibox/Makefile
@@ -1,5 +1,5 @@
PORTNAME= wifibox
PORTVERSION= 0.8.2
PORTVERSION= 0.8.3
CATEGORIES= net

MAINTAINER= pali.gabor@gmail.com
Expand All @@ -18,7 +18,7 @@ OPTIONS_DEFAULT= WPA_PASSTHRU
OPTIONS_EXCLUDE_FreeBSD_12= BHYVE_PLUS

BHYVE_PLUS_DESC= Use bhyve+ (experimental)
WPA_PASSTHRU_DESC= Support WPA Supplicant pass-through
WPA_PASSTHRU_DESC= WPA Supplicant pass-through

WPA_PASSTHRU_RUN_DEPENDS= socat>0:net/socat

Expand All @@ -35,21 +35,32 @@ GH_PROJECT= freebsd-wifibox freebsd-wifibox-image:image
GH_TAGNAME= ${PORTVERSION}
GH_TAGNAME+= ${IMAGE_VERSION}:image

IMAGE_VERSION= snapshot-20220414
IMAGE_VERSION= snapshot-20220428
IMAGE_FILE= freebsd-wifibox-appliance.${IMAGE_VERSION}.img.xz
IMAGE_MAN= wifibox-alpine.5

MASTER_SITES+= https://github.com/pgj/freebsd-wifibox-image/releases/download/${IMAGE_VERSION}/
DISTFILES+= ${IMAGE_FILE}

NO_BUILD= yes
MAKE_ENV+= IMGXZ=${DISTDIR}/${IMAGE_FILE} \
MAKE_ARGS+= IMGXZ=${DISTDIR}/${IMAGE_FILE} \
IMGMAN=${WRKSRC_image}/man/${IMAGE_MAN} \
VERSION=${PORTVERSION}
.if defined(_BHYVE_PLUS)
MAKE_ENV+= BHYVE=${LOCALBASE}/sbin/bhyve \
MAKE_ARGS+= BHYVE=${LOCALBASE}/sbin/bhyve \
BHYVECTL=${LOCALBASE}/sbin/bhyvectl \
VMM_KO=${KMODDIR}/vmm.ko
.endif

.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 <bsd.port.mk>
14 changes: 7 additions & 7 deletions net/wifibox/distinfo
@@ -1,7 +1,7 @@
TIMESTAMP = 1649935819
SHA256 (freebsd-wifibox-appliance.snapshot-20220414.img.xz) = 0300efac89e54da575840cb9e68fc826f4f05706bc22d719d5870f36c8428da6
SIZE (freebsd-wifibox-appliance.snapshot-20220414.img.xz) = 124691976
SHA256 (pgj-freebsd-wifibox-0.8.2_GH0.tar.gz) = 9a294ac4caf8c1040af9dacb5186b31f6413b65fcc232287a61b146e63c736ff
SIZE (pgj-freebsd-wifibox-0.8.2_GH0.tar.gz) = 15033
SHA256 (pgj-freebsd-wifibox-image-snapshot-20220414_GH0.tar.gz) = 3f3a63b82b71cadc75a35909b491649080e6befa9a4adefb66f0f482695d080b
SIZE (pgj-freebsd-wifibox-image-snapshot-20220414_GH0.tar.gz) = 5744
TIMESTAMP = 1651104213
SHA256 (freebsd-wifibox-appliance.snapshot-20220428.img.xz) = bdf19bcf3d162c07f524466819b51594d295bf516da5080b0c88402b7f25f03b
SIZE (freebsd-wifibox-appliance.snapshot-20220428.img.xz) = 131621268
SHA256 (pgj-freebsd-wifibox-0.8.3_GH0.tar.gz) = 58e5090893136d5618769cab4e8a3a1d5a43361cae03384044695ee1efeea25f
SIZE (pgj-freebsd-wifibox-0.8.3_GH0.tar.gz) = 15735
SHA256 (pgj-freebsd-wifibox-image-snapshot-20220428_GH0.tar.gz) = e5be1f4271b557be8bd1222d80a057cc0d7287e867b3d6f4dfc75de1bcf1378c
SIZE (pgj-freebsd-wifibox-image-snapshot-20220428_GH0.tar.gz) = 5745
10 changes: 10 additions & 0 deletions net/wifibox/pkg-message
@@ -0,0 +1,10 @@
[
{ type: install
message: <<EOM

Please read the wifibox(8) manual page first to learn about the
configuration and use.

EOM
}
]

0 comments on commit d2dee87

Please sign in to comment.