guix_mirror_bot pushed a commit to branch master
in repository guix.
commit d8852c676826e875a173a9f0555ecc8a098bbdc8
Author: John Kehayias <[email protected]>
AuthorDate: Fri Sep 12 01:07:17 2025 -0400
gnu: xvfb-run: Update to 21.1.18-2 [security-fixes].
Previous versions fixed various CVEs, see
<https://metadata.ftp-master.debian.org/changelogs//main/x/xorg-server/xorg-server_21.1.18-2_changelog>
for details.
* gnu/packages/xorg.scm (xvfb-run): Update to 21.1.18-2.
[arguments]<#:phases>: In unpack phase use package-source instead of source
directly so that xvfb-run-for-tests won't change due to changes in xvfb-run
source.
(xvfb-run-for-tests): Stay at 21.1.7-1.
Change-Id: Ie1642e17543d8b2f3c65804a38b9e3469528cfb0
Signed-off-by: Maxim Cournoyer <[email protected]>
---
gnu/packages/xorg.scm | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index bd488ba160..8a97540223 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -7076,14 +7076,14 @@ box, and a calendar. It uses GTK+, and will match your
desktop theme.")
(define-public xvfb-run
(package
(name "xvfb-run")
- (version "21.1.7-1")
+ (version "21.1.18-2")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://debian/pool/main/x/xorg-server/"
"xorg-server_" version ".diff.gz"))
(sha256
- (base32 "1073m4gzn8yv9kn70fbyq8a2xckgz0wljjr2w7i2bsrg767h29gd"))))
+ (base32 "1775i47yyvpzg5gb3cdyc260bzr802i15vdlw0qnrl030li53yj2"))))
(build-system gnu-build-system)
(arguments
(list
@@ -7092,11 +7092,11 @@ box, and a calendar. It uses GTK+, and will match your
desktop theme.")
(replace 'unpack
;; Apply the source patch to an empty directory.
(lambda* (#:key inputs #:allow-other-keys)
- (let* ((diff.gz (basename #$source))
+ (let* ((diff.gz (basename #$(package-source this-package)))
(diff (substring diff.gz 0 (string-rindex diff.gz #\.))))
(mkdir "source")
(chdir "source")
- (copy-file #$source diff.gz)
+ (copy-file #$(package-source this-package) diff.gz)
(invoke "gunzip" diff.gz)
(invoke "patch" "-Np1" "-i" diff)
(chdir "debian/local"))))
@@ -7157,6 +7157,14 @@ the server and cleaning up before returning the exit
status of the command.")
(hidden-package
(package
(inherit xvfb-run)
+ (version "21.1.7-1")
+ (source
+ (origin
+ (inherit (package-source xvfb-run))
+ (uri (string-append "mirror://debian/pool/main/x/xorg-server/"
+ "xorg-server_" version ".diff.gz"))
+ (sha256
+ (base32 "1073m4gzn8yv9kn70fbyq8a2xckgz0wljjr2w7i2bsrg767h29gd"))))
(inputs
(modify-inputs (package-inputs xvfb-run)
(replace "xorg-server" xorg-server-for-tests))))))
