From d605f58de5be0395b44a5989763f7e9ad81056ca Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 15 Oct 2020 21:43:56 +0200
Subject: gnu: xterm: Update to 361.

* gnu/packages/xorg.scm (xterm): Update to 361.
---
 gnu/packages/xorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/xorg.scm')

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 3db4cbae2c..0eda94bc47 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6110,7 +6110,7 @@ (define-public xmessage
 (define-public xterm
   (package
     (name "xterm")
-    (version "359")
+    (version "361")
     (source (origin
               (method url-fetch)
               (uri (list
@@ -6120,7 +6120,7 @@ (define-public xterm
                                    "xterm-" version ".tgz")))
               (sha256
                (base32
-                "0lcjifz027j99zf2dnms0h43xp5zznxr39safrpyarv59jlmdjii"))))
+                "0gv27akkfb796aww1snq3c2sxmi8vajgfxk83g60awp4slh0yqc5"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts"
-- 
cgit v1.2.3


From 21fdf429a7bb6a7d371fcf1d5b5a892fb9c5cdfc Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Fri, 16 Oct 2020 19:15:41 +0200
Subject: gnu: xpra: Fix HTML server
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/patches/xpra-4.0.4-norequests.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xpra)[patches]: Apply it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/local.mk                                     |  1 +
 gnu/packages/patches/xpra-4.0.4-norequests.patch | 39 ++++++++++++++++++++++++
 gnu/packages/xorg.scm                            |  3 +-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/xpra-4.0.4-norequests.patch

(limited to 'gnu/packages/xorg.scm')

diff --git a/gnu/local.mk b/gnu/local.mk
index d41b65957e..111206f34e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1705,6 +1705,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch	\
   %D%/packages/patches/xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch	\
   %D%/packages/patches/xpra-4.0.1-systemd-run.patch	\
+  %D%/packages/patches/xpra-4.0.4-norequests.patch	\
   %D%/packages/patches/xsane-fix-memory-leak.patch		\
   %D%/packages/patches/xsane-fix-pdf-floats.patch		\
   %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch	\
diff --git a/gnu/packages/patches/xpra-4.0.4-norequests.patch b/gnu/packages/patches/xpra-4.0.4-norequests.patch
new file mode 100644
index 0000000000..e545be7f1d
--- /dev/null
+++ b/gnu/packages/patches/xpra-4.0.4-norequests.patch
@@ -0,0 +1,39 @@
+Remove python-requests dependency, r27626 upstream.
+
+--- a/xpra/net/websockets/common.py	(revision 27625)
++++ b/xpra/net/websockets/common.py	(revision 27626)
+@@ -7,7 +7,6 @@
+ import uuid
+ from hashlib import sha1
+ from base64 import b64encode
+-from requests.structures import CaseInsensitiveDict
+ 
+ from xpra.os_util import strtobytes, bytestostr, monotonic_time
+ from xpra.log import Logger
+@@ -77,7 +76,7 @@
+     for line in lines:
+         parts = line.split(b": ", 1)
+         if len(parts)==2:
+-            headers[parts[0]] = parts[1]
++            headers[parts[0].lower()] = parts[1]
+     return headers
+ 
+ def verify_response_headers(headers, key):
+@@ -84,14 +83,13 @@
+     log("verify_response_headers(%s)", headers)
+     if not headers:
+         raise Exception("no http headers found in response")
+-    headers = CaseInsensitiveDict(headers)
+-    upgrade = headers.get(b"Upgrade", b"")
++    upgrade = headers.get(b"upgrade", b"")
+     if upgrade!=b"websocket":
+         raise Exception("invalid http upgrade: '%s'" % upgrade)
+-    protocol = headers.get(b"Sec-WebSocket-Protocol", b"")
++    protocol = headers.get(b"sec-websocket-protocol", b"")
+     if protocol!=b"binary":
+         raise Exception("invalid websocket protocol: '%s'" % protocol)
+-    accept_key = headers.get(b"Sec-WebSocket-Accept", b"")
++    accept_key = headers.get(b"sec-websocket-accept", b"")
+     if not accept_key:
+         raise Exception("websocket accept key is missing")
+     expected_key = make_websocket_accept_hash(key)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 0eda94bc47..e912eb1be9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6312,7 +6312,8 @@ (define-public xpra
                            version ".tar.xz"))
        (sha256
         (base32 "10alqdfmgml9ixdi1nyd9xlw8a5q0j8m2sv4g9p83pd6z1a0rpv2"))
-       (patches (search-patches "xpra-4.0.1-systemd-run.patch"))))
+       (patches (search-patches "xpra-4.0.1-systemd-run.patch"
+                                "xpra-4.0.4-norequests.patch"))))
     (build-system python-build-system)
     ;; see also http://xpra.org/trac/wiki/Dependencies
     (inputs `(
-- 
cgit v1.2.3