From df48a11e1b3e842f54603a6ef170e77aca47062a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 May 2021 18:51:42 +0200 Subject: gnu: wl-clipboard: Don't require helper tools in $PATH. * gnu/packages/xdisorg.scm (wl-clipboard)[arguments]: Add a new 'patch-file-names phase. [inputs]: Add coreutils and xdg-utils. Reported by pineapples in #guix. --- gnu/packages/xdisorg.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 15c5377a3d..b5bacd3d97 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2235,11 +2235,25 @@ binary to setuid-binaries: (sha256 (base32 "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d")))) (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src" "\\.c$") + (("\"(cat|rm)\"" _ command) + (string-append "\"" (assoc-ref inputs "coreutils") + "/bin/" command "\"")) + (("\"xdg-mime\"") + (string-append "\"" (assoc-ref inputs "xdg-utils") + "/bin/xdg-mime\"")))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + `(("coreutils" ,coreutils) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) + ("xdg-utils" ,xdg-utils))) (home-page "https://github.com/bugaevc/wl-clipboard") (synopsis "Command-line copy/paste utilities for Wayland") (description "Wl-clipboard is a set of command-line copy/paste utilities for -- cgit v1.2.3 From 8d5986a503574a6deffe1c07846886d055642306 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 May 2021 11:48:36 +0200 Subject: gnu: rxvt-unicode: Update to 9.26. * gnu/packages/xdisorg.scm (rxvt-unicode): Update to 9.26. [source]: Remove upstreamed patch. * gnu/packages/patches/rxvt-unicode-escape-sequences.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/rxvt-unicode-escape-sequences.patch | 35 ---------------------- gnu/packages/xdisorg.scm | 5 ++-- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/rxvt-unicode-escape-sequences.patch (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 1dc191092e..0e3e4eecf0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1672,7 +1672,6 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-reproducible-builds.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ - %D%/packages/patches/rxvt-unicode-escape-sequences.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-clml-fix-types.patch \ %D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \ diff --git a/gnu/packages/patches/rxvt-unicode-escape-sequences.patch b/gnu/packages/patches/rxvt-unicode-escape-sequences.patch deleted file mode 100644 index 064dd51e2d..0000000000 --- a/gnu/packages/patches/rxvt-unicode-escape-sequences.patch +++ /dev/null @@ -1,35 +0,0 @@ -This patch prevents a code execution vector involving terminal escape -sequences when rxvt-unicode is in "secure mode". - -This change was spurred by the following conversation on the -oss-security mailing list: - -Problem description and proof of concept: -http://seclists.org/oss-sec/2017/q2/190 - -Upstream response: -http://seclists.org/oss-sec/2017/q2/291 - -Patch copied from upstream source repository: -http://cvs.schmorp.de/rxvt-unicode/src/command.C?r1=1.582&r2=1.583 - ---- rxvt-unicode/src/command.C 2016/07/14 05:33:26 1.582 -+++ rxvt-unicode/src/command.C 2017/05/18 02:43:18 1.583 -@@ -2695,7 +2695,7 @@ - /* kidnapped escape sequence: Should be 8.3.48 */ - case C1_ESA: /* ESC G */ - // used by original rxvt for rob nations own graphics mode -- if (cmd_getc () == 'Q') -+ if (cmd_getc () == 'Q' && option (Opt_insecure)) - tt_printf ("\033G0\012"); /* query graphics - no graphics */ - break; - -@@ -2914,7 +2914,7 @@ - break; - - case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ -- case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ -+ case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ - #ifdef ISO6429 - arg[0] = -arg[0]; - #else /* emulate common DEC VTs */ diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b5bacd3d97..8feea6bf92 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1085,15 +1085,14 @@ compact configuration syntax.") (define-public rxvt-unicode (package (name "rxvt-unicode") - (version "9.22") + (version "9.26") (source (origin (method url-fetch) (uri (string-append "http://dist.schmorp.de/rxvt-unicode/Attic/" name "-" version ".tar.bz2")) - (patches (search-patches "rxvt-unicode-escape-sequences.patch")) (sha256 (base32 - "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9")))) + "12y9p32q0v7n7rhjla0j2g9d5rj2dmwk20c9yhlssaaxlawiccb4")))) (build-system gnu-build-system) (arguments ;; This sets the destination when installing the necessary terminal -- cgit v1.2.3 From cbdac3ce88d97dac03a26bccc6e25df35b332086 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 May 2021 16:42:59 +0200 Subject: gnu: rxvt-unicode: Add libXt input. I found an unstaged hunk after pushing commit 8d5986a503574a6deffe1c07846886d055642306. (I was a bit too eager to push 5fa46ca96da90ec19e32cc4d726f099d0979d60b...) * gnu/packages/xdisorg.scm (rxvt-unicode)[inputs]: Add libXt. --- gnu/packages/xdisorg.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8feea6bf92..83fefecedc 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1142,7 +1142,8 @@ compact configuration syntax.") #t)))))) (inputs `(("libXft" ,libxft) - ("libX11" ,libx11))) + ("libX11" ,libx11) + ("libXt" ,libxt))) (native-inputs `(("ncurses" ,ncurses) ;trigger the installation of terminfo data ("perl" ,perl) -- cgit v1.2.3 From c05b070cff0e5889877dc8d12d3a6bc2c15f1afe Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 18 May 2021 10:23:44 -0400 Subject: gnu: rxvt-unicode: Remove extraneous input. libX11 is propagated by libXt. This is a followup to commits cbdac3ce88d97dac03a26bccc6e25df35b332086 and 8d5986a503574a6deffe1c07846886d055642306. * gnu/packages/xdisorg.scm (rxvt-unicode)[inputs]: Remove libx11. --- gnu/packages/xdisorg.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 83fefecedc..41199237bd 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1142,7 +1142,6 @@ compact configuration syntax.") #t)))))) (inputs `(("libXft" ,libxft) - ("libX11" ,libx11) ("libXt" ,libxt))) (native-inputs `(("ncurses" ,ncurses) ;trigger the installation of terminfo data -- cgit v1.2.3 From 75abb0124705caa7a5b7ea1053ced6e1dc528561 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 19 May 2021 19:34:49 -0400 Subject: Revert "gnu: rxvt-unicode: Remove extraneous input." This reverts commit c05b070cff0e5889877dc8d12d3a6bc2c15f1afe. This commit was not quite correct, since rxvt-unicode still depends on libX11 directly. * gnu/packages/xdisorg.scm (rxvt-unicode)[inputs]: Add libx11. --- gnu/packages/xdisorg.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 41199237bd..83fefecedc 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1142,6 +1142,7 @@ compact configuration syntax.") #t)))))) (inputs `(("libXft" ,libxft) + ("libX11" ,libx11) ("libXt" ,libxt))) (native-inputs `(("ncurses" ,ncurses) ;trigger the installation of terminfo data -- cgit v1.2.3