[bug#37519] [PATCH v2] gnu: add iwd.

[bug#37519] [PATCH v2] gnu: add iwd.

[Brice Waegeneire]

* gnu/packages/networking.scm (iwd): New variable.
---
This version of the patch split the commit in two, remove the commented
code and replace the patch with a post-unpack phase.

 gnu/packages/networking.scm | 56 +++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 6bdf7f9e2f..87dd015320 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -30,6 +30,7 @@
 ;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
+;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2578,3 +2579,58 @@ communication.")
     (description "FRRouting (FRR) is an IP routing protocol suite which includes
 protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
     (license license:gpl2+)))
+
+(define-public iwd
+  (package
+    (name "iwd")
+    (version "0.21")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.kernel.org/pub/scm/network/wireless/iwd.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "001dikinsa6kshwscjbvwipavzwpqnpvx9fpshcn63gbvbhyd393"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("dbus" ,dbus)
+       ("libtool" ,libtool)
+       ("ell" ,ell)
+       ("readline" ,readline)))
+    (native-inputs
+     `(("asciidoc" ,asciidoc)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkgconfig" ,pkg-config)
+       ("python" ,python)
+       ("openssl" ,openssl)))
+    (arguments
+     `(#:configure-flags
+       (let ((dbus (assoc-ref %outputs "out")))
+         (list "--disable-systemd-service"
+               "--enable-external-ell"
+               "--enable-hwsim"
+               "--enable-tools"
+               "--enable-wired"
+               "--enable-docs"
+               "--localstatedir=/var"
+               (string-append "--with-dbus-datadir=" dbus "/share/")
+               (string-append "--with-dbus-busdir="
+                              dbus "/share/dbus-1/system-services")))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'pre-configure
+           (lambda _
+             ;; Don't try to 'mkdir /var'.
+             (substitute* "Makefile.in"
+               (("\\$\\(MKDIR_P\\) -m 700")
+                "true")))))))
+    (home-page "https://git.kernel.org/cgit/network/wireless/iwd.git/")
+    (synopsis "Internet Wireless Daemon")
+    (description "iwd is a wireless daemon for Linux written by Intel that
+aims to replace WPA supplicant. It optimize resource utilization by not
+depending on any external libraries and instead utilizing features provided by
+the Linux Kernel to the maximum extent possible.")
+    (license license:lgpl2.1+)))
-- 
2.19.2

[bug#37519] [PATCH v2] gnu: add iwd.

[Ludovic Courtès]

Hi Brice,

Brice Waegeneire <brice@waegenei.re> skribis:

> * gnu/packages/networking.scm (iwd): New variable.
> ---
> This version of the patch split the commit in two, remove the commented
> code and replace the patch with a post-unpack phase.

This patch looks good, but could you also resend the ell patch?

Thanks in advance,
Ludo’.

[bug#37519] [PATCH v2 1/2] gnu: Add ell.

[Brice Waegeneire]

* gnu/packages/linux.scm (ell): New variable.
---
 gnu/packages/linux.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 59874b097c..84b3a148f2 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -36,6 +36,7 @@
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic@gmail.com>
 ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5968,3 +5969,42 @@ have to construct the archives directly, without using the archiver.")
     (description "inputattach dispatches input events from several device
 types and interfaces and translates so that the X server can use them.")
     (license license:gpl2+)))
+
+(define-public ell
+  (package
+    (name "ell")
+    (version "0.23")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.kernel.org/pub/scm/libs/ell/ell.git")
+                    (commit version)))
+              (sha256
+               (base32
+                "1qhlcwhn0gj877yss2ymx1aczghlddzb5v9mm1dgp2zliii3jy10"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-dbus-tests
+           (lambda _
+             (substitute* '("unit/test-dbus-message-fds.c"
+                            "unit/test-dbus-properties.c"
+                            "unit/test-dbus.c")
+               (("/usr/bin/dbus-daemon") (which "dbus-daemon")))
+             #t)))))
+    (inputs
+     `(("dbus" ,dbus)
+       ("libtool" ,libtool)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("pkgconfig" ,pkg-config)
+       ("automake" ,automake)))
+    (home-page "https://01.org/ell")
+    (synopsis "Embedded Linux Library")
+    (description "The Embedded Linux* Library (ELL) provides core, low-level
+functionality for system daemons. It typically has no dependencies other than
+the Linux kernel, C standard library, and libdl (for dynamic linking). While
+ELL is designed to be efficient and compact enough for use on embedded Linux
+platforms, it is not limited to resource-constrained systems.")
+    (license license:lgpl2.1+)))
-- 
2.19.2

[bug#37519] [PATCH v2 2/2] gnu: add iwd.

[Brice Waegeneire]

* gnu/packages/networking.scm (iwd): New variable.
---
 gnu/packages/networking.scm | 56 +++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 6bdf7f9e2f..87dd015320 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -30,6 +30,7 @@
 ;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
+;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2578,3 +2579,58 @@ communication.")
     (description "FRRouting (FRR) is an IP routing protocol suite which includes
 protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
     (license license:gpl2+)))
+
+(define-public iwd
+  (package
+    (name "iwd")
+    (version "0.21")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.kernel.org/pub/scm/network/wireless/iwd.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "001dikinsa6kshwscjbvwipavzwpqnpvx9fpshcn63gbvbhyd393"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("dbus" ,dbus)
+       ("libtool" ,libtool)
+       ("ell" ,ell)
+       ("readline" ,readline)))
+    (native-inputs
+     `(("asciidoc" ,asciidoc)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkgconfig" ,pkg-config)
+       ("python" ,python)
+       ("openssl" ,openssl)))
+    (arguments
+     `(#:configure-flags
+       (let ((dbus (assoc-ref %outputs "out")))
+         (list "--disable-systemd-service"
+               "--enable-external-ell"
+               "--enable-hwsim"
+               "--enable-tools"
+               "--enable-wired"
+               "--enable-docs"
+               "--localstatedir=/var"
+               (string-append "--with-dbus-datadir=" dbus "/share/")
+               (string-append "--with-dbus-busdir="
+                              dbus "/share/dbus-1/system-services")))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'pre-configure
+           (lambda _
+             ;; Don't try to 'mkdir /var'.
+             (substitute* "Makefile.in"
+               (("\\$\\(MKDIR_P\\) -m 700")
+                "true")))))))
+    (home-page "https://git.kernel.org/cgit/network/wireless/iwd.git/")
+    (synopsis "Internet Wireless Daemon")
+    (description "iwd is a wireless daemon for Linux written by Intel that
+aims to replace WPA supplicant. It optimize resource utilization by not
+depending on any external libraries and instead utilizing features provided by
+the Linux Kernel to the maximum extent possible.")
+    (license license:lgpl2.1+)))
-- 
2.19.2

[bug#37519] [PATCH v2 2/2] gnu: add iwd.

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 675 bytes --]

Brice Waegeneire <brice@waegenei.re> skribis:

> * gnu/packages/networking.scm (iwd): New variable.

On my machine I see one test failure:

--8<---------------cut here---------------start------------->8---
FAIL: unit/test-eapol
=====================

test-eapol: unit/test-eapol.c:2959: eapol_sm_test_tls: Assertion `l_tls_set_auth_data(s->tls, CERTDIR "cert-server.pem", CERTDIR "cert-server-key-pkcs8.pem", NULL)' failed.
FAIL unit/test-eapol (exit status: 134)
--8<---------------cut here---------------end--------------->8---

Could you take a look?

Also, I had applied the cosmetic changes below.

We’re almost there, thank you!  :-)

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1242 bytes --]

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 5a9340c3bd..213ac4cfc1 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2626,11 +2626,12 @@ protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
              ;; Don't try to 'mkdir /var'.
              (substitute* "Makefile.in"
                (("\\$\\(MKDIR_P\\) -m 700")
-                "true")))))))
-    (home-page "https://git.kernel.org/cgit/network/wireless/iwd.git/")
+                "true"))
+             #t)))))
+    (home-page "https://git.kernel.org/pub/scm/network/wireless/iwd.git/")
     (synopsis "Internet Wireless Daemon")
-    (description "iwd is a wireless daemon for Linux written by Intel that
-aims to replace WPA supplicant. It optimize resource utilization by not
-depending on any external libraries and instead utilizing features provided by
-the Linux Kernel to the maximum extent possible.")
+    (description "iwd is a wireless daemon for Linux that aims to replace WPA
+Supplicant.  It optimizes resource utilization by not depending on any external
+libraries and instead utilizing features provided by the Linux kernel to the
+maximum extent possible.")
     (license license:lgpl2.1+)))

[bug#37493] [bug#37519] [PATCH v2 1/2] gnu: Add ell.

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

Hi,

Brice Waegeneire <brice@waegenei.re> skribis:

> * gnu/packages/linux.scm (ell): New variable.

Applied with the changes below to address ‘guix lint’ warnings.

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1326 bytes --]

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ddbc5cd305..876eb005af 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5980,6 +5980,7 @@ types and interfaces and translates so that the X server can use them.")
               (uri (git-reference
                     (url "https://git.kernel.org/pub/scm/libs/ell/ell.git")
                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "1qhlcwhn0gj877yss2ymx1aczghlddzb5v9mm1dgp2zliii3jy10"))))
@@ -6004,8 +6005,8 @@ types and interfaces and translates so that the X server can use them.")
     (home-page "https://01.org/ell")
     (synopsis "Embedded Linux Library")
     (description "The Embedded Linux* Library (ELL) provides core, low-level
-functionality for system daemons. It typically has no dependencies other than
-the Linux kernel, C standard library, and libdl (for dynamic linking). While
+functionality for system daemons.  It typically has no dependencies other than
+the Linux kernel, C standard library, and libdl (for dynamic linking).  While
 ELL is designed to be efficient and compact enough for use on embedded Linux
 platforms, it is not limited to resource-constrained systems.")
     (license license:lgpl2.1+)))

[bug#37519] [PATCH v3] gnu: add iwd.

[Brice Waegeneire]

* gnu/packages/networking.scm (iwd): New variable.
---
 gnu/packages/networking.scm | 60 +++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index a93e2cb9fc..bc768c6697 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -30,6 +30,7 @@
 ;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com>
 ;;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
+;;; Copyright © 2019 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2578,3 +2579,62 @@ communication.")
     (description "FRRouting (FRR) is an IP routing protocol suite which includes
 protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
     (license license:gpl2+)))
+
+(define-public iwd
+  (package
+    (name "iwd")
+    (version "0.21")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.kernel.org/pub/scm/network/wireless/iwd.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "001dikinsa6kshwscjbvwipavzwpqnpvx9fpshcn63gbvbhyd393"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("dbus" ,dbus)
+       ("libtool" ,libtool)
+       ("ell" ,ell)
+       ("readline" ,readline)))
+    (native-inputs
+     `(("asciidoc" ,asciidoc)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkgconfig" ,pkg-config)
+       ("python" ,python)
+       ("openssl" ,openssl)))
+    (arguments
+     `(#:configure-flags
+       (let ((dbus (assoc-ref %outputs "out")))
+         (list "--disable-systemd-service"
+               "--enable-external-ell"
+               "--enable-hwsim"
+               "--enable-tools"
+               "--enable-wired"
+               "--enable-docs"
+               "--localstatedir=/var"
+               (string-append "--with-dbus-datadir=" dbus "/share/")
+               (string-append "--with-dbus-busdir="
+                              dbus "/share/dbus-1/system-services")))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'pre-configure
+           (lambda _
+             ;; Test disabled because it need the kernel module
+             ;; pkcs8_key_parser loaded.
+             (substitute* "Makefile.am"
+               (("unit\\/test-eapol.*? ") ""))
+             ;; Don't try to 'mkdir /var'.
+             (substitute* "Makefile.in"
+               (("\\$\\(MKDIR_P\\) -m 700") "true"))
+             #t)))))
+    (home-page "https://git.kernel.org/pub/scm/network/wireless/iwd.git/")
+    (synopsis "Internet 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
+libraries and instead utilizing features provided by the Linux kernel to the
+maximum extent possible.")
+    (license license:lgpl2.1+)))
-- 
2.19.2

bug#37493: [bug#37519] [PATCH v3] gnu: add iwd.

[Ludovic Courtès]

Hello,

Brice Waegeneire <brice@waegenei.re> skribis:

> * gnu/packages/networking.scm (iwd): New variable.

I changed it as follows so that the test is really disabled and
committed.

Thanks!

Ludo’.

[bug#37519] [PATCH v3] gnu: add iwd.

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

Hello,

(Now with the patch…)

Brice Waegeneire <brice@waegenei.re> skribis:

> * gnu/packages/networking.scm (iwd): New variable.

I changed it as follows so that the test is really disabled and
committed.

Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1146 bytes --]

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index bc768c6697..07b056adab 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2621,14 +2621,13 @@ protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
                               dbus "/share/dbus-1/system-services")))
        #:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'pre-configure
+         (add-before 'bootstrap 'pre-bootstrap
            (lambda _
-             ;; Test disabled because it need the kernel module
-             ;; pkcs8_key_parser loaded.
              (substitute* "Makefile.am"
-               (("unit\\/test-eapol.*? ") ""))
-             ;; Don't try to 'mkdir /var'.
-             (substitute* "Makefile.in"
+               ;; Test disabled because it needs the kernel module
+               ;; 'pkcs8_key_parser' loaded.
+               (("unit\\/test-eapol.*? ") "")
+               ;; Don't try to 'mkdir /var'.
                (("\\$\\(MKDIR_P\\) -m 700") "true"))
              #t)))))
     (home-page "https://git.kernel.org/pub/scm/network/wireless/iwd.git/")