Message ID | 87r12lqurl.fsf@burningswell.com |
---|---|
State | Accepted |
Headers | show |
Series | [bug#56597] gnu: xscreensaver: Update to 6.04. | expand |
Context | Check | Description |
---|---|---|
cbaines/comparison | success | View comparision |
cbaines/git-branch | success | View Git branch |
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
Hi, r0man <roman.scherer@burningswell.com> skribis: > From 9fb6c5eb00d6446baf92ebbe88018d4d4a1d081c Mon Sep 17 00:00:00 2001 > Message-Id: <9fb6c5eb00d6446baf92ebbe88018d4d4a1d081c.1657962947.git.roman@burningswell.com> > From: r0man <roman@burningswell.com> > Date: Sat, 16 Jul 2022 11:13:54 +0200 > Subject: [PATCH] gnu: xscreensaver: Update to 6.04. > > * gnu/packages/xdisorg.scm (xscreensaver): Update to 6.04. Applied, thanks! Ludo’.
Hi again! Actually I followed up with a couple of commits: e8ed95ddf8 * gnu: xscreensaver: Don't read /proc/interrupts at configure time. f2d86db81d * gnu: xscreensaver: Remove custom 'configure' phase. The /proc/interrupts was prompted by build failures observed on some machines, such as this one: https://ci.guix.gnu.org/build/1150669/details Ludo’.
Did anyone actually test this patch? I cannot unlock my systems anymore and xscreensaver only shows the message 'dont login as root', even though I invoke it as a non-root user. When I remove the (screen-locker-service xscreensaver) service I run into all kinds of setuid problems so that's not a solution either.
I'm also getting the same `XScreenSaver: Don't log in as root` message after the update. and I found the following logs in the /var/log/secure during the unlock. --8<---------------cut here---------------start------------->8--- Aug 21 14:47:48 localhost unix_chkpwd[8188]: check pass; user unknown Aug 21 14:47:48 localhost unix_chkpwd[8188]: password check failed for user (panther) Aug 21 10:17:48 localhost xscreensaver-auth: pam_unix(xscreensaver:auth): authentication failure; logname= uid=1000 euid=1000 tty=:0 ruser= rhost= user=panther Aug 21 10:17:49 localhost xscreensaver-auth[8181]: Failed login on display ":0" for "panther" --8<---------------cut here---------------end--------------->8--- the configuration that I'm using: --8<---------------cut here---------------start------------->8--- (services (cons* ... (screen-locker-service xscreensaver) ;; also tried the following alternative ; (screen-locker-service xscreensaver "xscreensaver-command") ...)) --8<---------------cut here---------------end--------------->8---
From 9fb6c5eb00d6446baf92ebbe88018d4d4a1d081c Mon Sep 17 00:00:00 2001 Message-Id: <9fb6c5eb00d6446baf92ebbe88018d4d4a1d081c.1657962947.git.roman@burningswell.com> From: r0man <roman@burningswell.com> Date: Sat, 16 Jul 2022 11:13:54 +0200 Subject: [PATCH] gnu: xscreensaver: Update to 6.04. * gnu/packages/xdisorg.scm (xscreensaver): Update to 6.04. --- gnu/packages/xdisorg.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d345bc461d..730b19b51a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1585,7 +1585,7 @@ (define-public gammastep (define-public xscreensaver (package (name "xscreensaver") - (version "5.45") + (version "6.04") (source (origin (method url-fetch) @@ -1593,7 +1593,7 @@ (define-public xscreensaver (string-append "https://www.jwz.org/xscreensaver/xscreensaver-" version ".tar.gz")) (sha256 - (base32 "03fmyjlwjinzv7mih6n07glmys8s877snd8zijk2c0ds6rkxy5kh")))) + (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -1604,9 +1604,24 @@ (define-public xscreensaver (substitute* '("driver/Makefile.in" "po/Makefile.in.in") (("@GTK_DATADIR@") "@datadir@") (("@PO_DATADIR@") "@datadir@")) - #t))) - #:configure-flags '("--with-pam" "--with-proc-interrupts" - "--without-readdisplay") + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; The tarball uses a very old version of autconf. It does not + ;; understand extra flags like `--enable-fast-install', so + ;; we need to invoke it with just what it understands. + (let ((out (assoc-ref outputs "out"))) + ;; 'configure' doesn't understand '--host'. + ,@(if (%current-target-system) + `((setenv "CHOST" ,(%current-target-system))) + '()) + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "SHELL" (which "bash")) + (invoke "./configure" + (string-append "--prefix=" out) + "--with-pam" + "--with-proc-interrupts" + "--without-readdisplay"))))) #:make-flags (list (string-append "AD_DIR=" (assoc-ref %outputs "out") "/lib/X11/app-defaults")))) @@ -1626,6 +1641,7 @@ (define-public xscreensaver ("libjpeg" ,libjpeg-turbo) ("linux-pam" ,linux-pam) ("pango" ,pango) + ("gdk-pixbuf-xlib", gdk-pixbuf-xlib) ("gtk+" ,gtk+) ("perl" ,perl) ("cairo" ,cairo) -- 2.36.1