Libguestfs - Sep 2019 - Re: [nbdkit PATCH] curl: Compile with libcurl even without smb(s) protocols

I needed to compile nbdkit on CentOS 7 which is missing these protocols in curl,
so hence the conditional compilation.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
I have this patch so that I can compile it on CentOS 7 (fully updated), but
I'm
not sure what is the support policy and I didn't even check whether the
libcurl
there is old or whether the SMB support is removed on purpose.

 plugins/curl/curl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
index 7e3e8c923721..acd3333d5b88 100644
--- a/plugins/curl/curl.c
+++ b/plugins/curl/curl.c
@@ -118,8 +118,12 @@ static struct { const char *name; long bitmask; }
curl_protocols[] = {
   { "rtmps", CURLPROTO_RTMPS },
   { "rtmpts", CURLPROTO_RTMPTS },
   { "gopher", CURLPROTO_GOPHER },
+#ifdef CURLPROTO_SMB
   { "smb", CURLPROTO_SMB },
+#endif /* CURLPROTO_SMB */
+#ifdef CURLPROTO_SMBS
   { "smbs", CURLPROTO_SMBS },
+#endif /* CURLPROTO_SMBS */
   { NULL }
 };
 
-- 
2.23.0

On Fri, Sep 20, 2019 at 10:38:52AM +0200, Martin Kletzander
wrote:
> I needed to compile nbdkit on CentOS 7 which is missing these protocols in
curl,
> so hence the conditional compilation.
> 
> Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
> ---
> I have this patch so that I can compile it on CentOS 7 (fully updated), but
I'm
> not sure what is the support policy and I didn't even check whether the
libcurl
> there is old or whether the SMB support is removed on purpose.
> 
>  plugins/curl/curl.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
> index 7e3e8c923721..acd3333d5b88 100644
> --- a/plugins/curl/curl.c
> +++ b/plugins/curl/curl.c
> @@ -118,8 +118,12 @@ static struct { const char *name; long bitmask; }
curl_protocols[] = {
>    { "rtmps", CURLPROTO_RTMPS },
>    { "rtmpts", CURLPROTO_RTMPTS },
>    { "gopher", CURLPROTO_GOPHER },
> +#ifdef CURLPROTO_SMB
>    { "smb", CURLPROTO_SMB },
> +#endif /* CURLPROTO_SMB */
> +#ifdef CURLPROTO_SMBS
>    { "smbs", CURLPROTO_SMBS },
> +#endif /* CURLPROTO_SMBS */
>    { NULL }
>  };
I may be missing something but don't we have this already?

https://github.com/libguestfs/nbdkit/commit/9e58e32c08859c34d695073dcaea683705353d10

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW

On Fri, Sep 20, 2019 at 10:16:56AM +0100, Richard W.M. Jones
wrote:
>On Fri, Sep 20, 2019 at 10:38:52AM +0200, Martin Kletzander wrote:
>> I needed to compile nbdkit on CentOS 7 which is missing these protocols
in curl,
>> so hence the conditional compilation.
>>
>> Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
>> ---
>> I have this patch so that I can compile it on CentOS 7 (fully updated),
but I'm
>> not sure what is the support policy and I didn't even check whether
the libcurl
>> there is old or whether the SMB support is removed on purpose.
>>
>>  plugins/curl/curl.c | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c
>> index 7e3e8c923721..acd3333d5b88 100644
>> --- a/plugins/curl/curl.c
>> +++ b/plugins/curl/curl.c
>> @@ -118,8 +118,12 @@ static struct { const char *name; long bitmask; }
curl_protocols[] = {
>>    { "rtmps", CURLPROTO_RTMPS },
>>    { "rtmpts", CURLPROTO_RTMPTS },
>>    { "gopher", CURLPROTO_GOPHER },
>> +#ifdef CURLPROTO_SMB
>>    { "smb", CURLPROTO_SMB },
>> +#endif /* CURLPROTO_SMB */
>> +#ifdef CURLPROTO_SMBS
>>    { "smbs", CURLPROTO_SMBS },
>> +#endif /* CURLPROTO_SMBS */
>>    { NULL }
>>  };
>
>I may be missing something but don't we have this already?
>
>https://github.com/libguestfs/nbdkit/commit/9e58e32c08859c34d695073dcaea683705353d10
>
Guess who forgot to update the repository he was trying on centos7... Sorry for
the noise :D
>Rich.
>
>-- 
>Richard Jones, Virtualization Group, Red Hat
http://people.redhat.com/~rjones
>Read my programming and virtualization blog: http://rwmj.wordpress.com
>Fedora Windows cross-compiler. Compile Windows programs, test, and
>build Windows installers. Over 100 libraries supported.
>http://fedoraproject.org/wiki/MinGW