git: 313051e9ccd3 - main - net/wifibox: Update to 0.6.1

The branch main has been updated by ashish:

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

commit 313051e9ccd3f48d1f8f74e7ba33dd21cdd34875
Author:     PÁLI Gábor János <pali.gabor@gmail.com>
AuthorDate: 2021-12-30 05:30:09 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2021-12-30 05:30:09 +0000

    net/wifibox: Update to 0.6.1
---
 net/wifibox/Makefile  | 16 ++++++++++++----
 net/wifibox/distinfo  | 12 +++++++-----
 net/wifibox/pkg-plist | 11 +++++++----
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/net/wifibox/Makefile b/net/wifibox/Makefile
index ef07dc50c128..f3c5417d809d 100644
--- a/net/wifibox/Makefile
+++ b/net/wifibox/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wifibox
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.1
 CATEGORIES=	net
 
 MAINTAINER=	pali.gabor@gmail.com
@@ -9,23 +9,31 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
-EXTRACT_ONLY=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_EXTRACT}_GH0.tar.gz
+EXTRACT_ONLY=	${_DISTFILES:N*.img.xz}
 
 RUN_DEPENDS=	grub2-bhyve>0:sysutils/grub2-bhyve \
 		bhyve+>0:sysutils/bhyve+
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pgj
-GH_PROJECT=	freebsd-wifibox
+GH_PROJECT=	freebsd-wifibox freebsd-wifibox-image:image
+GH_TAGNAME=	${PORTVERSION}
+GH_TAGNAME+=	${IMAGE_VERSION}:image
 
-IMAGE_VERSION=	snapshot-20210905
+IMAGE_VERSION=	snapshot-20211223
 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}
 
+# Needed to fake the necessary UID/GID for chrony that runs in the guest
+USERS=		squid quagga
+GROUPS=		squid quagga
+
 NO_BUILD=	yes
 MAKE_ENV+=	IMGXZ=${DISTDIR}/${IMAGE_FILE} \
+		IMGMAN=${WRKSRC_image}/man/${IMAGE_MAN} \
 		VERSION=${PORTVERSION} \
 		BHYVE=${LOCALBASE}/sbin/bhyve \
 		BHYVECTL=${LOCALBASE}/sbin/bhyvectl \
diff --git a/net/wifibox/distinfo b/net/wifibox/distinfo
index 0cd9d8fa7616..f2a2e0fd5e0c 100644
--- a/net/wifibox/distinfo
+++ b/net/wifibox/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1630966801
-SHA256 (freebsd-wifibox-appliance.snapshot-20210905.img.xz) = 30de7721bc12bc8657df835c5fcfaab1198aaee82984d29c40e0e9e90e86cdce
-SIZE (freebsd-wifibox-appliance.snapshot-20210905.img.xz) = 124289348
-SHA256 (pgj-freebsd-wifibox-0.5.0_GH0.tar.gz) = 109fa4fcdc4f0f504807a094d6a3e5146bcc9f8cde470e53ea36d58097ea4c2b
-SIZE (pgj-freebsd-wifibox-0.5.0_GH0.tar.gz) = 9937
+TIMESTAMP = 1640805434
+SHA256 (freebsd-wifibox-appliance.snapshot-20211223.img.xz) = d4b0ad2b52a0b70d1f68ef86bd07bcc163e4636a9f58f041cded27538037c597
+SIZE (freebsd-wifibox-appliance.snapshot-20211223.img.xz) = 187636676
+SHA256 (pgj-freebsd-wifibox-0.6.1_GH0.tar.gz) = b9aa25c0f2b51f3f395b91b618dd76ee11e2bccc54e49fcf4c587ddaca2485a1
+SIZE (pgj-freebsd-wifibox-0.6.1_GH0.tar.gz) = 12101
+SHA256 (pgj-freebsd-wifibox-image-snapshot-20211223_GH0.tar.gz) = 8830866db32ba88b1be4fdb5e0dad991cbe5d1fef7227f74ba62e44cd196a018
+SIZE (pgj-freebsd-wifibox-image-snapshot-20211223_GH0.tar.gz) = 3813
diff --git a/net/wifibox/pkg-plist b/net/wifibox/pkg-plist
index 305b10470f49..ceb37985706d 100644
--- a/net/wifibox/pkg-plist
+++ b/net/wifibox/pkg-plist
@@ -1,28 +1,31 @@
 @sample etc/wifibox/bhyve.conf.sample
+@sample etc/wifibox/core.conf.sample
 @sample etc/wifibox/interfaces.conf.sample
 @sample etc/wifibox/udhcpd.conf.sample
 @sample etc/wifibox/wpa_supplicant.conf.sample
 @sample etc/devd/wifibox.conf.sample
 etc/rc.d/wifibox
+man/man5/wifibox-alpine.5.gz
+man/man5/wifibox-guest.5.gz
 man/man8/wifibox.8.gz
 sbin/wifibox
 share/wifibox/device.map
 share/wifibox/grub.cfg
 share/wifibox/disk.img
-@preunexec /usr/bin/find /var/log/wifibox -type f -delete
+@preexec /usr/bin/touch /var/log/wifibox.log
+@preunexec /bin/rm -f /var/log/wifibox.log
 @preunexec /usr/bin/find /var/run/wifibox -type f -delete
 @preunexec /usr/bin/find /var/run/wifibox -type l -exec /bin/rm -f {} \;
-@dir /var/log/wifibox
 @dir /var/run/wifibox/appliance/cache
 @dir /var/run/wifibox/appliance/empty
 @dir /var/run/wifibox/appliance/lib/apk
-@dir /var/run/wifibox/appliance/lib/chrony
+@dir(squid,quagga,) /var/run/wifibox/appliance/lib/chrony
 @dir /var/run/wifibox/appliance/lib/iptables
 @dir /var/run/wifibox/appliance/lib/misc
 @dir /var/run/wifibox/appliance/lib/udhcpd
 @dir /var/run/wifibox/appliance/lib
 @dir /var/run/wifibox/appliance/local
-@dir /var/run/wifibox/appliance/log/chrony
+@dir(squid,quagga,) /var/run/wifibox/appliance/log/chrony
 @dir /var/run/wifibox/appliance/log
 @dir /var/run/wifibox/appliance/mail
 @dir /var/run/wifibox/appliance/opt