diff mbox series

[bug#72851,v2,4/6] gnu: pidgin: Use system ssl certs.

Message ID 22922127775e781edc3d75ec4461171cde609a1c.1724920170.git.dariqq@posteo.net
State New
Headers show
Series Pidgin updates | expand

Commit Message

Dariqq Aug. 29, 2024, 8:35 a.m. UTC
If not present pidgin bundles its own certs otherwise.

* gnu/packages/messaging.scm (pdigin) [inputs]: Add nss-certs.
[#:configure-flags]: Add  --with-system-ssl-certs

Change-Id: I14ec36002b31b4de52871f065bd18c9d30eca275
---
 gnu/packages/messaging.scm | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Liliana Marie Prikler Aug. 30, 2024, 8:09 p.m. UTC | #1
Am Donnerstag, dem 29.08.2024 um 08:35 +0000 schrieb Dariqq:
> If not present pidgin bundles its own certs otherwise.
This should probably be a code comment or none at all.

> * gnu/packages/messaging.scm (pdigin) [inputs]: Add nss-certs.
Note: pdgin, not pidgin.
> [#:configure-flags]: Add  --with-system-ssl-certs
> 
> Change-Id: I14ec36002b31b4de52871f065bd18c9d30eca275
> ---
>  gnu/packages/messaging.scm | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 6b3dff2152..4992db1bee 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -74,6 +74,7 @@ (define-module (gnu packages messaging)
>    #:use-module (gnu packages bison)
>    #:use-module (gnu packages boost)
>    #:use-module (gnu packages check)
> +  #:use-module (gnu packages certs)
>    #:use-module (gnu packages code)
>    #:use-module (gnu packages compression)
>    #:use-module (gnu packages cpp)
> @@ -1002,6 +1003,7 @@ (define-public pidgin
>             network-manager
>             nspr
>             nss
> +           nss-certs
>             pango
>             perl
>             python-2
> @@ -1024,6 +1026,9 @@ (define-public pidgin
>          "--disable-gevolution"
>          "--enable-cap"
>          "--enable-cyrus-sasl"
> +        (string-append "--with-system-ssl-certs="
> +                       (assoc-ref %build-inputs "nss-certs")
> +                       "/etc/ssl/certs")
If pidgin bundles certificates, we should also drop them with a
snippet.  A runtime option would still be preferable – search for
SSL_CERT_DIR.


Cheers
Dariqq Aug. 31, 2024, 9:07 a.m. UTC | #2
Hi Liliana,

On 30.08.24 22:09, Liliana Marie Prikler wrote:
> Am Donnerstag, dem 29.08.2024 um 08:35 +0000 schrieb Dariqq:
>> If not present pidgin bundles its own certs otherwise.
> This should probably be a code comment or none at all.
> 
>> * gnu/packages/messaging.scm (pdigin) [inputs]: Add nss-certs.
> Note: pdgin, not pidgin.
>> [#:configure-flags]: Add  --with-system-ssl-certs
>>
>> Change-Id: I14ec36002b31b4de52871f065bd18c9d30eca275
>> ---
>>   gnu/packages/messaging.scm | 5 +++++
>>   1 file changed, 5 insertions(+)
>>
>> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
>> index 6b3dff2152..4992db1bee 100644
>> --- a/gnu/packages/messaging.scm
>> +++ b/gnu/packages/messaging.scm
>> @@ -74,6 +74,7 @@ (define-module (gnu packages messaging)
>>     #:use-module (gnu packages bison)
>>     #:use-module (gnu packages boost)
>>     #:use-module (gnu packages check)
>> +  #:use-module (gnu packages certs)
>>     #:use-module (gnu packages code)
>>     #:use-module (gnu packages compression)
>>     #:use-module (gnu packages cpp)
>> @@ -1002,6 +1003,7 @@ (define-public pidgin
>>              network-manager
>>              nspr
>>              nss
>> +           nss-certs
>>              pango
>>              perl
>>              python-2
>> @@ -1024,6 +1026,9 @@ (define-public pidgin
>>           "--disable-gevolution"
>>           "--enable-cap"
>>           "--enable-cyrus-sasl"
>> +        (string-append "--with-system-ssl-certs="
>> +                       (assoc-ref %build-inputs "nss-certs")
>> +                       "/etc/ssl/certs")
> If pidgin bundles certificates, we should also drop them with a
> snippet. 

Removing the share/ca-certs/ dir in the source breaks the build system.

pidign/libpurple only installs and uses the bundled certs if the 
--with-system-ssl-certs is *not* given.


>  A runtime option would still be preferable – search for
> SSL_CERT_DIR.
> 

I am not motivated enough to try to patch pidgin to make this work, when 
all I initially wanted is a version that is not 3 years out of date.


> Cheers

Have a nice day
Liliana Marie Prikler Aug. 31, 2024, 4:31 p.m. UTC | #3
Am Samstag, dem 31.08.2024 um 09:07 +0000 schrieb Dariqq:
> 
> I am not motivated enough to try to patch pidgin to make this work,
> when all I initially wanted is a version that is not 3 years out of
> date.
Fair enough.  It's pushed now.

Cheers
diff mbox series

Patch

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 6b3dff2152..4992db1bee 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -74,6 +74,7 @@  (define-module (gnu packages messaging)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages certs)
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
@@ -1002,6 +1003,7 @@  (define-public pidgin
            network-manager
            nspr
            nss
+           nss-certs
            pango
            perl
            python-2
@@ -1024,6 +1026,9 @@  (define-public pidgin
         "--disable-gevolution"
         "--enable-cap"
         "--enable-cyrus-sasl"
+        (string-append "--with-system-ssl-certs="
+                       (assoc-ref %build-inputs "nss-certs")
+                       "/etc/ssl/certs")
         (string-append "--with-ncurses-headers="
                        (assoc-ref %build-inputs "ncurses")
                        "/include")