Date: Fri, 4 Jun 2021 16:26:17 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Guido Falsi <madpilot@FreeBSD.org>, ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: Re: git: 751f083cf699 - 2021Q2 - emulators/virtualbox-ose: Fix additions build on recent HEAD Message-ID: <1ded6b60-19c9-c195-bcb7-1450c7e8d662@FreeBSD.org> In-Reply-To: <202106040738.1547cWOQ067316@gitrepo.freebsd.org> References: <202106040738.1547cWOQ067316@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --AyN4PWRXa3y5INttyan1GojcnMAaaLbhz Content-Type: multipart/mixed; boundary="3Jei7mnVvXEaKbWdDWx9V5SLN1uVzolZb"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Guido Falsi <madpilot@FreeBSD.org>, ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Message-ID: <1ded6b60-19c9-c195-bcb7-1450c7e8d662@FreeBSD.org> Subject: Re: git: 751f083cf699 - 2021Q2 - emulators/virtualbox-ose: Fix additions build on recent HEAD References: <202106040738.1547cWOQ067316@gitrepo.freebsd.org> In-Reply-To: <202106040738.1547cWOQ067316@gitrepo.freebsd.org> --3Jei7mnVvXEaKbWdDWx9V5SLN1uVzolZb Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 6/4/2021 12:38 AM, Guido Falsi wrote: > The branch 2021Q2 has been updated by madpilot: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D751f083cf699a4cac35c5a= 7b616da653d6cb5f2e >=20 > commit 751f083cf699a4cac35c5a7b616da653d6cb5f2e > Author: Guido Falsi <madpilot@FreeBSD.org> > AuthorDate: 2021-06-04 07:31:59 +0000 > Commit: Guido Falsi <madpilot@FreeBSD.org> > CommitDate: 2021-06-04 07:37:56 +0000 >=20 > emulators/virtualbox-ose: Fix additions build on recent HEAD > =20 > Src HEAD commit 6d3e78ad6c11 vfs_quotactl function signature, adapt= > virtualbox code to be able to compile there too. > =20 > MFH: 2021Q2 > (cherry picked from commit ef04eff33cf6262e79da1d092d69951ae26f915a= ) > --- > .../patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c | = 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) >=20 > diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_fr= eebsd_vboxvfs_vboxvfs__vfsops.c b/emulators/virtualbox-ose/files/patch-sr= c_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c > index 5d21a89925de..712a3602a2da 100644 > --- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_v= boxvfs_vboxvfs__vfsops.c > +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_v= boxvfs_vboxvfs__vfsops.c > @@ -539,7 +539,11 @@ > + * Do operation associated with quotas, not supported > + */ > +static int > -+vboxfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg) > ++vboxfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg > ++#if __FreeBSD_version >=3D 1400018 > ++ , bool *mp_busy > ++#endif > ++ ) > { > - int rc; > + return (EOPNOTSUPP); >=20 I don't think this is right. Perhaps you meant to use editdiff? The line numbers were not updated and patching is malformed now. Building on 751f083cf699a4cac35c5a7b616da653d6cb5f2e: > =3D=3D=3D> Applying FreeBSD patches for virtualbox-ose-6.1.18 from /us= r/ports/emulators/virtualbox-ose/files > patch: **** malformed patch at line 645: + sbp->f_namemax =3D fsin= fo.maxnamesize; --=20 Regards, Bryan Drewery --3Jei7mnVvXEaKbWdDWx9V5SLN1uVzolZb-- --AyN4PWRXa3y5INttyan1GojcnMAaaLbhz Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEE+Rc8ssOq6npcih8JNddxu25Gl88FAmC6tpkFAwAAAAAACgkQNddxu25Gl88D gAgA4F0IgpGQCd6+CI3jpPv9mTY32u+dE99wRJ5WjjJRSatYr30085bYy/ch2rldhqA8PIKwecd1 Q0ZCDMcI1PumFbqpe6YbjN3zBk8LQe1lRqRQ5ETQmQhR2G42OLv9GiceItDhEPByefUgsnwwcbYm iw3pw86c8JKX8DMTC3/O2Cc+8XDOmhTVCl1VvNBJ4il4nqkbm4PPRVPpb/UFVAUmVb3mtuc0tfFc iwv2g+zT84Iton6F5hy9uwZGyCvwRHyWVrcsOSPeX6LfTsYhyCJYhyZ87kqxOoxX1TZDuBWWdD88 pHGI+9n3YlSYp8UcD9gUTmhCbOFDMq5P9ffhcdzAJA== =BYH+ -----END PGP SIGNATURE----- --AyN4PWRXa3y5INttyan1GojcnMAaaLbhz--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1ded6b60-19c9-c195-bcb7-1450c7e8d662>