From b9ad4d789d0ed95cda227e753a7927ad9a4340cc Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Tue, 26 Feb 2013 10:40:57 +0100 Subject: Imported Debian patch 1.0.0-0ubuntu3 --- debian/changelog | 119 ++++++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 27 ++++++++ debian/copyright | 28 ++++++++ debian/patches/01_clear_servers.patch | 36 ++++++++++ debian/patches/glib-deprecated.diff | 43 ++++++++++++ debian/patches/series | 2 + debian/rules | 5 ++ debian/source/format | 1 + debian/watch | 2 + 10 files changed, 264 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/patches/01_clear_servers.patch create mode 100644 debian/patches/glib-deprecated.diff create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..9172a0d --- /dev/null +++ b/debian/changelog @@ -0,0 +1,119 @@ +remote-login-service (1.0.0-0ubuntu3) raring; urgency=low + + * Don't use deprecated g_type_init() with recent glib2.0. + + -- Matthias Klose Tue, 26 Feb 2013 10:40:57 +0100 + +remote-login-service (1.0.0-0ubuntu2) raring; urgency=low + + * SECURITY UPDATE: credentials disclosure via second login (LP: #1070896) + - debian/patches/01_clear_servers.patch: Clear servers on second login + in src/uccs-server.c, add test to tests/dbus-interface.c. + - CVE-2012-0959 + + -- Marc Deslauriers Mon, 05 Nov 2012 14:05:14 -0500 + +remote-login-service (1.0.0-0ubuntu1) quantal; urgency=low + + * New upstream release. + * Support caching the recently used server + * debian/control: Add build dep on libgcrypt11-dev + + -- Ted Gould Thu, 20 Sep 2012 23:55:05 -0500 + +remote-login-service (0.7.0-0ubuntu1) quantal; urgency=low + + * New upstream release. + - Fix NM service detection and fallback + - Fix build on unoptimized build servers + - Fix issues with multiple logins (LP: #1050810) + - Support stored data in UCCS (LP: #1045836) + - Check to insure TCCA is installed before using (LP: #1047939) + - Ensure that the server is available before showing (LP: #1047940) + - Make the UCCS server names translatable (LP: #1049694) + - Fix error message that wasn't that bad (LP: #1041338) + - Place the server marked as default first (LP: #1045838) + * debian/control: + - Adding a build dep on libnm-glib + - Adding a build dep on libsoup2.4-dev + * Dropping debian/patches as all upstream + + -- Ted Gould Thu, 13 Sep 2012 11:16:17 -0500 + +remote-login-service (0.5.0-0ubuntu2) quantal; urgency=low + + * debian/patches/exit-gracefully-on-name-lost.patch: + - Fix possible crash on exit. Patch from trunk. LP: #1041338 + + -- Michael Terry Tue, 11 Sep 2012 14:03:07 -0400 + +remote-login-service (0.5.0-0ubuntu1) quantal; urgency=low + + * New upstream release. + * Fix protocol names + * Align naming with LightDM services + * Handle recursive searches for domain name caches + + -- Ted Gould Wed, 29 Aug 2012 11:38:02 -0500 + +remote-login-service (0.4.0-0ubuntu1) quantal; urgency=low + + * New upstream release. + * slmock to Python3 + * Return a boolean from GetServersForLogin + * Fix thin-client-config-agent path + * debian/control: + - Build-Dep on python3, not python + - Recommend thin-client-config-agent + + -- Michael Terry Tue, 21 Aug 2012 17:43:12 -0400 + +remote-login-service (0.3.0-0ubuntu1) quantal; urgency=low + + [ Ted Gould ] + * New upstream release. + * Async command line calling + * Test suite fix + * Remove security issues with helper-script (dropped) + * Crash fix (LP: #1037832) + * debian/rules: Remove block on tests + + [ Michael Terry ] + * debian/control: + - Add Vcs-Bzr link + - Add some new build dependencies for tests (dbus-test-runner, python) + * Drop patch for pkglibexecdir, not needed anymore + * Drop dh-autoreconf, since we don't patch autotools files now + + -- Michael Terry Mon, 20 Aug 2012 12:42:09 -0400 + +remote-login-service (0.2.0-0ubuntu1) quantal; urgency=low + + * Package for Ubuntu (LP: #1037231) + * Switch to dh9 and drop cdbs + * Add watch file + * Cleanup control and copyright files + * Add patch to use pkglibexecdir instead of libexecdir + + -- Michael Terry Wed, 15 Aug 2012 15:00:35 -0400 + +remote-login-service (0.2.0-0ubuntu1~ppa2) quantal; urgency=low + + * debian/control: Adding dh-autoreconf as a build depend + + -- Ted Gould Wed, 15 Aug 2012 13:06:38 -0500 + +remote-login-service (0.2.0-0ubuntu1~ppa1) quantal; urgency=low + + * New upstream release. + * Support calling the UCCS service tool + * Tests to deal with JSON output + * debian/control: Adding build dependencies on dbustest and json-glib + + -- Ted Gould Wed, 15 Aug 2012 11:38:31 -0500 + +remote-login-service (0.0.1-0ubuntu1~ppa1) quantal; urgency=low + + * New upstream release. + + -- Ted Gould Mon, 30 Jul 2012 16:57:37 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..4c451bd --- /dev/null +++ b/debian/control @@ -0,0 +1,27 @@ +Source: remote-login-service +Section: misc +Priority: extra +Maintainer: Ubuntu Developers +Build-Depends: dbus-test-runner, + debhelper (>= 9), + intltool (>= 0.35.0), + libdbus-1-dev, + libdbustest1-dev, + libgcrypt11-dev, + libglib2.0-dev (>= 2.29.19), + libjson-glib-dev, + libnm-glib-dev, + libsoup2.4-dev, + python3, +Standards-Version: 3.9.3 +Homepage: http://launchpad.net/remote-login-service/ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/remote-login-service/trunk + +Package: remote-login-service +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, +Recommends: thin-client-config-agent +Description: Service to track the remote servers to use + A small service to take the various sources for the remote + services and bring them into a simple DBus list. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..8fb575a --- /dev/null +++ b/debian/copyright @@ -0,0 +1,28 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: remote-login-service +Source: http://launchpad.net/remote-login-service + +Files: * +Copyright: 2012, Canonical Ltd. +License: GPL-3 + +Files: debian/* +Copyright: 2012, Canonical Ltd. +License: GPL-3 + +License: GPL-3 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 3 of the License. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + diff --git a/debian/patches/01_clear_servers.patch b/debian/patches/01_clear_servers.patch new file mode 100644 index 0000000..187113d --- /dev/null +++ b/debian/patches/01_clear_servers.patch @@ -0,0 +1,36 @@ +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/glib-deprecated.diff b/debian/patches/glib-deprecated.diff new file mode 100644 index 0000000..c6e51e5 --- /dev/null +++ b/debian/patches/glib-deprecated.diff @@ -0,0 +1,43 @@ +Index: b/src/main.c +=================================================================== +--- a/src/main.c ++++ b/src/main.c +@@ -387,8 +387,10 @@ + { + GError * error = NULL; + ++#if !GLIB_CHECK_VERSION (2, 35, 1) + /* Init the GTypes */ + g_type_init(); ++#endif + + /* Setup i18n */ + setlocale (LC_ALL, ""); +Index: b/tests/dbus-interface.c +=================================================================== +--- a/tests/dbus-interface.c ++++ b/tests/dbus-interface.c +@@ -571,7 +571,9 @@ + gint + main (gint argc, gchar * argv[]) + { ++#if !GLIB_CHECK_VERSION (2, 35, 1) + g_type_init(); ++#endif + g_test_init(&argc, &argv, NULL); + + /* Test suites */ +Index: b/tests/server-test.c +=================================================================== +--- a/tests/server-test.c ++++ b/tests/server-test.c +@@ -270,7 +270,9 @@ + gint + main (gint argc, gchar * argv[]) + { ++#if !GLIB_CHECK_VERSION (2, 35, 1) + g_type_init(); ++#endif + g_test_init(&argc, &argv, NULL); + + /* Test suites */ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c1e82f9 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +01_clear_servers.patch +glib-deprecated.diff diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..abde6ef --- /dev/null +++ b/debian/rules @@ -0,0 +1,5 @@ +#!/usr/bin/make -f + +%: + dh $@ + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..6adcdd7 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/remote-login-service/+download .*/remote-login-service-(.+)\.tar\.gz -- cgit v1.2.3