[bug#68276] [PATCH 0/4] gnu: iwd: Update to 2.12.

[bug#68276] [PATCH 0/4] gnu: iwd: Update to 2.12.

[Hilton Chain via Guix-patches via]

This series updates ell to 0.61 and iwd to 2.12.

The series patches resolvconf (provided by openresolv) path in iwd as well,
this may be useful for creating an iwd service.

Since iwd may be also used with network-manager and network-manager depends on
openresolv too, I think this dependency is acceptable.

Hilton Chain (4):
  gnu: ell: Update to 0.61.
  gnu: iwd: Update to 2.12.
  gnu: iwd: Use gexps.
  gnu: iwd: Patch resolvconf path.

 gnu/packages/linux.scm      |  4 +-
 gnu/packages/networking.scm | 78 ++++++++++++++++++++-----------------
 2 files changed, 45 insertions(+), 37 deletions(-)


base-commit: c0e21e523d93081153a2ffc91e5a9f06afe62b91
--
2.41.0

[bug#68276] [PATCH 1/4] gnu: ell: Update to 0.61.

[Hilton Chain via Guix-patches via]

* gnu/packages/linux.scm (ell): Update to 0.61.

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

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 0fe64bacf3..e686626a01 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -9467,7 +9467,7 @@ (define-public wireplumber-minimal
 (define-public ell
   (package
     (name "ell")
-    (version "0.59")
+    (version "0.61")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -9476,7 +9476,7 @@ (define-public ell
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "11xlkdvw7pyd9idq1zsnl946dry9aksnz29wbpzxqjc97xhhd5xq"))))
+                "1lkjf24ap40wk747z1iv8ds8z40alc5x8rzsgczjj1707x2ik6mj"))))
     (build-system gnu-build-system)
     (arguments
      ;; Tests launch dbus-daemon instances that all try to bind to
-- 
2.41.0

[bug#68276] [PATCH 2/4] gnu: iwd: Update to 2.12.

[Hilton Chain via Guix-patches via]

* gnu/packages/networking.scm (iwd): Update to 2.12.
[home-page]: Update homepage.

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

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index c3796f7328..fda6775d71 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3937,7 +3937,7 @@ (define-public bird
 (define-public iwd
   (package
     (name "iwd")
-    (version "2.8")
+    (version "2.12")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -3946,7 +3946,7 @@ (define-public iwd
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0bpksqyaqr624bj7zm9hi22rnp6wnjbngx4q08l7lbd0r7r93vcb"))))
+                "199pcs20054xhp5c0dnxf9ny5cf5cynkqpx68dpn46nq8ly76n2y"))))
     (build-system gnu-build-system)
     (inputs
      (list dbus ell (package-source ell) readline))
@@ -3990,7 +3990,7 @@ (define-public iwd
              (substitute* "Makefile"
                ;; Don't try to 'mkdir /var'.
                (("\\$\\(MKDIR_P\\) -m 700") "true")))))))
-    (home-page "https://git.kernel.org/pub/scm/network/wireless/iwd.git/")
+    (home-page "https://iwd.wiki.kernel.org/")
     (synopsis "iNet Wireless Daemon")
     (description "iwd is a wireless daemon for Linux that aims to replace WPA
 Supplicant.  It optimizes resource utilization by not depending on any external
-- 
2.41.0

[bug#68276] [PATCH 3/4] gnu: iwd: Use gexps.

[Hilton Chain via Guix-patches via]

* gnu/packages/networking.scm (iwd): Use gexps.

Change-Id: Ie4a6394c9c7977291f56990eb1a535ba673d04ee
---
 gnu/packages/networking.scm | 62 ++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index fda6775d71..20674de76d 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3959,37 +3959,37 @@ (define-public iwd
            python-docutils
            openssl))
     (arguments
-     `(#:configure-flags
-       ,#~(list "--disable-systemd-service"
-                "--enable-external-ell"
-                "--enable-hwsim"
-                "--enable-tools"
-                "--enable-wired"
-                "--localstatedir=/var"
-                (string-append "--with-dbus-datadir=" #$output "/share/")
-                (string-append "--with-dbus-busdir="
-                               #$output "/share/dbus-1/system-services"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'copy-ell-header-files
-           ;; Copy into the source tree two of ell's private header files that
-           ;; it shares with iwd, as is required to build with the
-           ;; "--enable-external-ell" configure option.
-           ;; See the definition of "ell_shared" in iwd's Makefile.am.
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((ell-header-dir (search-input-directory inputs "/ell"))
-                   (target-dir "ell"))
-               (mkdir target-dir)
-               (for-each
-                (lambda (file-name)
-                  (copy-file (string-append ell-header-dir "/" file-name)
-                             (string-append target-dir "/" file-name)))
-                '("asn1-private.h" "useful.h")))))
-         (add-after 'configure 'patch-Makefile
-           (lambda _
-             (substitute* "Makefile"
-               ;; Don't try to 'mkdir /var'.
-               (("\\$\\(MKDIR_P\\) -m 700") "true")))))))
+     (list #:configure-flags
+           #~(list "--disable-systemd-service"
+                   "--enable-external-ell"
+                   "--enable-hwsim"
+                   "--enable-tools"
+                   "--enable-wired"
+                   "--localstatedir=/var"
+                   (string-append "--with-dbus-datadir=" #$output "/share/")
+                   (string-append "--with-dbus-busdir="
+                                  #$output "/share/dbus-1/system-services"))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'copy-ell-header-files
+                 ;; Copy into the source tree two of ell's private header files
+                 ;; that it shares with iwd, as is required to build with the
+                 ;; "--enable-external-ell" configure option.  See the
+                 ;; definition of "ell_shared" in iwd's Makefile.am.
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (let ((ell-header-dir (search-input-directory inputs "/ell"))
+                         (target-dir "ell"))
+                     (mkdir target-dir)
+                     (for-each
+                      (lambda (file-name)
+                        (copy-file (string-append ell-header-dir "/" file-name)
+                                   (string-append target-dir "/" file-name)))
+                      '("asn1-private.h" "useful.h")))))
+               (add-after 'configure 'patch-Makefile
+                 (lambda _
+                   (substitute* "Makefile"
+                     ;; Don't try to 'mkdir /var'.
+                     (("\\$\\(MKDIR_P\\) -m 700") "true")))))))
     (home-page "https://iwd.wiki.kernel.org/")
     (synopsis "iNet Wireless Daemon")
     (description "iwd is a wireless daemon for Linux that aims to replace WPA
-- 
2.41.0

[bug#68276] [PATCH 4/4] gnu: iwd: Patch resolvconf path.

[Hilton Chain via Guix-patches via]

* gnu/packages/networking.scm (iwd)[inputs]: Add openresolv.
[arguments]<#:phases>: Add 'patch-resolvconf-path.

Change-Id: Ica59a76dd6318e06979314e4b49c5371f4c98e4d
---
 gnu/packages/networking.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 20674de76d..a6798bb166 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -113,6 +113,7 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages dejagnu)
+  #:use-module (gnu packages dns)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages flex)
@@ -3949,7 +3950,7 @@ (define-public iwd
                 "199pcs20054xhp5c0dnxf9ny5cf5cynkqpx68dpn46nq8ly76n2y"))))
     (build-system gnu-build-system)
     (inputs
-     (list dbus ell (package-source ell) readline))
+     (list dbus ell (package-source ell) openresolv readline))
     (native-inputs
      (list autoconf
            automake
@@ -3985,6 +3986,13 @@ (define-public iwd
                         (copy-file (string-append ell-header-dir "/" file-name)
                                    (string-append target-dir "/" file-name)))
                       '("asn1-private.h" "useful.h")))))
+               (add-after 'unpack 'patch-resolvconf-path
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* "src/resolve.c"
+                     (("getenv\\(\"PATH\"\\)")
+                      (format #f "\"~a\""
+                              (dirname (search-input-file
+                                        inputs "sbin/resolvconf")))))))
                (add-after 'configure 'patch-Makefile
                  (lambda _
                    (substitute* "Makefile"
-- 
2.41.0

bug#68276: Acknowledgement ([PATCH 0/4] gnu: iwd: Update to 2.12.)

[Hilton Chain via Guix-patches via]

Applied as cb0807587a..551d013a56, closing.