From owner-dev-commits-ports-branches@freebsd.org Sat Jun 5 09:30:09 2021 Return-Path: Delivered-To: dev-commits-ports-branches@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 AC84C63FDCF; Sat, 5 Jun 2021 09:30:09 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FxvVn4YqVz4j1W; Sat, 5 Jun 2021 09:30:09 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from marvin.madpilot.net (host-79-34-21-42.business.telecomitalia.it [79.34.21.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 0017E5B0B; Sat, 5 Jun 2021 09:30:08 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Subject: Re: git: 751f083cf699 - 2021Q2 - emulators/virtualbox-ose: Fix additions build on recent HEAD From: Guido Falsi To: Bryan Drewery , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org References: <202106040738.1547cWOQ067316@gitrepo.freebsd.org> <1ded6b60-19c9-c195-bcb7-1450c7e8d662@FreeBSD.org> <0a722a23-c2a4-dbc1-28d8-2588045259c5@FreeBSD.org> Message-ID: <4948a5e1-9caf-a645-d95f-334b3455ad31@FreeBSD.org> Date: Sat, 5 Jun 2021 11:30:07 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <0a722a23-c2a4-dbc1-28d8-2588045259c5@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jun 2021 09:30:09 -0000 On 05/06/21 11:18, Guido Falsi wrote: > On 05/06/21 01:26, Bryan Drewery wrote: >> On 6/4/2021 12:38 AM, Guido Falsi wrote: >>> The branch 2021Q2 has been updated by madpilot: >>> >>> URL: >>> https://cgit.FreeBSD.org/ports/commit/?id=751f083cf699a4cac35c5a7b616da653d6cb5f2e >>> >>> >>> commit 751f083cf699a4cac35c5a7b616da653d6cb5f2e >>> Author:     Guido Falsi >>> AuthorDate: 2021-06-04 07:31:59 +0000 >>> Commit:     Guido Falsi >>> CommitDate: 2021-06-04 07:37:56 +0000 >>> >>>      emulators/virtualbox-ose: Fix additions build on recent HEAD >>>      Src HEAD commit 6d3e78ad6c11 vfs_quotactl function signature, adapt >>>      virtualbox code to be able to compile there too. >>>      MFH:            2021Q2 >>>      (cherry picked from commit >>> ef04eff33cf6262e79da1d092d69951ae26f915a) >>> --- >>>   .../patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c >>> | 6 +++++- >>>   1 file changed, 5 insertions(+), 1 deletion(-) >>> >>> diff --git >>> a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c >>> b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c >>> >>> index 5d21a89925de..712a3602a2da 100644 >>> --- >>> a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c >>> >>> +++ >>> b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_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 >= 1400018 >>> ++    , bool *mp_busy >>> ++#endif >>> ++    ) >>>    { >>>   -    int rc; >>>   +    return (EOPNOTSUPP); >>> >> >> 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: >> >>> ===>  Applying FreeBSD patches for virtualbox-ose-6.1.18 from >>> /usr/ports/emulators/virtualbox-ose/files >>> patch: **** malformed patch at line 645: +      sbp->f_namemax = >>> fsinfo.maxnamesize; >> >> > > Ops, terribly sorry, I clearly mismerged this one. I'm going to fix it > shortly. > Fixed in cda48021e878 -- Guido Falsi