Merge lp:~online-accounts/signon/packaging into lp:signon

[Alberto Mardegan]

* Merge from upstream

- lib: reset the DBus proxy when registration failed
- Fix build with Qt 5.5 (LP: #1447175)

* Merge from upstream

- lib: reset the DBus proxy when registration failed
- Fix build with Qt 5.5 (LP: #1447175)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:626
http://jenkins.qa.ubuntu.com/job/signon-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-vivid-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-vivid-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/signon-vivid-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-vivid-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ci/74/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:627
http://jenkins.qa.ubuntu.com/job/signon-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/signon-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-wily-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ci/75/rebuild

review: Approve (continuous-integration)

[lp:~online-accounts/signon/packaging]

626. By Alberto Mardegan on 2015-06-16

* Merge from upstream

- lib: reset the DBus proxy when registration failed
- Fix build with Qt 5.5 (LP: #1447175)
 Fixes: #1415492
Approved by: PS Jenkins bot

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-04 10:39:42 +0000
+++ debian/changelog	2015-06-12 11:22:36 +0000
@@ -1,3 +1,12 @@
+signon (8.57+15.04.20150204.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Merge from upstream
+    - lib: reset the DBus proxy when registration failed
+    - Fix build with Qt 5.5 (LP: #1447175)
+    - Remove obsolete warning about not running as root
+
+ -- Alberto Mardegan <[e-mail]>  Fri, 12 Jun 2015 14:17:06 +0300
+
 signon (8.57+15.04.20150204.1-0ubuntu1) vivid; urgency=medium
 
   [ Alberto Mardegan ]
 
=== modified file 'lib/SignOn/authsession.h'
--- lib/SignOn/authsession.h	2013-08-20 08:01:44 +0000
+++ lib/SignOn/authsession.h	2015-06-12 11:22:36 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2011-2015 Canonical Ltd.
  *
  * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
@@ -40,7 +41,7 @@
 
 namespace SignOnTests {
     class AccessControlTest;
-};
+}
 
 namespace SignOn {
 
 
=== modified file 'lib/SignOn/authsessionimpl.cpp'
--- lib/SignOn/authsessionimpl.cpp	2013-07-29 11:42:18 +0000
+++ lib/SignOn/authsessionimpl.cpp	2015-06-12 11:22:36 +0000
@@ -247,6 +247,8 @@
         m_isAuthInProcessing = false;
 
         m_dbusProxy.setError(err);
+        // Forces a reinitialization of the proxy
+        m_dbusProxy.setObjectPath(QDBusObjectPath());
         return;
     }
 
 
=== modified file 'lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp'
--- lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp	2014-04-10 10:31:10 +0000
+++ lib/plugins/signon-plugins-common/SignOn/blobiohandler.cpp	2015-06-12 11:22:36 +0000
@@ -25,6 +25,7 @@
 
 #include <QDBusArgument>
 #include <QBuffer>
+#include <QDataStream>
 #include <QDebug>
 
 #include "SignOn/signonplugincommon.h"
 
=== modified file 'src/signond/signondaemon.cpp'
--- src/signond/signondaemon.cpp	2015-02-04 09:37:26 +0000
+++ src/signond/signondaemon.cpp	2015-06-12 11:22:36 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2013 Canonical Ltd.
+ * Copyright (C) 2013-2015 Canonical Ltd.
  *
  * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
@@ -386,10 +386,6 @@
 
     m_configuration->load();
 
-    if (getuid() != 0) {
-        BLAME() << "Failed to SUID root. Secure storage will not be available.";
-    }
-
     QCoreApplication *app = QCoreApplication::instance();
     if (!app)
         qFatal("SignonDaemon requires a QCoreApplication instance to be "