From eeefe7a7379d0dcdcf70a6056678e99e4a907596 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 3 Nov 2014 12:48:10 +0100 Subject: drop all patches, that we now applied to our forked RLS --- debian/patches/01_clear_servers.patch | 36 --- debian/patches/02_server-name.patch | 19 -- debian/patches/03_x2go+rls.patch | 429 ---------------------------------- debian/patches/glib-deprecated.diff | 43 ---- debian/patches/series | 4 - 5 files changed, 531 deletions(-) delete mode 100644 debian/patches/01_clear_servers.patch delete mode 100644 debian/patches/02_server-name.patch delete mode 100644 debian/patches/03_x2go+rls.patch delete mode 100644 debian/patches/glib-deprecated.diff delete mode 100644 debian/patches/series diff --git a/debian/patches/01_clear_servers.patch b/debian/patches/01_clear_servers.patch deleted file mode 100644 index 187113d..0000000 --- a/debian/patches/01_clear_servers.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: fix credentials disclosure via second login -Origin: upstream, http://bazaar.launchpad.net/~remote-login-service-team/remote-login-service/trunk/revision/77 -Bug: https://bugs.launchpad.net/ubuntu/quantal/+source/remote-login-service/+bug/1070896 - -=== modified file 'src/uccs-server.c' ---- old/src/uccs-server.c 2012-09-17 07:49:30 +0000 -+++ new/src/uccs-server.c 2012-10-24 14:35:36 +0000 -@@ -466,6 +466,10 @@ - static gboolean - parse_rds_array (UccsServer * server, JsonArray * array) - { -+ // Got a new set of servers, delete the old one -+ g_list_free_full(server->subservers, g_object_unref); -+ server->subservers = NULL; -+ - int i; - for (i = 0; i < json_array_get_length(array); i++) { - JsonNode * node = json_array_get_element(array, i); - -=== modified file 'tests/dbus-interface.c' ---- old/tests/dbus-interface.c 2012-09-17 07:49:30 +0000 -+++ new/tests/dbus-interface.c 2012-10-24 14:35:36 +0000 -@@ -184,9 +184,12 @@ - - GVariant * array = g_variant_get_child_value(retval, 2); - int i; -+ // Check all servers should be in the result are in the result - for (i = 0; slmockdata->servers[i].name != NULL; i++) { - g_assert(find_server(array, &slmockdata->servers[i])); - } -+ // Check there is no more servers in the result than we expected -+ g_assert(i == g_variant_n_children(array)); - g_variant_unref(array); - - g_variant_unref(retval); - diff --git a/debian/patches/02_server-name.patch b/debian/patches/02_server-name.patch deleted file mode 100644 index 50c9a91..0000000 --- a/debian/patches/02_server-name.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/uccs-server.c -+++ b/src/uccs-server.c -@@ -20,6 +20,7 @@ - #include "config.h" - #endif - -+#include - #include - - #include -@@ -734,6 +735,8 @@ - argv[1] = server->username; - argv[2] = NULL; - -+ g_setenv("SERVER_ROOT", server->parent.uri, TRUE); -+ - g_spawn_async_with_pipes(NULL, /* pwd */ - (gchar **)argv, - NULL, /* env */ diff --git a/debian/patches/03_x2go+rls.patch b/debian/patches/03_x2go+rls.patch deleted file mode 100644 index d4563f7..0000000 --- a/debian/patches/03_x2go+rls.patch +++ /dev/null @@ -1,429 +0,0 @@ ---- a/src/com.canonical.RemoteLogin.xml -+++ b/src/com.canonical.RemoteLogin.xml -@@ -2,19 +2,21 @@ - - -