From nobody Sat Dec 18 11:39:52 2021 X-Original-To: dev-commits-ports-all@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 C568318EE78B; Sat, 18 Dec 2021 11:39:52 +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 4JGP603sszz4rcG; Sat, 18 Dec 2021 11:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 625BC6BB0; Sat, 18 Dec 2021 11:39:52 +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 1BIBdqgr099438; Sat, 18 Dec 2021 11:39:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BIBdqDM099437; Sat, 18 Dec 2021 11:39:52 GMT (envelope-from git) Date: Sat, 18 Dec 2021 11:39:52 GMT Message-Id: <202112181139.1BIBdqDM099437@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: 58f8d6ca4907 - main - sysutils/bhyve+: Update for 12.3-RELEASE, and 14-CURRENT List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 58f8d6ca4907d12a07863333204a576126d0cc04 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639827592; 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=cDSpxNj3z2jw5Iafq0ME+0R1tvtcTgtI/pkwy3FBzkI=; b=ItHXCAyBQesc+qY6zfuRxz61E857tedgxJ1EYvZPopWatM8YmU+gJ51XKqQ/Pe/DFmVEHV 8tw3NRLzmW71gMqG+ZrD5B71mDmQ1NessXzT3QSwkXfxJoOrE1AjJKFg7PIGmCiTGRYHDM zWgNnBR1NSY64po5hBSwwsA189M0qRTdDnSD7PQnEbf40X0d39d0NX9kmH/sB8RolY3nKZ 5liOJauzP3Ecm3u8YHdjk2YIpbyu4N58EVNrcTZcZju+UvGmVUNaIgUYStXXiEnIney7QM ZCP5Y63SDvY/I7EJKigCHs0xlF34r3IOJRLgzFnX7t0H+9x6DsymxUgvijmGtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639827592; a=rsa-sha256; cv=none; b=hTna23kVZ4df/FnkmL+ggrEc/8PivxZA+Gwhuo8Rep9pqaMPue7+pdxgwF7S2fSOjlq4wV m/UmYAlU2n/ChgzuJNC8WwXW1qRk1yCq+z36PzeFYZbsTiQh+NuRMvVQAwMezOMw+19/TO 9DXlZXgF21ki/VdAt4KFf/qmZLQfMbPfDv/USpi1Tyt/VGOTY6itM8YshAsnURjv78aLkY qug52IqkXB9vFMI/LhLJigVZaZa0SzmRlDZzRhNutmOGX62t8Sxee013XZoFhT0HV1Dw0J e04VJwVggOaPv6scLN2GBhryKrkftv+AggxhVfsfOEjgXxUgqcqBcQbpL0ZgiQ== 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=58f8d6ca4907d12a07863333204a576126d0cc04 commit 58f8d6ca4907d12a07863333204a576126d0cc04 Author: PÁLI Gábor János AuthorDate: 2021-12-18 11:18:22 +0000 Commit: Ashish SHUKLA CommitDate: 2021-12-18 11:25:32 +0000 sysutils/bhyve+: Update for 12.3-RELEASE, and 14-CURRENT --- sysutils/bhyve+/Makefile | 5 ++++ sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p | 31 ++++++++++++++++++++++ sysutils/bhyve+/files/freebsd-12/3/patch-virtio-9p | 31 ++++++++++++++++++++++ sysutils/bhyve+/files/freebsd-12/patch-virtio-9p | 31 ---------------------- sysutils/bhyve+/files/freebsd-14/patch-lib9p | 14 +++++----- sysutils/bhyve+/files/kernconf/opt_inet.h | 0 sysutils/bhyve+/files/kernconf/opt_inet6.h | 0 sysutils/bhyve+/files/kernconf/opt_platform.h | 0 8 files changed, 74 insertions(+), 38 deletions(-) diff --git a/sysutils/bhyve+/Makefile b/sysutils/bhyve+/Makefile index 9945c581697f..4de4b073dbf7 100644 --- a/sysutils/bhyve+/Makefile +++ b/sysutils/bhyve+/Makefile @@ -35,6 +35,11 @@ USE_LDCONFIG= yes .if 1200000 <= ${OSVERSION} && ${OSVERSION} < 1300000 EXTRA_PATCHES= ${PATCHDIR}/freebsd-12 +.if ${OSVERSION} < 1203000 +EXTRA_PATCHES+= ${PATCHDIR}/freebsd-12/2 +.else +EXTRA_PATCHES+= ${PATCHDIR}/freebsd-12/3 +.endif .elif 1300000 <= ${OSVERSION} && ${OSVERSION} < 1400000 EXTRA_PATCHES= ${PATCHDIR}/freebsd-13 .elif 1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000 diff --git a/sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p b/sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p new file mode 100644 index 000000000000..9ce027d3171a --- /dev/null +++ b/sysutils/bhyve+/files/freebsd-12/2/patch-virtio-9p @@ -0,0 +1,31 @@ +--- usr.sbin/bhyve/bhyve.8.orig 2021-08-19 22:38:50 UTC ++++ usr.sbin/bhyve/bhyve.8 +@@ -242,6 +242,8 @@ Virtio network interface. + Virtio block storage interface. + .It Li virtio-scsi + Virtio SCSI interface. ++.It Li virtio-9p ++Virtio 9p (VirtFS) interface. + .It Li virtio-rnd + Virtio RNG interface. + .It Li virtio-console +@@ -327,6 +329,19 @@ are: + .It Li iid= Ns Ar IID + Initiator ID to use when sending requests to specified CTL port. + The default value is 0. ++.El ++.Pp ++9P devices: ++.Bl -tag -width 10n ++.It Pa sharename=/path/to/share[,9p-device-options] ++.El ++.Pp ++The ++.Ar 9p-device-options ++are: ++.Bl -tag -width 10n ++.It Li ro ++Expose the share in read-only mode. + .El + .Pp + TTY devices: diff --git a/sysutils/bhyve+/files/freebsd-12/3/patch-virtio-9p b/sysutils/bhyve+/files/freebsd-12/3/patch-virtio-9p new file mode 100644 index 000000000000..28457afb3486 --- /dev/null +++ b/sysutils/bhyve+/files/freebsd-12/3/patch-virtio-9p @@ -0,0 +1,31 @@ +--- usr.sbin/bhyve/bhyve.8.orig 2021-12-17 02:14:53.986085000 +0100 ++++ usr.sbin/bhyve/bhyve.8 2021-12-17 02:21:03.716235000 +0100 +@@ -299,6 +299,8 @@ + Virtio block storage interface. + .It Cm virtio-scsi + Virtio SCSI interface. ++.It Cm virtio-9p ++Virtio 9p (VirtFS) interface. + .It Cm virtio-rnd + Virtio RNG interface. + .It Cm virtio-console +@@ -404,6 +406,19 @@ + .It Cm iid= Ns Ar IID + Initiator ID to use when sending requests to specified CTL port. + The default value is 0. ++.El ++.Pp ++9P devices: ++.Bl -tag -width 10n ++.It Pa sharename=/path/to/share[,9p-device-options] ++.El ++.Pp ++The ++.Ar 9p-device-options ++are: ++.Bl -tag -width 10n ++.It Li ro ++Expose the share in read-only mode. + .El + .Pp + TTY device backends: diff --git a/sysutils/bhyve+/files/freebsd-12/patch-virtio-9p b/sysutils/bhyve+/files/freebsd-12/patch-virtio-9p index 6799fd986342..1e14bcd58d61 100644 --- a/sysutils/bhyve+/files/freebsd-12/patch-virtio-9p +++ b/sysutils/bhyve+/files/freebsd-12/patch-virtio-9p @@ -1,34 +1,3 @@ ---- usr.sbin/bhyve/bhyve.8.orig 2021-08-19 22:38:50 UTC -+++ usr.sbin/bhyve/bhyve.8 -@@ -242,6 +242,8 @@ Virtio network interface. - Virtio block storage interface. - .It Li virtio-scsi - Virtio SCSI interface. -+.It Li virtio-9p -+Virtio 9p (VirtFS) interface. - .It Li virtio-rnd - Virtio RNG interface. - .It Li virtio-console -@@ -327,6 +329,19 @@ are: - .It Li iid= Ns Ar IID - Initiator ID to use when sending requests to specified CTL port. - The default value is 0. -+.El -+.Pp -+9P devices: -+.Bl -tag -width 10n -+.It Pa sharename=/path/to/share[,9p-device-options] -+.El -+.Pp -+The -+.Ar 9p-device-options -+are: -+.Bl -tag -width 10n -+.It Li ro -+Expose the share in read-only mode. - .El - .Pp - TTY devices: --- usr.sbin/bhyve/Makefile.orig 2021-08-19 23:00:57 UTC +++ usr.sbin/bhyve/Makefile @@ -3,6 +3,7 @@ diff --git a/sysutils/bhyve+/files/freebsd-14/patch-lib9p b/sysutils/bhyve+/files/freebsd-14/patch-lib9p index 97f2fd5b00a7..41bf90a59d7d 100644 --- a/sysutils/bhyve+/files/freebsd-14/patch-lib9p +++ b/sysutils/bhyve+/files/freebsd-14/patch-lib9p @@ -1,12 +1,12 @@ ---- share/mk/src.libnames.mk.orig 2021-09-04 10:14:17.407288000 +0200 -+++ share/mk/src.libnames.mk 2021-09-04 10:15:27.832153000 +0200 -@@ -245,6 +245,9 @@ +--- share/mk/src.libnames.mk.orig 2021-12-17 02:31:11.492798000 +0100 ++++ share/mk/src.libnames.mk 2021-12-17 02:36:30.736989000 +0100 +@@ -261,6 +261,9 @@ # 2nd+ order consumers. Auto-generating this would be better. _DP_80211= sbuf bsdxml _DP_9p= sbuf +.if ${MK_CASPER} != "no" -+_DP_9p+= casper cap_pwd cap_grp ++_DP_9p+= casper cap_pwd cap_grp +.endif - _DP_archive= z bz2 lzma bsdxml zstd - _DP_zstd= pthread - .if ${MK_BLACKLIST} != "no" + # XXX: Not bootstrapped so uses host version on non-FreeBSD, so don't use a + # FreeBSD-specific dependency list + .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) diff --git a/sysutils/bhyve+/files/kernconf/opt_inet.h b/sysutils/bhyve+/files/kernconf/opt_inet.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sysutils/bhyve+/files/kernconf/opt_inet6.h b/sysutils/bhyve+/files/kernconf/opt_inet6.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sysutils/bhyve+/files/kernconf/opt_platform.h b/sysutils/bhyve+/files/kernconf/opt_platform.h new file mode 100644 index 000000000000..e69de29bb2d1