unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#72851] [PATCH] gnu: pidgin: Update to 2.14.13 [security fixes].
@ 2024-08-28  7:41 Dariqq
  2024-08-28 18:35 ` Liliana Marie Prikler
  2024-08-29  8:35 ` [bug#72851] [PATCH v2 0/6] Pidgin updates Dariqq
  0 siblings, 2 replies; 15+ messages in thread
From: Dariqq @ 2024-08-28  7:41 UTC (permalink / raw)
  To: 72851; +Cc: Dariqq, me

The 2.14.9 update fixes CVE-2022-26491.

Cleanup leftovers from 89f4f0baa9ff956ba0efe9ec20e1805f01230a54.

* gnu/packages/messaging.scm (pidgin): Update to 2.14.13.
[source]: Switch to bz2 compression.
[snippet]: Remove.
[native-inputs]: Remove autoconf, automake and libtool.

Change-Id: Icde29d67b5ac09d7dc0939eb6c779d39b3470a6f
---
Change to bz2 compressed tarball as that is what guix refresh downloaded. This is the one used by other distributions (I have checked Arch, Fedora, NixOs). CCing the person who did the last update.

 gnu/packages/messaging.scm | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3f375f34c6..aaee5f7286 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -948,32 +948,23 @@ (define-public ngircd
 (define-public pidgin
   (package
     (name "pidgin")
-    (version "2.14.5")
+    (version "2.14.13")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "mirror://sourceforge/pidgin/Pidgin/"
-                       version "/pidgin-" version ".tar.gz"))
+                       version "/pidgin-" version ".tar.bz2"))
        (sha256
-        (base32 "12llip3r8126gph82r638xjv2v2rg34qgggn1nbwfmc3s7halimr"))
+        (base32 "1a3by4niw5ls67mwgj20p2mr317zj4hzysi5glm9mq0pivf4j00j"))
        (patches
-        (search-patches "pidgin-add-search-path.patch"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; Remove stale generated file after applying patches.
-           (delete-file "configure")
-           #t))))
+        (search-patches "pidgin-add-search-path.patch"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf) ;; For bootstrap
-       ("automake" ,automake) ;; For bootstrap
-       ("check" ,check)
+     `(("check" ,check)
        ("dot" ,graphviz)
        ("gconf" ,gconf)
        ("intltool" ,intltool)
-       ("libtool" ,libtool) ;; For bootstrap
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("avahi" ,avahi)

base-commit: 8b25e1c5c2e8833444e702209f11731627f85239
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH] gnu: pidgin: Update to 2.14.13 [security fixes].
  2024-08-28  7:41 [bug#72851] [PATCH] gnu: pidgin: Update to 2.14.13 [security fixes] Dariqq
@ 2024-08-28 18:35 ` Liliana Marie Prikler
  2024-08-28 20:01   ` Dariqq
  2024-08-29  8:35 ` [bug#72851] [PATCH v2 0/6] Pidgin updates Dariqq
  1 sibling, 1 reply; 15+ messages in thread
From: Liliana Marie Prikler @ 2024-08-28 18:35 UTC (permalink / raw)
  To: Dariqq, 72851; +Cc: me

Am Mittwoch, dem 28.08.2024 um 07:41 +0000 schrieb Dariqq:
> The 2.14.9 update fixes CVE-2022-26491.
> 
> Cleanup leftovers from 89f4f0baa9ff956ba0efe9ec20e1805f01230a54.
> 
> * gnu/packages/messaging.scm (pidgin): Update to 2.14.13.
> [source]: Switch to bz2 compression.
> [snippet]: Remove.
Why?
> [native-inputs]: Remove autoconf, automake and libtool.
Again, why?

> Change-Id: Icde29d67b5ac09d7dc0939eb6c779d39b3470a6f
> ---
> Change to bz2 compressed tarball as that is what guix refresh
> downloaded. This is the one used by other distributions (I have
> checked Arch, Fedora, NixOs). CCing the person who did the last
> update.
> 
>  gnu/packages/messaging.scm | 19 +++++--------------
>  1 file changed, 5 insertions(+), 14 deletions(-)
> 
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 3f375f34c6..aaee5f7286 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -948,32 +948,23 @@ (define-public ngircd
>  (define-public pidgin
>    (package
>      (name "pidgin")
> -    (version "2.14.5")
> +    (version "2.14.13")
>      (source
>       (origin
>         (method url-fetch)
>         (uri
>          (string-append "mirror://sourceforge/pidgin/Pidgin/"
> -                       version "/pidgin-" version ".tar.gz"))
> +                       version "/pidgin-" version ".tar.bz2"))
>         (sha256
> -        (base32
> "12llip3r8126gph82r638xjv2v2rg34qgggn1nbwfmc3s7halimr"))
> +        (base32
> "1a3by4niw5ls67mwgj20p2mr317zj4hzysi5glm9mq0pivf4j00j"))
>         (patches
> -        (search-patches "pidgin-add-search-path.patch"))
> -       (modules '((guix build utils)))
> -       (snippet
> -        '(begin
> -           ;; Remove stale generated file after applying patches.
> -           (delete-file "configure")
> -           #t))))
> +        (search-patches "pidgin-add-search-path.patch"))))
>      (build-system glib-or-gtk-build-system)
>      (native-inputs
> -     `(("autoconf" ,autoconf) ;; For bootstrap
> -       ("automake" ,automake) ;; For bootstrap
> -       ("check" ,check)
> +     `(("check" ,check)
>         ("dot" ,graphviz)
>         ("gconf" ,gconf)
>         ("intltool" ,intltool)
> -       ("libtool" ,libtool) ;; For bootstrap
>         ("pkg-config" ,pkg-config)))
As a follow-up commit, you might want to drop the input labels.

Cheers

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH] gnu: pidgin: Update to 2.14.13 [security fixes].
  2024-08-28 18:35 ` Liliana Marie Prikler
@ 2024-08-28 20:01   ` Dariqq
  2024-08-28 20:22     ` Liliana Marie Prikler
  0 siblings, 1 reply; 15+ messages in thread
From: Dariqq @ 2024-08-28 20:01 UTC (permalink / raw)
  To: Liliana Marie Prikler, 72851; +Cc: me

Hi Liliana,

On 28.08.24 20:35, Liliana Marie Prikler wrote:
> Am Mittwoch, dem 28.08.2024 um 07:41 +0000 schrieb Dariqq:
>> The 2.14.9 update fixes CVE-2022-26491.
>>
>> Cleanup leftovers from 89f4f0baa9ff956ba0efe9ec20e1805f01230a54.
>>
>> * gnu/packages/messaging.scm (pidgin): Update to 2.14.13.
>> [source]: Switch to bz2 compression.
>> [snippet]: Remove.
> Why?
>> [native-inputs]: Remove autoconf, automake and libtool.
> Again, why?
> 
bz2 change: Default for the source download on the pidgin website and is 
what guix refresh fetched for me.


THe snippet was needed for an older patch (touching configure.ac) which 
got removed in commit 89f4f0baa9ff956ba0efe9ec20e1805f01230a54.
There was a comment "Remove the snippet and bootstrapping native inputs 
together with this patch" resp. "Remove stale generated file after 
applying pidgin-libnm.patch.".

Should configure scripts always be regenerated when building from tarballs?

> As a follow-up commit, you might want to drop the input labels.
> 
ALso noticed some other things later today:
- no status icon : --enable-trayicon-compat
-  nss-certs:  --with-system-ssl-certs=<dir>
- finch.pc requires libgnt. Should that also be propagated?
- Propagating gtk2 (required by pidgin.pc) conflicts in my home 
environments with nm-applet propagating gtk3.
- python2

> Cheers




^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH] gnu: pidgin: Update to 2.14.13 [security fixes].
  2024-08-28 20:01   ` Dariqq
@ 2024-08-28 20:22     ` Liliana Marie Prikler
  2024-08-28 21:30       ` Dariqq
  0 siblings, 1 reply; 15+ messages in thread
From: Liliana Marie Prikler @ 2024-08-28 20:22 UTC (permalink / raw)
  To: Dariqq, 72851; +Cc: me

Am Mittwoch, dem 28.08.2024 um 20:01 +0000 schrieb Dariqq:
> Should configure scripts always be regenerated when building from
> tarballs?
I think it makes sense to do so.

> > As a follow-up commit, you might want to drop the input labels.
> > 
> ALso noticed some other things later today:
> - no status icon : --enable-trayicon-compat
That one's de gustibus, especially in GNOME, where tray icons have
fallen out of favour.
> -  nss-certs:  --with-system-ssl-certs=<dir>
Pidgin should support the environment variable SSL_CERT_DIR – it would
be a bug if not.
> - finch.pc requires libgnt. Should that also be propagated?
> - Propagating gtk2 (required by pidgin.pc) conflicts in my home 
> environments with nm-applet propagating gtk3.
Presumably, this ought to be fine (it is 2 vs 3 after all), but you
might want to ignore the propagation(s), as pidgin is mostly used as an
app.  
> - python2
Ahh, well what can you do ‾\_(ツ)_/‾




^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH] gnu: pidgin: Update to 2.14.13 [security fixes].
  2024-08-28 20:22     ` Liliana Marie Prikler
@ 2024-08-28 21:30       ` Dariqq
  0 siblings, 0 replies; 15+ messages in thread
From: Dariqq @ 2024-08-28 21:30 UTC (permalink / raw)
  To: Liliana Marie Prikler, 72851; +Cc: me



On 28.08.24 22:22, Liliana Marie Prikler wrote:
> Am Mittwoch, dem 28.08.2024 um 20:01 +0000 schrieb Dariqq:
>> Should configure scripts always be regenerated when building from
>> tarballs?
> I think it makes sense to do so.
> 

Ok, will adjust this in a v2 (probably tomorrow sometime)

>>> As a follow-up commit, you might want to drop the input labels.
>>>
>> ALso noticed some other things later today:
>> - no status icon : --enable-trayicon-compat
> That one's de gustibus, especially in GNOME, where tray icons have
> fallen out of favour.

On my other system (not yet running guix) pidgin is built without this 
option and i have an icon (both gnome + appindicator extension). Need to 
investigate more.

Also dbus support would be nice,.
 From the configure log:
checking for python3... no
configure: WARNING: python3 interpreter not found in your path
Building without D-Bus support

Maybe we can just upgrade to python3 and be happy.

>> -  nss-certs:  --with-system-ssl-certs=<dir>
> Pidgin should support the environment variable SSL_CERT_DIR – it would
> be a bug if not.

Was grepping the tarball and could not find any reference to 
SSL_CERT_DIR. Without specifying a path to system certs pidgin/libpurple 
seems to bundle its own.

  The few package recipes i checked from other distribitions specify 
their global store here.

>> - finch.pc requires libgnt. Should that also be propagated?
>> - Propagating gtk2 (required by pidgin.pc) conflicts in my home
>> environments with nm-applet propagating gtk3.
> Presumably, this ought to be fine (it is 2 vs 3 after all), but you
> might want to ignore the propagation(s), as pidgin is mostly used as an
> app.

This is the error i get:
guix home: error: profile contains conflicting entries for gtk+
guix home: error:   first entry: gtk+@2.24.33 
/gnu/store/mm0dbi0gnd1vlip26wfs1nlll7cn3rd8-gtk+-2.24.33
guix home: error:    ... propagated from pidgin@2.14.5
guix home: error:   second entry: gtk+@3.24.41 
/gnu/store/ix9kcspd3n2rws5il1pfpy7i2yfh0q7v-gtk+-3.24.41
guix home: error:    ... propagated from network-manager-applet@1.36.0
hint: Try upgrading both `pidgin' and `network-manager-applet', or 
remove one of them from the profile.

"solved" this by making a local variant of pidgin with the propagated 
inputs as normal inputs.

>> - python2
> Ahh, well what can you do ‾\_(ツ)_/‾




^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH v2 0/6] Pidgin updates
  2024-08-28  7:41 [bug#72851] [PATCH] gnu: pidgin: Update to 2.14.13 [security fixes] Dariqq
  2024-08-28 18:35 ` Liliana Marie Prikler
@ 2024-08-29  8:35 ` Dariqq
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 1/6] gnu: pidgin: Update to 2.14.13 [security fixes] Dariqq
                     ` (5 more replies)
  1 sibling, 6 replies; 15+ messages in thread
From: Dariqq @ 2024-08-29  8:35 UTC (permalink / raw)
  To: 72851; +Cc: Dariqq, me, liliana.prikler

Hi,
Dropped the change of regenerating configure script, removed labels, unbundled certs and removed python2 dependency.

Also added comments for pidgin and libgnt that propagating is for satisfing pkgconfig

I didnt enable the compat indicator becuase that seems to be an issue with the appindicator gnome-extension and not pidgin. 


Dariqq (6):
  gnu: pidgin: Update to 2.14.13 [security fixes].
  gnu: pidgin: Remove input labels.
  gnu: pdigin: Propagate libgnt.
  gnu: pidgin: Use system ssl certs.
  gnu: libgnt: Build without python2.
  gnu: pidgin: Use python3.

 gnu/packages/messaging.scm | 105 ++++++++++++++++++++-----------------
 1 file changed, 56 insertions(+), 49 deletions(-)


base-commit: 0c908518375aea50be6dec703367c01944c8c721
-- 
2.45.2





^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH v2 1/6] gnu: pidgin: Update to 2.14.13 [security fixes].
  2024-08-29  8:35 ` [bug#72851] [PATCH v2 0/6] Pidgin updates Dariqq
@ 2024-08-29  8:35   ` Dariqq
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 2/6] gnu: pidgin: Remove input labels Dariqq
                     ` (4 subsequent siblings)
  5 siblings, 0 replies; 15+ messages in thread
From: Dariqq @ 2024-08-29  8:35 UTC (permalink / raw)
  To: 72851; +Cc: Dariqq, me, liliana.prikler

The 2.14.9 update fixes CVE-2022-26491.

* gnu/packages/messaging.scm (pidgin): Update to 2.14.13.
[source]: Switch to bz2 compression.

Change-Id: I02227f13478bbc07d53941b0d92d20dd3a6cc8ed
---
 gnu/packages/messaging.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3f375f34c6..cc10302caf 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -948,15 +948,15 @@ (define-public ngircd
 (define-public pidgin
   (package
     (name "pidgin")
-    (version "2.14.5")
+    (version "2.14.13")
     (source
      (origin
        (method url-fetch)
        (uri
         (string-append "mirror://sourceforge/pidgin/Pidgin/"
-                       version "/pidgin-" version ".tar.gz"))
+                       version "/pidgin-" version ".tar.bz2"))
        (sha256
-        (base32 "12llip3r8126gph82r638xjv2v2rg34qgggn1nbwfmc3s7halimr"))
+        (base32 "1a3by4niw5ls67mwgj20p2mr317zj4hzysi5glm9mq0pivf4j00j"))
        (patches
         (search-patches "pidgin-add-search-path.patch"))
        (modules '((guix build utils)))
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH v2 2/6] gnu: pidgin: Remove input labels.
  2024-08-29  8:35 ` [bug#72851] [PATCH v2 0/6] Pidgin updates Dariqq
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 1/6] gnu: pidgin: Update to 2.14.13 [security fixes] Dariqq
@ 2024-08-29  8:35   ` Dariqq
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 3/6] gnu: pdigin: Propagate libgnt Dariqq
                     ` (3 subsequent siblings)
  5 siblings, 0 replies; 15+ messages in thread
From: Dariqq @ 2024-08-29  8:35 UTC (permalink / raw)
  To: 72851; +Cc: Dariqq, me, liliana.prikler

Obtained with guix style -S inputs pidgin and adjusting manually.

* gnu/packages/messaging.scm (pidgin)[native-inputs]: Remove labels.
[inputs]: Same.

Change-Id: I5b139e46179ede89404aa4bba1505a107dbe6156
---
 gnu/packages/messaging.scm | 88 +++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index cc10302caf..65c4b0e744 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -967,51 +967,51 @@ (define-public pidgin
            #t))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf) ;; For bootstrap
-       ("automake" ,automake) ;; For bootstrap
-       ("check" ,check)
-       ("dot" ,graphviz)
-       ("gconf" ,gconf)
-       ("intltool" ,intltool)
-       ("libtool" ,libtool) ;; For bootstrap
-       ("pkg-config" ,pkg-config)))
+     (list autoconf ;; For bootstrap
+           automake ;; For bootstrap
+           check
+           graphviz
+           gconf
+           intltool
+           libtool ;; For bootstrap
+           pkg-config))
     (inputs
-     `(("avahi" ,avahi)
-       ("cyrus-sasl" ,cyrus-sasl)
-       ("dbus" ,dbus)
-       ("dbus-glib" ,dbus-glib)
-       ;; ("evolution-data-server" ,evolution-data-server)
-       ("farstream" ,farstream)
-       ("gnutls" ,gnutls)
-       ("gstreamer" ,gstreamer)
-       ;; ("gtkspell2" ,gtkspell2)
-       ("libgadu" ,libgadu)
-       ("libgcrypt" ,libgcrypt)
-       ("libgnt" ,libgnt)
-       ("libice" ,libice)
-       ("libidn" ,libidn)
-       ("libltdl" ,libltdl)
-       ("libsm" ,libsm)
-       ("libx11" ,libx11)
-       ("libxext" ,libxext)
-       ("libxml2" ,libxml2)
-       ("libxscrnsaver" ,libxscrnsaver)
-       ("libxslt" ,libxslt)
-       ;; ("libzephyr" ,libzephyr)
-       ("meanwhile" ,meanwhile)
-       ("ncurses" ,ncurses)
-       ("network-manager" ,network-manager)
-       ("nspr" ,nspr)
-       ("nss" ,nss)
-       ("pango" ,pango)
-       ("perl" ,perl)
-       ("python" ,python-2)
-       ("python2-dbus" ,python2-dbus)
-       ("silc" ,silc-toolkit)
-       ("sqlite" ,sqlite)
-       ("startup-notification" ,startup-notification)
-       ("tcl" ,tcl)
-       ("tk" ,tk)))
+     (list avahi
+           cyrus-sasl
+           dbus
+           dbus-glib
+           ;; evolution-data-server
+           farstream
+           gnutls
+           gstreamer
+           ;; gtkspell2
+           libgadu
+           libgcrypt
+           libgnt
+           libice
+           libidn
+           libltdl
+           libsm
+           libx11
+           libxext
+           libxml2
+           libxscrnsaver
+           libxslt
+           ;; libzephyr
+           meanwhile
+           ncurses
+           network-manager
+           nspr
+           nss
+           pango
+           perl
+           python-2
+           python2-dbus
+           silc-toolkit
+           sqlite
+           startup-notification
+           tcl
+           tk))
     (propagated-inputs
      (list glib gtk+-2))
     (arguments
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH v2 3/6] gnu: pdigin: Propagate libgnt.
  2024-08-29  8:35 ` [bug#72851] [PATCH v2 0/6] Pidgin updates Dariqq
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 1/6] gnu: pidgin: Update to 2.14.13 [security fixes] Dariqq
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 2/6] gnu: pidgin: Remove input labels Dariqq
@ 2024-08-29  8:35   ` Dariqq
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 4/6] gnu: pidgin: Use system ssl certs Dariqq
                     ` (2 subsequent siblings)
  5 siblings, 0 replies; 15+ messages in thread
From: Dariqq @ 2024-08-29  8:35 UTC (permalink / raw)
  To: 72851; +Cc: Dariqq, me, liliana.prikler

Required by finch.pc.

* gnu/packages/messaging.scm (pidgin):
[inputs]: Move libgnt from here ...
[propagated-inputs]: ... to here.

Change-Id: I8e37b441a6069675b93342ccc35c7caf976ad6ce
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 65c4b0e744..6b3dff2152 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -987,7 +987,6 @@ (define-public pidgin
            ;; gtkspell2
            libgadu
            libgcrypt
-           libgnt
            libice
            libidn
            libltdl
@@ -1013,7 +1012,8 @@ (define-public pidgin
            tcl
            tk))
     (propagated-inputs
-     (list glib gtk+-2))
+     ;; Required by finch.pc, pidgin.pc and purple.pc
+     (list glib gtk+-2 libgnt))
     (arguments
      `(#:configure-flags
        (list
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH v2 4/6] gnu: pidgin: Use system ssl certs.
  2024-08-29  8:35 ` [bug#72851] [PATCH v2 0/6] Pidgin updates Dariqq
                     ` (2 preceding siblings ...)
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 3/6] gnu: pdigin: Propagate libgnt Dariqq
@ 2024-08-29  8:35   ` Dariqq
  2024-08-30 20:09     ` Liliana Marie Prikler
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 5/6] gnu: libgnt: Build without python2 Dariqq
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 6/6] gnu: pidgin: Use python3 Dariqq
  5 siblings, 1 reply; 15+ messages in thread
From: Dariqq @ 2024-08-29  8:35 UTC (permalink / raw)
  To: 72851; +Cc: Dariqq, me, liliana.prikler

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(+)

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")
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH v2 5/6] gnu: libgnt: Build without python2.
  2024-08-29  8:35 ` [bug#72851] [PATCH v2 0/6] Pidgin updates Dariqq
                     ` (3 preceding siblings ...)
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 4/6] gnu: pidgin: Use system ssl certs Dariqq
@ 2024-08-29  8:35   ` Dariqq
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 6/6] gnu: pidgin: Use python3 Dariqq
  5 siblings, 0 replies; 15+ messages in thread
From: Dariqq @ 2024-08-29  8:35 UTC (permalink / raw)
  To: 72851; +Cc: Dariqq, me, liliana.prikler

* gnu/packages/messaging.scm (libgnt)
[#:configure-flags]: Disable python2.
[porpagated-inputs]: Remove python2.

Change-Id: I247089a02473c526d7facd8e7b7b6133426535a2
---
 gnu/packages/messaging.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 4992db1bee..748cb783ea 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -271,6 +271,7 @@ (define-public libgnt
     (outputs '("out" "doc"))
     (arguments
      (list #:glib-or-gtk? #t         ; To wrap binaries and/or compile schemas
+           #:configure-flags #~'("-Dpython2=false")
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'unpack 'patch-ncurses-path
@@ -292,7 +293,8 @@ (define-public libgnt
            gtk-doc
            pkg-config))
     (inputs (list ncurses))
-    (propagated-inputs (list glib libxml2 python-2))
+    ;; Required by libgnt.pc
+    (propagated-inputs (list glib libxml2))
     (synopsis "GLib Ncurses Toolkit")
     (description "GNT is an ncurses toolkit for creating text-mode graphical
 user interfaces in a fast and easy way.  It is based on GLib and ncurses.")
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH v2 6/6] gnu: pidgin: Use python3.
  2024-08-29  8:35 ` [bug#72851] [PATCH v2 0/6] Pidgin updates Dariqq
                     ` (4 preceding siblings ...)
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 5/6] gnu: libgnt: Build without python2 Dariqq
@ 2024-08-29  8:35   ` Dariqq
  5 siblings, 0 replies; 15+ messages in thread
From: Dariqq @ 2024-08-29  8:35 UTC (permalink / raw)
  To: 72851; +Cc: Dariqq, me, liliana.prikler

* gnu/packages/messaging.scm (pidgin)
[inputs]: Replace python-2 with python-wrapper, python2-dbus with python-dbus.

Change-Id: Ia4b7b1e47da09e9648d10fae419cd473b3d6586e
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 748cb783ea..c8fce3dcf0 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1008,8 +1008,8 @@ (define-public pidgin
            nss-certs
            pango
            perl
-           python-2
-           python2-dbus
+           python-wrapper
+           python-dbus
            silc-toolkit
            sqlite
            startup-notification
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH v2 4/6] gnu: pidgin: Use system ssl certs.
  2024-08-29  8:35   ` [bug#72851] [PATCH v2 4/6] gnu: pidgin: Use system ssl certs Dariqq
@ 2024-08-30 20:09     ` Liliana Marie Prikler
  2024-08-31  9:07       ` Dariqq
  0 siblings, 1 reply; 15+ messages in thread
From: Liliana Marie Prikler @ 2024-08-30 20:09 UTC (permalink / raw)
  To: Dariqq, 72851; +Cc: me

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [bug#72851] [PATCH v2 4/6] gnu: pidgin: Use system ssl certs.
  2024-08-30 20:09     ` Liliana Marie Prikler
@ 2024-08-31  9:07       ` Dariqq
  2024-08-31 16:31         ` bug#72851: " Liliana Marie Prikler
  0 siblings, 1 reply; 15+ messages in thread
From: Dariqq @ 2024-08-31  9:07 UTC (permalink / raw)
  To: Liliana Marie Prikler, 72851; +Cc: me

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




^ permalink raw reply	[flat|nested] 15+ messages in thread

* bug#72851: [PATCH v2 4/6] gnu: pidgin: Use system ssl certs.
  2024-08-31  9:07       ` Dariqq
@ 2024-08-31 16:31         ` Liliana Marie Prikler
  0 siblings, 0 replies; 15+ messages in thread
From: Liliana Marie Prikler @ 2024-08-31 16:31 UTC (permalink / raw)
  To: Dariqq, 72851-done; +Cc: me

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




^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2024-08-31 16:33 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-28  7:41 [bug#72851] [PATCH] gnu: pidgin: Update to 2.14.13 [security fixes] Dariqq
2024-08-28 18:35 ` Liliana Marie Prikler
2024-08-28 20:01   ` Dariqq
2024-08-28 20:22     ` Liliana Marie Prikler
2024-08-28 21:30       ` Dariqq
2024-08-29  8:35 ` [bug#72851] [PATCH v2 0/6] Pidgin updates Dariqq
2024-08-29  8:35   ` [bug#72851] [PATCH v2 1/6] gnu: pidgin: Update to 2.14.13 [security fixes] Dariqq
2024-08-29  8:35   ` [bug#72851] [PATCH v2 2/6] gnu: pidgin: Remove input labels Dariqq
2024-08-29  8:35   ` [bug#72851] [PATCH v2 3/6] gnu: pdigin: Propagate libgnt Dariqq
2024-08-29  8:35   ` [bug#72851] [PATCH v2 4/6] gnu: pidgin: Use system ssl certs Dariqq
2024-08-30 20:09     ` Liliana Marie Prikler
2024-08-31  9:07       ` Dariqq
2024-08-31 16:31         ` bug#72851: " Liliana Marie Prikler
2024-08-29  8:35   ` [bug#72851] [PATCH v2 5/6] gnu: libgnt: Build without python2 Dariqq
2024-08-29  8:35   ` [bug#72851] [PATCH v2 6/6] gnu: pidgin: Use python3 Dariqq

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).