Merge branch 'jb27876v2' into 'master'

[libsignon] Update to 8.60. Contributes to JB#27876

See merge request mer-core/libsignon!9

rpm/0001-disable-multilib.patch

@@ -1,30 +1,28 @@
-From 51484c1330c3a84245d4051e27c4769973c9b06c Mon Sep 17 00:00:00 2001
+From fdb64a1a51275531a09c1abab5d23f9f1f5cb6c3 Mon Sep 17 00:00:00 2001
 From: Robin Burchell <robin+git@viroteck.net>
 Date: Thu, 11 Jul 2013 08:51:54 +0000
-Subject: [PATCH 01/11] disable multilib
+Subject: [PATCH 1/9] disable multilib
 
 Mer doesn't use it.
 ---
- common-project-config.pri | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
+ common-project-config.pri | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/common-project-config.pri b/common-project-config.pri
-index 505baa9..bd83906 100644
+index 606f70b..da2fd86 100644
 --- a/common-project-config.pri
 +++ b/common-project-config.pri
-@@ -67,11 +67,7 @@ exists( meego-release ) {
+@@ -57,9 +57,7 @@ exists( meego-release ) {
      ARCH = $$system(uname -m)
  }
 
--contains( ARCH, x86_64 ) {
--    INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64
--} else {
--    INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
--}
+-linux-g++-64|linux-icc-64: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64
+-else: linux-g++-32|linux-icc-32: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib32
+-else: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
 +INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
 
  # default library directory can be overriden by defining LIBDIR when
  # running qmake
 -- 
-2.20.1
+2.17.1
 

rpm/0002-fix-documentation-path.patch

@@ -1,29 +1,25 @@
-From dd35fbae93dd6804f79b6c729f98d977e9cb27dd Mon Sep 17 00:00:00 2001
+From 00a7860b4c16c1f63f62dfba874ecf57ed407e13 Mon Sep 17 00:00:00 2001
 From: Robin Burchell <robin+git@viroteck.net>
 Date: Thu, 11 Jul 2013 08:53:06 +0000
-Subject: [PATCH 02/11] fix documentation path
+Subject: [PATCH 2/9] fix documentation path
 
 ---
- lib/SignOn/doc/doc.pri | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ lib/SignOn/doc/doc.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/SignOn/doc/doc.pri b/lib/SignOn/doc/doc.pri
-index 46f1148..5c5da07 100644
+index 46f1148..3f2a96b 100644
 --- a/lib/SignOn/doc/doc.pri
 +++ b/lib/SignOn/doc/doc.pri
-@@ -58,7 +58,11 @@ include( ../../../common-installs-config.pri )
+@@ -58,7 +58,7 @@ include( ../../../common-installs-config.pri )
  #-----------------------------------------------------------------------------
  # Installation target setup for documentation
  #-----------------------------------------------------------------------------
 -documentation.path = $${INSTALL_PREFIX}/share/doc/libsignon-qt
-+greaterThan(QT_MAJOR_VERSION, 4) {
-+    documentation.path = $${INSTALL_PREFIX}/share/doc/libsignon-qt5
-+} else {
-+    documentation.path = $${INSTALL_PREFIX}/share/doc/libsignon-qt
-+}
++documentation.path = $${INSTALL_PREFIX}/share/doc/libsignon-qt5
  for( folder, DOC_FOLDERS ) {
      documentation.files += $${folder}
  }
 -- 
-2.20.1
+2.17.1
 

rpm/0003-Install-tests-add-tests-definition.patch

@@ -1,7 +1,7 @@
-From ca9eb403bd49bb13b487fcbd788c8052f35e53f9 Mon Sep 17 00:00:00 2001
+From e713ef83d6db2222b11d0786d9e9de4b0293428b Mon Sep 17 00:00:00 2001
 From: Martin Kampas <martin.kampas@tieto.com>
 Date: Mon, 18 Mar 2013 16:50:19 +0100
-Subject: [PATCH 03/11] Install tests, add tests definition
+Subject: [PATCH 3/9] Install tests, add tests definition
 
 Signed-off-by: Martin Kampas <martin.kampas@tieto.com>
 ---
@@ -53,7 +53,7 @@ index 0000000..1e35b92
 +{
 +    FLAGS="${1?}"
 +    FLAG="${2?}"
-+    echo "${FLAGS}" |tr ',' '\n' |grep -q --line-regexp -e "${FLAG}"
++    echo "${FLAGS}" |tr ',' '\n' |grep -q -x -e "${FLAG}"
 +}
 +
 +fmt_test_case()
@@ -206,5 +206,5 @@ index 64c59c1..656391e 100644
      passwordplugintest \
      libsignon-qt-tests \
 -- 
-2.20.1
+2.17.1
 

rpm/0005-Set-permissions-on-config-dir-correctly.patch → rpm/0004-Set-permissions-on-config-dir-correctly.patch

@@ -1,7 +1,7 @@
-From e405a1c3417725e1135f690f5da973593dcc2060 Mon Sep 17 00:00:00 2001
+From 4b94fac952a1cbd8fa7f2f068e220f09f948ae3d Mon Sep 17 00:00:00 2001
 From: Chris Adams <chris.adams@jollamobile.com>
 Date: Thu, 20 Mar 2014 21:44:25 +1000
-Subject: [PATCH 05/11] Set permissions on config dir correctly
+Subject: [PATCH 4/9] Set permissions on config dir correctly
 
 Also ensure that signond is launched with privileged permissions
 ---
@@ -30,10 +30,10 @@ index 6603fd7..5b5d458 100644
 -Exec=$$INSTALL_PREFIX/bin/signond -backup
 +Exec=/usr/bin/invoker --type=qt5 -d 10 -n $$INSTALL_PREFIX/bin/signond -backup
 diff --git a/src/signond/main.cpp b/src/signond/main.cpp
-index 84751ad..893418d 100644
+index 89192e7..841455b 100644
 --- a/src/signond/main.cpp
 +++ b/src/signond/main.cpp
-@@ -38,7 +38,7 @@ void installSigHandlers()
+@@ -39,7 +39,7 @@ void installSigHandlers()
      sigaction(SIGINT, &act, 0);
  }
 
@@ -43,7 +43,7 @@ index 84751ad..893418d 100644
      QCoreApplication app(argc, argv);
      installSigHandlers();
 diff --git a/src/signond/signond.pro b/src/signond/signond.pro
-index 76de1ea..f8990d8 100644
+index 60ee5e7..f7f83c9 100644
 --- a/src/signond/signond.pro
 +++ b/src/signond/signond.pro
 @@ -8,6 +8,13 @@ QT += core \
@@ -58,8 +58,8 @@ index 76de1ea..f8990d8 100644
 +}
 +
  #generate adaptor for backup
- system(qdbusxml2cpp -c BackupIfAdaptor -a backupifadaptor.h:backupifadaptor.cpp \
-     ../../lib/signond/com.nokia.SingleSignOn.Backup.xml)
+ DBUS_ADAPTORS += \
+     ../../lib/signond/com.nokia.SingleSignOn.Backup.xml
 -- 
-2.20.1
+2.17.1
 

rpm/0007-Guard-PendingCall-against-deletion-by-connected-slot.patch → rpm/0005-Guard-PendingCall-against-deletion-by-connected-slot.patch

@@ -1,7 +1,7 @@
-From 4abd7f0054927491fa8774f8b1dc17377275a693 Mon Sep 17 00:00:00 2001
+From f0bed51ad5d4e1b1642dbdc5b62c7b835bb2a315 Mon Sep 17 00:00:00 2001
 From: Chris Adams <chris.adams@jollamobile.com>
 Date: Fri, 6 Feb 2015 15:39:16 +1000
-Subject: [PATCH 07/11] Guard PendingCall against deletion by connected slots
+Subject: [PATCH 5/9] Guard PendingCall against deletion by connected slots
 
 This commit uses QPointer to guard the PendingCall object (and the
 QDBusPendingCallWatcher associated with it).
@@ -14,10 +14,10 @@ side-effect) is found and corrected.
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/lib/SignOn/async-dbus-proxy.cpp b/lib/SignOn/async-dbus-proxy.cpp
-index ecd8284..2087c6e 100644
+index 8656e48..94db648 100644
 --- a/lib/SignOn/async-dbus-proxy.cpp
 +++ b/lib/SignOn/async-dbus-proxy.cpp
-@@ -30,6 +30,7 @@
+@@ -29,6 +29,7 @@
  #include <QDebug>
  #include <QMetaMethod>
  #include <QMetaType>
@@ -44,5 +44,5 @@ index ecd8284..2087c6e 100644
 
  void PendingCall::onInterfaceDestroyed()
 -- 
-2.20.1
+2.17.1
 

rpm/0009-Always-use-P2P-DBus-if-enabled.-Contributes-to-JB-42.patch → rpm/0006-Always-use-P2P-DBus-if-enabled.-Contributes-to-JB-42.patch

@@ -1,7 +1,7 @@
-From 9209482235538a1d605d04dfd5b721fe1917433c Mon Sep 17 00:00:00 2001
+From 79a4af5f18febbd448ffe66fb27b105d44172a77 Mon Sep 17 00:00:00 2001
 From: Chris Adams <chris.adams@jollamobile.com>
 Date: Tue, 19 Jun 2018 15:06:11 +1000
-Subject: [PATCH 09/11] Always use P2P DBus if enabled. Contributes to JB#42126
+Subject: [PATCH 6/9] Always use P2P DBus if enabled. Contributes to JB#42126
 
 This commit ensures that if the enable-p2p config is set, we don't
 ever allow falling back to the session bus to service signon requests,
@@ -13,10 +13,10 @@ as that could result in leaking sensitive information.
  3 files changed, 23 insertions(+), 3 deletions(-)
 
 diff --git a/lib/SignOn/connection-manager.cpp b/lib/SignOn/connection-manager.cpp
-index d08edb6..98ab434 100644
+index 817390b..56c73af 100644
 --- a/lib/SignOn/connection-manager.cpp
 +++ b/lib/SignOn/connection-manager.cpp
-@@ -40,7 +40,8 @@ static QPointer<ConnectionManager> connectionInstance = 0;
+@@ -39,7 +39,8 @@ static QPointer<ConnectionManager> connectionInstance = 0;
  ConnectionManager::ConnectionManager(QObject *parent):
      QObject(parent),
      m_connection(QLatin1String("libsignon-qt-invalid")),
@@ -26,7 +26,7 @@ index d08edb6..98ab434 100644
  {
      if (connectionInstance == 0) {
          init();
-@@ -128,6 +129,21 @@ void ConnectionManager::init()
+@@ -123,6 +124,21 @@ void ConnectionManager::init()
 
      SocketConnectionStatus status = setupSocketConnection();
 
@@ -48,7 +48,7 @@ index d08edb6..98ab434 100644
      if (status == SocketConnectionNoService) {
          TRACE() << "Peer connection unavailable, activating service";
          QDBusConnectionInterface *interface =
-@@ -142,11 +158,10 @@ void ConnectionManager::init()
+@@ -137,11 +153,10 @@ void ConnectionManager::init()
                           SIGNAL(finished(QDBusPendingCallWatcher*)),
                           this,
                           SLOT(onActivationDone(QDBusPendingCallWatcher*)));
@@ -62,7 +62,7 @@ index d08edb6..98ab434 100644
          Q_EMIT connected(m_connection);
      }
 diff --git a/lib/SignOn/connection-manager.h b/lib/SignOn/connection-manager.h
-index 4cf7de3..b0ce11b 100644
+index d7d26ad..c1920e8 100644
 --- a/lib/SignOn/connection-manager.h
 +++ b/lib/SignOn/connection-manager.h
 @@ -74,6 +74,7 @@ private Q_SLOTS:
@@ -74,12 +74,12 @@ index 4cf7de3..b0ce11b 100644
 
  }
 diff --git a/lib/SignOn/libsignon-qt.pri b/lib/SignOn/libsignon-qt.pri
-index 0356509..1bcc0d4 100644
+index 1458c50..472fbe8 100644
 --- a/lib/SignOn/libsignon-qt.pri
 +++ b/lib/SignOn/libsignon-qt.pri
-@@ -57,6 +57,10 @@ DEFINES += \
-     QT_NO_CAST_FROM_ASCII \
-     LIBSIGNON_TRACE
+@@ -58,6 +58,10 @@ DEFINES += \
+     QT_NO_CAST_TO_ASCII \
+     QT_NO_CAST_FROM_ASCII
 
 +CONFIG(enable-p2p) {
 +    DEFINES += ENABLE_P2P
@@ -89,5 +89,5 @@ index 0356509..1bcc0d4 100644
 
  headers.files = $$public_headers \
 -- 
-2.20.1
+2.17.1