git: 751f083cf699 - 2021Q2 - emulators/virtualbox-ose: Fix additions build on recent HEAD

[Guido Falsi]

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 <madpilot at FreeBSD.org>
>>> AuthorDate: 2021-06-04 07:31:59 +0000
>>> Commit:     Guido Falsi <madpilot at FreeBSD.org>
>>> 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 <madpilot at FreeBSD.org>