* [bug#48980] [PATCH 1/2] gnu: icecat: Add WebAuthn support.
2021-06-12 21:16 [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support Brice Waegeneire
@ 2021-06-12 21:19 ` Brice Waegeneire
2021-06-12 21:19 ` [bug#48980] [PATCH 2/2] gnu: icedove: " Brice Waegeneire
` (2 subsequent siblings)
3 siblings, 0 replies; 12+ messages in thread
From: Brice Waegeneire @ 2021-06-12 21:19 UTC (permalink / raw)
To: 48980
* gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
gnu/packages/gnuzilla.scm | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index c63809c20c..6255d56f16 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -910,6 +911,7 @@ from forcing GEXP-PROMISE."
;; UNBUNDLE-ME! ("nss" ,nss)
("shared-mime-info" ,shared-mime-info)
;; UNBUNDLE-ME! ("sqlite" ,sqlite)
+ ("eudev" ,eudev)
("unzip" ,unzip)
("zip" ,zip)
;; UNBUNDLE-ME! ("zlib" ,zlib)
@@ -1271,19 +1273,20 @@ from forcing GEXP-PROMISE."
(lib (string-append out "/lib"))
(gtk (assoc-ref inputs "gtk+"))
(gtk-share (string-append gtk "/share"))
- (mesa (assoc-ref inputs "mesa"))
- (mesa-lib (string-append mesa "/lib"))
- (pulseaudio (assoc-ref inputs "pulseaudio"))
- (pulseaudio-lib (string-append pulseaudio "/lib"))
- (libxscrnsaver (assoc-ref inputs "libxscrnsaver"))
- (libxscrnsaver-lib (string-append libxscrnsaver "/lib")))
+ (ld-libs (map (lambda (lib)
+ (string-append (assoc-ref inputs lib)
+ "/lib"))
+ '("libxscrnsaver"
+ "mesa"
+ "udev"
+ "pulseaudio"))))
(wrap-program (car (find-files lib "^icecat$"))
`("XDG_DATA_DIRS" prefix (,gtk-share))
;; The following line is commented out because the icecat
;; package on guix has been observed to be unstable when
;; using wayland, and the bundled extensions stop working.
;; `("MOZ_ENABLE_WAYLAND" = ("1"))
- `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,mesa-lib ,libxscrnsaver-lib)))
+ `("LD_LIBRARY_PATH" prefix ,ld-libs))
#t))))))
(home-page "https://www.gnu.org/software/gnuzilla/")
(synopsis "Entirely free browser derived from Mozilla Firefox")
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#48980] [PATCH 2/2] gnu: icedove: Add WebAuthn support.
2021-06-12 21:16 [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support Brice Waegeneire
2021-06-12 21:19 ` [bug#48980] [PATCH 1/2] gnu: icecat: Add " Brice Waegeneire
@ 2021-06-12 21:19 ` Brice Waegeneire
2021-06-12 22:09 ` Jonathan Brielmaier
2021-06-20 9:32 ` [bug#48980] [PATCH v2 1/2] gnu: icecat: Add " Brice Waegeneire
2021-06-23 21:09 ` [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and " Jonathan Brielmaier
3 siblings, 1 reply; 12+ messages in thread
From: Brice Waegeneire @ 2021-06-12 21:19 UTC (permalink / raw)
To: 48980
* gnu/packages/gnuzilla.scm (icedove)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
gnu/packages/gnuzilla.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 6255d56f16..a6f0e61b12 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1541,10 +1541,12 @@ standards of the IceCat project.")
(gtk (assoc-ref inputs "gtk+"))
(gtk-share (string-append gtk "/share"))
(pulseaudio (assoc-ref inputs "pulseaudio"))
- (pulseaudio-lib (string-append pulseaudio "/lib")))
+ (pulseaudio-lib (string-append pulseaudio "/lib"))
+ (eudev (assoc-ref inputs "eudev"))
+ (eudev-lib (string-append eudev "/lib")))
(wrap-program (car (find-files lib "^icedove$"))
`("XDG_DATA_DIRS" prefix (,gtk-share))
- `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib)))
+ `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib)))
#t))))))
(inputs
`(("bzip2" ,bzip2)
@@ -1580,6 +1582,7 @@ standards of the IceCat project.")
("pulseaudio" ,pulseaudio)
("sqlite" ,sqlite)
("startup-notification" ,startup-notification)
+ ("eudev" ,eudev)
("unzip" ,unzip)
("zip" ,zip)
("zlib" ,zlib)))
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#48980] [PATCH v2 1/2] gnu: icecat: Add WebAuthn support.
2021-06-12 21:16 [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support Brice Waegeneire
2021-06-12 21:19 ` [bug#48980] [PATCH 1/2] gnu: icecat: Add " Brice Waegeneire
2021-06-12 21:19 ` [bug#48980] [PATCH 2/2] gnu: icedove: " Brice Waegeneire
@ 2021-06-20 9:32 ` Brice Waegeneire
2021-06-20 9:32 ` [bug#48980] [PATCH v2 2/2] gnu: icedove: " Brice Waegeneire
2021-06-23 21:09 ` [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and " Jonathan Brielmaier
3 siblings, 1 reply; 12+ messages in thread
From: Brice Waegeneire @ 2021-06-20 9:32 UTC (permalink / raw)
To: 48980
* gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
gnu/packages/gnuzilla.scm | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
Rebased.
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index a997fc1c73..84feab777e 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -910,6 +911,7 @@ from forcing GEXP-PROMISE."
;; UNBUNDLE-ME! ("nss" ,nss)
("shared-mime-info" ,shared-mime-info)
;; UNBUNDLE-ME! ("sqlite" ,sqlite)
+ ("eudev" ,eudev)
("unzip" ,unzip)
("zip" ,zip)
;; UNBUNDLE-ME! ("zlib" ,zlib)
@@ -1271,24 +1273,21 @@ from forcing GEXP-PROMISE."
(lib (string-append out "/lib"))
(gtk (assoc-ref inputs "gtk+"))
(gtk-share (string-append gtk "/share"))
- (mesa (assoc-ref inputs "mesa"))
- (mesa-lib (string-append mesa "/lib"))
- (pulseaudio (assoc-ref inputs "pulseaudio"))
- (pulseaudio-lib (string-append pulseaudio "/lib"))
- (libxscrnsaver (assoc-ref inputs "libxscrnsaver"))
- (libxscrnsaver-lib (string-append libxscrnsaver "/lib"))
- (mit-krb5 (assoc-ref inputs "mit-krb5"))
- (mit-krb5-lib (string-append mit-krb5 "/lib")))
+ (ld-libs (map (lambda (lib)
+ (string-append (assoc-ref inputs lib)
+ "/lib"))
+ '("libxscrnsaver"
+ "mesa"
+ "mit-krb5"
+ "udev"
+ "pulseaudio"))))
(wrap-program (car (find-files lib "^icecat$"))
`("XDG_DATA_DIRS" prefix (,gtk-share))
;; The following line is commented out because the icecat
;; package on guix has been observed to be unstable when
;; using wayland, and the bundled extensions stop working.
;; `("MOZ_ENABLE_WAYLAND" = ("1"))
- `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib
- ,mesa-lib
- ,libxscrnsaver-lib
- ,mit-krb5-lib)))
+ `("LD_LIBRARY_PATH" prefix ,ld-libs))
#t))))))
(home-page "https://www.gnu.org/software/gnuzilla/")
(synopsis "Entirely free browser derived from Mozilla Firefox")
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#48980] [PATCH v2 2/2] gnu: icedove: Add WebAuthn support.
2021-06-20 9:32 ` [bug#48980] [PATCH v2 1/2] gnu: icecat: Add " Brice Waegeneire
@ 2021-06-20 9:32 ` Brice Waegeneire
0 siblings, 0 replies; 12+ messages in thread
From: Brice Waegeneire @ 2021-06-20 9:32 UTC (permalink / raw)
To: 48980
* gnu/packages/gnuzilla.scm (icedove)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
gnu/packages/gnuzilla.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 84feab777e..053d4f1822 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1542,10 +1542,12 @@ standards of the IceCat project.")
(gtk (assoc-ref inputs "gtk+"))
(gtk-share (string-append gtk "/share"))
(pulseaudio (assoc-ref inputs "pulseaudio"))
- (pulseaudio-lib (string-append pulseaudio "/lib")))
+ (pulseaudio-lib (string-append pulseaudio "/lib"))
+ (eudev (assoc-ref inputs "eudev"))
+ (eudev-lib (string-append eudev "/lib")))
(wrap-program (car (find-files lib "^icedove$"))
`("XDG_DATA_DIRS" prefix (,gtk-share))
- `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib)))
+ `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib)))
#t))))))
(inputs
`(("bzip2" ,bzip2)
@@ -1581,6 +1583,7 @@ standards of the IceCat project.")
("pulseaudio" ,pulseaudio)
("sqlite" ,sqlite)
("startup-notification" ,startup-notification)
+ ("eudev" ,eudev)
("unzip" ,unzip)
("zip" ,zip)
("zlib" ,zlib)))
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support
2021-06-12 21:16 [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support Brice Waegeneire
` (2 preceding siblings ...)
2021-06-20 9:32 ` [bug#48980] [PATCH v2 1/2] gnu: icecat: Add " Brice Waegeneire
@ 2021-06-23 21:09 ` Jonathan Brielmaier
2021-07-03 15:55 ` Brice Waegeneire
3 siblings, 1 reply; 12+ messages in thread
From: Jonathan Brielmaier @ 2021-06-23 21:09 UTC (permalink / raw)
To: 48980
I pushed the icedove patch as a807d849219c34d45310634ef0cfc94ad9b7025a,
for the icecat one I would wait on Marks opinion...
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support
2021-06-23 21:09 ` [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and " Jonathan Brielmaier
@ 2021-07-03 15:55 ` Brice Waegeneire
2021-07-03 17:18 ` Mark H Weaver
0 siblings, 1 reply; 12+ messages in thread
From: Brice Waegeneire @ 2021-07-03 15:55 UTC (permalink / raw)
To: mhw; +Cc: 48980, Jonathan Brielmaier
Hello Mark,
Could you take a look at this patch adding U2F support to icecat ?
Jonathan Brielmaier <jonathan.brielmaier@web.de> writes:
> I pushed the icedove patch as a807d849219c34d45310634ef0cfc94ad9b7025a,
> for the icecat one I would wait on Marks opinion...
Cheers,
- Brice
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support
2021-07-03 15:55 ` Brice Waegeneire
@ 2021-07-03 17:18 ` Mark H Weaver
2021-07-03 20:15 ` [bug#49362] [PATCH v3] gnu: icecat: Add " Brice Waegeneire
0 siblings, 1 reply; 12+ messages in thread
From: Mark H Weaver @ 2021-07-03 17:18 UTC (permalink / raw)
To: Brice Waegeneire; +Cc: 48980, Jonathan Brielmaier
Hi Brice,
Brice Waegeneire <brice@waegenei.re> writes:
> Could you take a look at this patch adding U2F support to icecat ?
Thanks for this, but I see a problem. The new input has key "eudev":
> @@ -910,6 +911,7 @@ from forcing GEXP-PROMISE."
> ;; UNBUNDLE-ME! ("nss" ,nss)
> ("shared-mime-info" ,shared-mime-info)
> ;; UNBUNDLE-ME! ("sqlite" ,sqlite)
> + ("eudev" ,eudev)
> ("unzip" ,unzip)
> ("zip" ,zip)
> ;; UNBUNDLE-ME! ("zlib" ,zlib)
but the code added to the 'wrap-program' phase looks for key "udev":
> + (ld-libs (map (lambda (lib)
> + (string-append (assoc-ref inputs lib)
> + "/lib"))
> + '("libxscrnsaver"
> + "mesa"
> + "mit-krb5"
> + "udev"
> + "pulseaudio"))))
I don't see how this can work. Did you test it?
Regards,
Mark
--
Disinformation flourishes because many people care deeply about injustice
but very few check the facts. Ask me about <https://stallmansupport.org>.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#49362] [PATCH v3] gnu: icecat: Add WebAuthn support.
2021-07-03 17:18 ` Mark H Weaver
@ 2021-07-03 20:15 ` Brice Waegeneire
2021-09-04 7:39 ` bug#49362: " Brice Waegeneire
0 siblings, 1 reply; 12+ messages in thread
From: Brice Waegeneire @ 2021-07-03 20:15 UTC (permalink / raw)
To: 49362
* gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
gnu/packages/gnuzilla.scm | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
I remember having testing one version of this patch successfully, in
retrospect it probably wasn't the one sent. I have tested this version
specificly with success in regards to WebAuth, trough the Yubico test website.
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 6ec920141a..d118ae48e4 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -910,6 +911,7 @@ from forcing GEXP-PROMISE."
;; UNBUNDLE-ME! ("nss" ,nss)
("shared-mime-info" ,shared-mime-info)
;; UNBUNDLE-ME! ("sqlite" ,sqlite)
+ ("eudev" ,eudev)
("unzip" ,unzip)
("zip" ,zip)
;; UNBUNDLE-ME! ("zlib" ,zlib)
@@ -1271,24 +1273,21 @@ from forcing GEXP-PROMISE."
(lib (string-append out "/lib"))
(gtk (assoc-ref inputs "gtk+"))
(gtk-share (string-append gtk "/share"))
- (mesa (assoc-ref inputs "mesa"))
- (mesa-lib (string-append mesa "/lib"))
- (pulseaudio (assoc-ref inputs "pulseaudio"))
- (pulseaudio-lib (string-append pulseaudio "/lib"))
- (libxscrnsaver (assoc-ref inputs "libxscrnsaver"))
- (libxscrnsaver-lib (string-append libxscrnsaver "/lib"))
- (mit-krb5 (assoc-ref inputs "mit-krb5"))
- (mit-krb5-lib (string-append mit-krb5 "/lib")))
+ (ld-libs (map (lambda (lib)
+ (string-append (assoc-ref inputs lib)
+ "/lib"))
+ '("libxscrnsaver"
+ "mesa"
+ "mit-krb5"
+ "eudev"
+ "pulseaudio"))))
(wrap-program (car (find-files lib "^icecat$"))
`("XDG_DATA_DIRS" prefix (,gtk-share))
;; The following line is commented out because the icecat
;; package on guix has been observed to be unstable when
;; using wayland, and the bundled extensions stop working.
;; `("MOZ_ENABLE_WAYLAND" = ("1"))
- `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib
- ,mesa-lib
- ,libxscrnsaver-lib
- ,mit-krb5-lib)))
+ `("LD_LIBRARY_PATH" prefix ,ld-libs))
#t))))))
(home-page "https://www.gnu.org/software/gnuzilla/")
(synopsis "Entirely free browser derived from Mozilla Firefox")
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread