Message ID | 22a3abec-9261-38e5-3108-2269752258f4@ipfire.org |
---|---|
State | Accepted |
Commit | 76d9ce6b11f01600c88641f022dc64a260fdf9b1 |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4MVH8921GDz3wbV for <patchwork@web04.haj.ipfire.org>; Sat, 17 Sep 2022 16:53:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4MVH876v5Dz2LX; Sat, 17 Sep 2022 16:53:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4MVH876w9gz2xvx; Sat, 17 Sep 2022 16:53:43 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4MVH861jhwz2xHF for <development@lists.ipfire.org>; Sat, 17 Sep 2022 16:53:42 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4MVH844gDpz1F4 for <development@lists.ipfire.org>; Sat, 17 Sep 2022 16:53:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1663433621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bCM11OINQ9Az0rxgyHlBe+hF0zoKY8INNA37iE5KZTw=; b=XCwm+nKETiT+v1ZK+62Duj4a/0OgEhkZ6r8fwZO8vHPdUov/7eczNbPy9YYDX4Nod+Aary DKe7WeYc+IvzRiDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1663433621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bCM11OINQ9Az0rxgyHlBe+hF0zoKY8INNA37iE5KZTw=; b=jz5Hr2t2XrXCcEegJV3JYllokpSiwOIJPzVwL2HpXD1gUL/CxMz50ccRM7xQajkdyqxzam sg28rSBz4ri/9RghMU3jkFc4cQEyKjz7OkBNeDcTtvIaw00ybspBaXBnyJf6HZRj7d1XvD 9RYMvwOa3Dwr3YDY2PyP2jgHHTn0mB4rAGDRmeHzJI+mLZ8J33TjDLuK8M716tbie7xiWL QZp9jEcm3m1JwNTd+9lBz/dU1L55usLf85IrB7Abo/iROJEBJfAQT5A07htP9E05R56fs3 +ouHVKzw8cxmb6IWHPjI2JZdC3GDymP6RFFvHI4BwGGQPLmDnCsN9/k70Hv+oQ== Message-ID: <22a3abec-9261-38e5-3108-2269752258f4@ipfire.org> Date: Sat, 17 Sep 2022 16:53:36 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" <development@lists.ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= <peter.mueller@ipfire.org> Subject: [PATCH] Core Update 171: Ship libsodium Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
Core Update 171: Ship libsodium
|
|
Commit Message
Peter Müller
Sept. 17, 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
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
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
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 >
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 >>
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
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 >
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