Core Update 171: Ship libsodium

Message ID 22a3abec-9261-38e5-3108-2269752258f4@ipfire.org
State Accepted
Commit 76d9ce6b11f01600c88641f022dc64a260fdf9b1
Headers
Series Core Update 171: Ship libsodium |

Commit Message

Peter Müller 17 Sep 2022, 4:53 p.m. UTC
  Fixes: #12929
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/rootfiles/core/171/filelists/libsodium | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 config/rootfiles/core/171/filelists/libsodium
  

Comments

Adolf Belka 17 Sep 2022, 9:09 p.m. UTC | #1
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>

On 17/09/2022 18:53, Peter Müller wrote:
> Fixes: #12929
> Signed-off-by: Peter Müller <peter.mueller@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
  
Michael Tremer 18 Sep 2022, 9:08 a.m. UTC | #2
Why?

> On 17 Sep 2022, at 23:09, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
> 
> On 17/09/2022 18:53, Peter Müller wrote:
>> Fixes: #12929
>> Signed-off-by: Peter Müller <peter.mueller@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
  
Adolf Belka 18 Sep 2022, 10:44 a.m. UTC | #3
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@ipfire.org> wrote:
>>
>> Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
>>
>> On 17/09/2022 18:53, Peter Müller wrote:
>>> Fixes: #12929
>>> Signed-off-by: Peter Müller <peter.mueller@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
>
  
Adolf Belka 27 Sep 2022, 8:09 a.m. UTC | #4
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@ipfire.org> wrote:
>>>
>>> Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
>>>
>>> On 17/09/2022 18:53, Peter Müller wrote:
>>>> Fixes: #12929
>>>> Signed-off-by: Peter Müller <peter.mueller@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
>>
  
Michael Tremer 27 Sep 2022, 8:16 a.m. UTC | #5
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@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@ipfire.org> wrote:
>>>> 
>>>> Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
>>>> 
>>>> On 17/09/2022 18:53, Peter Müller wrote:
>>>>> Fixes: #12929
>>>>> Signed-off-by: Peter Müller <peter.mueller@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
  
Adolf Belka 27 Sep 2022, 12:29 p.m. UTC | #6
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@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@ipfire.org> wrote:
>>>>>
>>>>> Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
>>>>>
>>>>> On 17/09/2022 18:53, Peter Müller wrote:
>>>>>> Fixes: #12929
>>>>>> Signed-off-by: Peter Müller <peter.mueller@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
>
  

Patch

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