From owner-dev-commits-ports-all@freebsd.org Fri Jun 4 23:26:22 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CC73B656F92; Fri, 4 Jun 2021 23:26:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fxf661sbzz3Hdx; Fri, 4 Jun 2021 23:26:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1622849182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Tye4gwPe6SR+XUANYaP7KVhIPz3oGLwNusoj4iP/zpA=; b=c+kzw6xmI41YINRqTWYeuoHhj+FZK451hDxIIynx+/pJBMB0nBQGgDGqNdrB/QYWXqfn8a 6CynfAejREfJuEQiuFgvPNBtTCPWs9Y6aLf3Al2l0mf1mnPaBNw1GCGZcHKVmjEeNmlrQY N7sqXm6bSvoiUIkBGLXH3FeFkrBGr7rI8N1RQvVQiQbMmtJsx35fXsDvDkkEmme5PGDOS1 1Sr0W32aCWZBLvyxCihKvDdGVm9rPzekreAPBQRHmBXrssC4T+yOEDXABgUFeBdQmf2GqR 45xuB4kvlSrME/PhcVBcbO+1qS0OZm19YkbpoZYV/pfQDtGjxGYx/TpvOSknCA== Received: from mail.xzibition.com (unknown [127.0.1.132]) (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 freefall.freebsd.org (Postfix) with ESMTPS id E02B71EECD; Fri, 4 Jun 2021 23:26:21 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id DEB702A29C; Fri, 4 Jun 2021 23:26:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id zF3mv__dyRKC; Fri, 4 Jun 2021 23:26:18 +0000 (UTC) Subject: Re: git: 751f083cf699 - 2021Q2 - emulators/virtualbox-ose: Fix additions build on recent HEAD DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com B79652A28F To: Guido Falsi , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org References: <202106040738.1547cWOQ067316@gitrepo.freebsd.org> From: Bryan Drewery Organization: FreeBSD Message-ID: <1ded6b60-19c9-c195-bcb7-1450c7e8d662@FreeBSD.org> Date: Fri, 4 Jun 2021 16:26:17 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <202106040738.1547cWOQ067316@gitrepo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="AyN4PWRXa3y5INttyan1GojcnMAaaLbhz" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1622849182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Tye4gwPe6SR+XUANYaP7KVhIPz3oGLwNusoj4iP/zpA=; b=FalK6S+wj8jBm4+MvZHZgJE9KzvOixjBUCFW91FKbbAxbErSFn32znooDSXRfl5P8/JQCo uiE5HyxuK48kNbyYSVbSGefAc0e/wY+q4cR8IRYvaSxza+M1ahYUxbNfMYag0VkR2RNnUN 2TGgPRGvhSsxQ9DUrPECP56RdUyZak0GWWC2CfkHmsFsr7fOyMhCAjXWTFcy2kqYC9O1bS MDCgbn2yUcSKwJRvMCvchbQjET/oj6ydcCNLvhucTPCBjOnW5CzrWW5nka9YOKSd1PRtdk LrBEIuXwtEpsZIWIxaEQ11FeNlAyi4MMvS/0hMNyTnqgz56ve6I8dSkB69chRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1622849182; a=rsa-sha256; cv=none; b=THUT7s7qgeuuZxgurJ0bzzpKEpPGE9h4cFy2w0ixVi4ApDWT6RWSCLl7YFcgt5jv4xyahq 94FxjXRZtnTQkU0UCx8KJqn58l9R2CaK9BWwKsXl3y0tIWOQmo1NpKZzdiEVDcx8w782Tq JuM4gszXeE5PLpuQIkS7Xl45ge0UeW7dcRlGRkJ2hW4bwq997exYk1/VgcwiMNIhUYcMG+ uEJuwTTqp5Aznad/maq+m+wZ+slUXDi8/lMBRZb0TNBVal/H+G29EYXUjskfMqRo4hiaQL pA7NrtgpaQEKHZ7kiiYR1aooGxoPGCWtqTLnN81/DIm/LGk8rdT8lBgcwfb+gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2021 23:26:23 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --AyN4PWRXa3y5INttyan1GojcnMAaaLbhz Content-Type: multipart/mixed; boundary="3Jei7mnVvXEaKbWdDWx9V5SLN1uVzolZb"; protected-headers="v1" From: Bryan Drewery To: Guido Falsi , 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 > AuthorDate: 2021-06-04 07:31:59 +0000 > Commit: Guido Falsi > 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--