Re: [FFmpeg-devel] [PATCH] configure: Improve the check for the rsync --contimeout option

["Martin Storsjö" <martin@martin.st>]

On Tue, 28 Jan 2025, epirat07@gmail.com wrote:

> On 24 Jan 2025, at 22:40, Martin Storsjö wrote:
>
>> Traditionally, macOS has shipped an old version of rsync that lacked
>> support for this version, hence this check (added in
>> a8b3f0c5cf548f654e30c981988bb71981a3f8d3).
>>
>> However, in macOS 15.x, they have switched to providing rsync as a
>> different tool, openrsync. The version of openrsync in at least
>> macOS 15.2 does include "[--contimeout]" (note the lack of "=" after
>> the option), in the output of "rsync --help", but when used, the tool
>> errors out with "rsync: --contimeout=60: unknown option". So apparently
>> the tool erroenously lists the option as supported, while it really
>> isn't.
>>
>> The original rsync tool prints "--contimeout=SECONDS" in the output
>> of "rsync --help".
>>
>> It is unclear which version of openrsync this is; the latest upstream
>> openrsync from OpenBSD does support the option and includes
>> "[--contimeout=seconds]" in the output of "--help", and older versions
>> don't seem to include the option as listed at all.
>>
>> Therefore, check for "--conntimeout=" with the "=", this should
>> properly detect both new enough rsync and openrsync.
>>
>> This fixes running "fate-rsync" on macOS 15.x.
>
> Thanks, tested and can confirm that it fixes the rsync failure on macOS 15.x
> while not breaking macOS 14.x.
>
> LGTM

Thanks, pushed!

// Martin
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".