[PATCH] Core Update 171: Ship libsodium

[PATCH] Core Update 171: Ship libsodium

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

Fixes: #12929
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 config/rootfiles/core/171/filelists/libsodium | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 config/rootfiles/core/171/filelists/libsodium

diff --git a/config/rootfiles/core/171/filelists/libsodium b/config/rootfiles/core/171/filelists/libsodium
new file mode 120000
index 000000000..ebd862fbc
--- /dev/null
+++ b/config/rootfiles/core/171/filelists/libsodium
@@ -0,0 +1 @@
+../../../common/libsodium
\ No newline at end of file
-- 
2.35.3

Re: [PATCH] Core Update 171: Ship libsodium

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 17/09/2022 18:53, Peter Müller wrote:
> Fixes: #12929
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
>   config/rootfiles/core/171/filelists/libsodium | 1 +
>   1 file changed, 1 insertion(+)
>   create mode 120000 config/rootfiles/core/171/filelists/libsodium
>
> diff --git a/config/rootfiles/core/171/filelists/libsodium b/config/rootfiles/core/171/filelists/libsodium
> new file mode 120000
> index 000000000..ebd862fbc
> --- /dev/null
> +++ b/config/rootfiles/core/171/filelists/libsodium
> @@ -0,0 +1 @@
> +../../../common/libsodium
> \ No newline at end of file

-- 
Sent from my laptop

Re: [PATCH] Core Update 171: Ship libsodium

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 802 bytes --]

Why?

> On 17 Sep 2022, at 23:09, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>
> 
> On 17/09/2022 18:53, Peter Müller wrote:
>> Fixes: #12929
>> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
>> ---
>> config/rootfiles/core/171/filelists/libsodium | 1 +
>> 1 file changed, 1 insertion(+)
>> create mode 120000 config/rootfiles/core/171/filelists/libsodium
>> 
>> diff --git a/config/rootfiles/core/171/filelists/libsodium b/config/rootfiles/core/171/filelists/libsodium
>> new file mode 120000
>> index 000000000..ebd862fbc
>> --- /dev/null
>> +++ b/config/rootfiles/core/171/filelists/libsodium
>> @@ -0,0 +1 @@
>> +../../../common/libsodium
>> \ No newline at end of file
> 
> -- 
> Sent from my laptop

Re: [PATCH] Core Update 171: Ship libsodium

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1555 bytes --]

Hi Michael,

On 18/09/2022 11:08, Michael Tremer wrote:
> Why?
Because dnsdist has the default for the configure option of --with-libsodium set to auto so in the p[ast dnsdist was built without linking to libsodium. With the introduction of libsodium into the build dnsdist automatically found it and linked to it.

So when libsodium was not shipped then dnsdist fails because it can't find the linked libsodium.so.23 file.

If you don't want to ship libsodium, then the other alternative is that I can raise a patch to add --without-libsodium to the dnsdist configure. That will make it build and run with libsodium being in the build but not in the shipped core packages.

Which way should I do this?

Regards,

Adolf.
> 
>> On 17 Sep 2022, at 23:09, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>
>> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>
>> On 17/09/2022 18:53, Peter Müller wrote:
>>> Fixes: #12929
>>> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
>>> ---
>>> config/rootfiles/core/171/filelists/libsodium | 1 +
>>> 1 file changed, 1 insertion(+)
>>> create mode 120000 config/rootfiles/core/171/filelists/libsodium
>>>
>>> diff --git a/config/rootfiles/core/171/filelists/libsodium b/config/rootfiles/core/171/filelists/libsodium
>>> new file mode 120000
>>> index 000000000..ebd862fbc
>>> --- /dev/null
>>> +++ b/config/rootfiles/core/171/filelists/libsodium
>>> @@ -0,0 +1 @@
>>> +../../../common/libsodium
>>> \ No newline at end of file
>>
>> -- 
>> Sent from my laptop
> 

Re: [PATCH] Core Update 171: Ship libsodium

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1801 bytes --]

Hi Michael,

On 18/09/2022 12:44, Adolf Belka wrote:
> Hi Michael,
>
> On 18/09/2022 11:08, Michael Tremer wrote:
>> Why?
> Because dnsdist has the default for the configure option of 
> --with-libsodium set to auto so in the p[ast dnsdist was built without 
> linking to libsodium. With the introduction of libsodium into the 
> build dnsdist automatically found it and linked to it.
>
> So when libsodium was not shipped then dnsdist fails because it can't 
> find the linked libsodium.so.23 file.
>
> If you don't want to ship libsodium, then the other alternative is 
> that I can raise a patch to add --without-libsodium to the dnsdist 
> configure. That will make it build and run with libsodium being in the 
> build but not in the shipped core packages.
>
> Which way should I do this?
>
Is there a decision made about which option to use?
- Ship libsodium in core IPFire
- Build dnsdist without libsodium

Regards,
Adolf
> Regards,
>
> Adolf.
>>
>>> On 17 Sep 2022, at 23:09, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>>
>>> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>>
>>> On 17/09/2022 18:53, Peter Müller wrote:
>>>> Fixes: #12929
>>>> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
>>>> ---
>>>> config/rootfiles/core/171/filelists/libsodium | 1 +
>>>> 1 file changed, 1 insertion(+)
>>>> create mode 120000 config/rootfiles/core/171/filelists/libsodium
>>>>
>>>> diff --git a/config/rootfiles/core/171/filelists/libsodium 
>>>> b/config/rootfiles/core/171/filelists/libsodium
>>>> new file mode 120000
>>>> index 000000000..ebd862fbc
>>>> --- /dev/null
>>>> +++ b/config/rootfiles/core/171/filelists/libsodium
>>>> @@ -0,0 +1 @@
>>>> +../../../common/libsodium
>>>> \ No newline at end of file
>>>
>>> -- 
>>> Sent from my laptop
>>

-- 
Sent from my laptop

Re: [PATCH] Core Update 171: Ship libsodium

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2202 bytes --]

Hello Adolf,

Sorry, I overlooked that question.

I am currently fairly indifferent about this, but since the library is kind of small, it might be a better idea to have it as part of the core system.

-Michael

> On 27 Sep 2022, at 09:09, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> Hi Michael,
> 
> On 18/09/2022 12:44, Adolf Belka wrote:
>> Hi Michael,
>> 
>> On 18/09/2022 11:08, Michael Tremer wrote:
>>> Why?
>> Because dnsdist has the default for the configure option of --with-libsodium set to auto so in the p[ast dnsdist was built without linking to libsodium. With the introduction of libsodium into the build dnsdist automatically found it and linked to it.
>> 
>> So when libsodium was not shipped then dnsdist fails because it can't find the linked libsodium.so.23 file.
>> 
>> If you don't want to ship libsodium, then the other alternative is that I can raise a patch to add --without-libsodium to the dnsdist configure. That will make it build and run with libsodium being in the build but not in the shipped core packages.
>> 
>> Which way should I do this?
>> 
> Is there a decision made about which option to use?
> - Ship libsodium in core IPFire
> - Build dnsdist without libsodium
> 
> Regards,
> Adolf
>> Regards,
>> 
>> Adolf.
>>> 
>>>> On 17 Sep 2022, at 23:09, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>>> 
>>>> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>>> 
>>>> On 17/09/2022 18:53, Peter Müller wrote:
>>>>> Fixes: #12929
>>>>> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
>>>>> ---
>>>>> config/rootfiles/core/171/filelists/libsodium | 1 +
>>>>> 1 file changed, 1 insertion(+)
>>>>> create mode 120000 config/rootfiles/core/171/filelists/libsodium
>>>>> 
>>>>> diff --git a/config/rootfiles/core/171/filelists/libsodium b/config/rootfiles/core/171/filelists/libsodium
>>>>> new file mode 120000
>>>>> index 000000000..ebd862fbc
>>>>> --- /dev/null
>>>>> +++ b/config/rootfiles/core/171/filelists/libsodium
>>>>> @@ -0,0 +1 @@
>>>>> +../../../common/libsodium
>>>>> \ No newline at end of file
>>>> 
>>>> -- 
>>>> Sent from my laptop
>>> 
> 
> -- 
> Sent from my laptop

Re: [PATCH] Core Update 171: Ship libsodium

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 2466 bytes --]

Hi Michael & Peter,

On 27/09/2022 10:16, Michael Tremer wrote:
> Hello Adolf,
> 
> Sorry, I overlooked that question.
> 
> I am currently fairly indifferent about this, but since the library is kind of small, it might be a better idea to have it as part of the core system.
Shipping libsodium has been added to CU171 so then we leave things as 
they currently are.

Regards,
Adolf.
> 
> -Michael
> 
>> On 27 Sep 2022, at 09:09, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>
>> Hi Michael,
>>
>> On 18/09/2022 12:44, Adolf Belka wrote:
>>> Hi Michael,
>>>
>>> On 18/09/2022 11:08, Michael Tremer wrote:
>>>> Why?
>>> Because dnsdist has the default for the configure option of --with-libsodium set to auto so in the p[ast dnsdist was built without linking to libsodium. With the introduction of libsodium into the build dnsdist automatically found it and linked to it.
>>>
>>> So when libsodium was not shipped then dnsdist fails because it can't find the linked libsodium.so.23 file.
>>>
>>> If you don't want to ship libsodium, then the other alternative is that I can raise a patch to add --without-libsodium to the dnsdist configure. That will make it build and run with libsodium being in the build but not in the shipped core packages.
>>>
>>> Which way should I do this?
>>>
>> Is there a decision made about which option to use?
>> - Ship libsodium in core IPFire
>> - Build dnsdist without libsodium
>>
>> Regards,
>> Adolf
>>> Regards,
>>>
>>> Adolf.
>>>>
>>>>> On 17 Sep 2022, at 23:09, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>>>>
>>>>> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>>>>
>>>>> On 17/09/2022 18:53, Peter Müller wrote:
>>>>>> Fixes: #12929
>>>>>> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
>>>>>> ---
>>>>>> config/rootfiles/core/171/filelists/libsodium | 1 +
>>>>>> 1 file changed, 1 insertion(+)
>>>>>> create mode 120000 config/rootfiles/core/171/filelists/libsodium
>>>>>>
>>>>>> diff --git a/config/rootfiles/core/171/filelists/libsodium b/config/rootfiles/core/171/filelists/libsodium
>>>>>> new file mode 120000
>>>>>> index 000000000..ebd862fbc
>>>>>> --- /dev/null
>>>>>> +++ b/config/rootfiles/core/171/filelists/libsodium
>>>>>> @@ -0,0 +1 @@
>>>>>> +../../../common/libsodium
>>>>>> \ No newline at end of file
>>>>>
>>>>> -- 
>>>>> Sent from my laptop
>>>>
>>
>> -- 
>> Sent from my laptop
> 

-- 
Sent from my laptop