[debian-edu-commits] debian-edu/ 04/13: apparently upstream needs Jetty >= 9, << 9.1, we have Jetty 9.2…

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository guacamole-client.

commit edfccc4128843f3375bbfaf397d624f28e8f2fad
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Sat Oct 29 00:04:54 2016 +0200

    apparently upstream needs Jetty >= 9, << 9.1, we have Jetty 9.2…
---
 debian/changelog                   |  7 ++++-
 debian/patches/fix-java-code.patch | 53 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aa2df8c..2584ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 guacamole-client (0.9.9-1) UNRELEASED; urgency=medium
 
+  [ Dominik George ]
   * New upstream version. (Closes: #814364)
   * Suggest xrdp.
 
- -- Dominik George <nik at naturalnet.de>  Tue, 18 Oct 2016 13:11:07 +0200
+  [ Thorsten Glaser ]
+  * Patch the code and buildsystem until it works on Debian,
+    with the versions of its dependencies Debian provides.
+
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Sat, 29 Oct 2016 00:04:22 +0200
 
 guacamole-client (0.8.3-1.2) unstable; urgency=medium
 
diff --git a/debian/patches/fix-java-code.patch b/debian/patches/fix-java-code.patch
new file mode 100644
index 0000000..22cc836
--- /dev/null
+++ b/debian/patches/fix-java-code.patch
@@ -0,0 +1,53 @@
+# DP: update for Jetty 9.2 API
+
+--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java
++++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java
+@@ -24,6 +24,8 @@ package org.glyptodon.guacamole.net.basi
+ 
+ import org.eclipse.jetty.websocket.api.UpgradeRequest;
+ import org.eclipse.jetty.websocket.api.UpgradeResponse;
++import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
++import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
+ import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
+ import org.glyptodon.guacamole.net.basic.TunnelRequestService;
+ 
+@@ -69,4 +71,14 @@ public class BasicGuacamoleWebSocketCrea
+ 
+     }
+ 
++    @Override
++    public Object createWebSocket(ServletUpgradeRequest request, ServletUpgradeResponse response) {
++        for (String subprotocol : request.getSubProtocols()) {
++            if ("guacamole".equals(subprotocol)) {
++                response.setAcceptedSubProtocol(subprotocol);
++                return new BasicGuacamoleWebSocketTunnelListener(tunnelRequestService);
++            }
++        }
++        return null;
++    }
+ }
+--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java
++++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java
+@@ -38,7 +38,7 @@ public class WebSocketTunnelRequest exte
+     /**
+      * All parameters passed via HTTP to the WebSocket handshake.
+      */
+-    private final Map<String, String[]> handshakeParameters;
++    private final Map<String, List<String>> handshakeParameters;
+     
+     /**
+      * Creates a TunnelRequest implementation which delegates parameter and
+@@ -65,12 +65,7 @@ public class WebSocketTunnelRequest exte
+ 
+     @Override
+     public List<String> getParameterValues(String name) {
+-
+-        String[] values = handshakeParameters.get(name);
+-        if (values == null)
+-            return null;
+-
+-        return Arrays.asList(values);
++        return handshakeParameters.get(name);
+     }
+     
+ }
diff --git a/debian/patches/series b/debian/patches/series
index cf8e32c..765dea0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-js-build.patch
 fix-java-build.patch
+fix-java-code.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/guacamole-client.git