gentoo resync : 29.12.2022

5 files changed, 2 insertions, 356 deletions

diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index d9902241b853..465cbe892722 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,10 +1,6 @@
 AUX signond-8.60-buildsystem.patch 1004 BLAKE2B 6a9ae7cc9c2750ffb5eb6495dc47c2118bb7d7babf8f253f168be73cf03934d00a875c99048b1985716d7c1f2ac3a2543bd988939e76631aff8e852a464b4589 SHA512 73ac6551d9c1bb37e331baad427d3770a913ab52833f3112f825a5a28647752f925a40c12bf72a79c0c9b93aacbaca5f357a21a48eae4f1f24341cfeb1ce5b57
 AUX signond-8.60-consistent-paths.patch 10627 BLAKE2B 853cc9816469c0b47c8ecab941c1ade09aa2567a6cbe99012da42d479d35d304eeb869700e4fc9f0623191735c1e445aa2046b904ef151cbc048dda00e3c7cd4 SHA512 3c285e57843d458fb30e21f607dc7edf3009d7bcf68c2641188b1ded4cd44d589541b754803a687adf92b2de11417bf3411c0cf2bfdcd6c7375e32bc1948edfe
-AUX signond-8.60-crashfix.patch 5228 BLAKE2B 713fe5b5fe6c806fc09bf1710e5a5c8872b7bc80e55d328d6301fa0040bf3750b33891d1e2ce42cab45622b9633fb93e29277889ce27fb54a98fb44bc022124a SHA512 25ef43ed61f8d422882e944600e2571108927920493558904c039a06af7091ec8fdcdcf030cb4e59ebf53d934aa67265d073084b3d280b204f24f74620e764b9
-AUX signond-8.60-drop-fno-rtti.patch 4558 BLAKE2B cd75d2a269b337b43286f9a76d189b4cdd91e4c312b7664de49a2b6e72d63eedd3776ef3fe2a659120556725c748cc5a66a16568d3f24726229ca6baef129fa6 SHA512 d7b3abc6f82fdccba7544176f483d26dfe15200a07d9a44aaf0c2a7b27f09a1bef3e8f6e1a59f7a529c21bf373741f541710d1c3cc958bbcb7e0bd58d45d868c
 AUX signond-8.60-unused-dep.patch 984 BLAKE2B 67ec450053f294eec1be87411ab11dd14d3e6c9895a794b0aa6f08a433763f2aa246908bf8c8345639b98cf5be3a06670dfc200a238ce9582e37e186f88759c0 SHA512 b54a59c580436dfac3e469dd733557ddd1857f78fb992693f19c58683baed99e91193ca5c62cda9e974b7db48791c46156427a1c0043a24ec03c4594018fe697
-DIST signond-8.60.tar.gz 281359 BLAKE2B 3ecd8048d8c5551c3611e48091c35a9f0fe4c972e6b4730fe1f610b4870fe86911dee04c331847deee2a50f4a04acd5a8a0d1c605d1f4f0a24272d44c289a6d3 SHA512 fb3ccc99c692506ca29d5bae39bc375ff97057734fac1551ea39105d5f8e78f3df23e01a286f73be3a606c54b40f957c3c0d985484926e57f354218e4137ff3c
 DIST signond-8.61.tar.gz 282965 BLAKE2B 8ab8f4ac3f8416ef9c1b8d8c73057ffcf0024a7e3cf6c2fa97a3119826f6c655b215e2530137c199e60e9e9518b0858fa1a23a3f107c71751f33d2a34898a610 SHA512 1652ee8e97d6aee036075f5416909649c5848e33c3c71f367176f3e5d6f9c360fd7a46c65ba877d58b3ae8fb8df0712938c5e073409ba945d66d8afeacfd6f72
-EBUILD signond-8.60-r2.ebuild 1801 BLAKE2B c819c6ad7dbe0242da49a20bb584f48558a76db6366e420999aa902cbfc490c884bf11b9b543e322494d141f9d6cdcc401f9349dda12c3c6294d7da74b7d3a35 SHA512 d83dc62835f6266e82895bc0702e7b74eb81e0a1f355d23b28fdc756f2bebb03e43a6c6aa486a3965dd11e4e4e6ff91e5b3a76d549cbafce6a10027a8b312fb1
-EBUILD signond-8.61.ebuild 1730 BLAKE2B 2d656218dd92d0f9c8ff05a13394f70978f44f664b2c9044c1061ba46b4c31fb092d00785734d6778b421bc4fdfeb4cfbd33eca60d40b10416a5fd44e44c3a40 SHA512 5203662b3fb1988e3243e44450a971d67513cebf3ede64cd1ce9b2d27bc6e244f430d220e97d4d22a0b29a7b5940a3e1963850c72724e4b5bd4e962f478e4bce
+EBUILD signond-8.61.ebuild 1737 BLAKE2B 877b77a084b695bf064229af3689093ce820ef169d4d8329ccf6297a17cdcd4a7b1c5d3dcfcdef4fec2d7689e2915850f4c99886ad60d168ad87687ffb2605f5 SHA512 f8950a9cfce04f4028c713d1d61b953daf269e89379f7dad66538a68ddb8e07fb6816bd87b38543f052ff78ab4306f8170d90a923afcce12764cf2b0e7089bc3
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/signond/files/signond-8.60-crashfix.patch b/net-libs/signond/files/signond-8.60-crashfix.patch
deleted file mode 100644
index 8cfc79ac431e..000000000000
--- a/net-libs/signond/files/signond-8.60-crashfix.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From ab9fab9763277783363f8c6d4b62405c3b0b0413 Mon Sep 17 00:00:00 2001
-From: Chris Adams <chris.adams@jollamobile.com>
-Date: Wed, 31 Jul 2019 12:45:14 +1000
-Subject: [PATCH] Don't emit QObject::destroyed() within Identity::destroy()
-
-QObject::destroyed() should not be emitted manually, as that can
-cause unwanted side effects.
-
-Specifically, in this case, the
-QDBusConnectionPrivate::objectDestroyed() slot was invoked with
-invalidated object parameter (perhaps due to duplicate invocation)
-resulting in a warning in QObject::disconnect().
-
-Instead, ensure the object is unregistered from DBus immediately.
----
- src/signond/signondaemonadaptor.cpp | 29 ++++++++++++++++++++++++++++-
- src/signond/signondaemonadaptor.h   |  3 +++
- src/signond/signonidentity.cpp      | 13 ++++++++-----
- src/signond/signonidentity.h        |  1 +
- 4 files changed, 40 insertions(+), 6 deletions(-)
-
-diff --git a/src/signond/signondaemonadaptor.cpp b/src/signond/signondaemonadaptor.cpp
-index 8b35e4bd..abd8fd3a 100644
---- a/src/signond/signondaemonadaptor.cpp
-+++ b/src/signond/signondaemonadaptor.cpp
-@@ -29,6 +29,13 @@
- 
- namespace SignonDaemonNS {
- 
-+struct RegisteredIdentity {
-+    RegisteredIdentity(const QDBusConnection &connection, QObject *identity)
-+        : conn(connection), ident(identity) {}
-+    QDBusConnection conn;
-+    QObject *ident = nullptr;
-+};
-+
- SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent):
-     QDBusAbstractAdaptor(parent),
-     m_parent(parent)
-@@ -38,6 +45,7 @@ SignonDaemonAdaptor::SignonDaemonAdaptor(SignonDaemon *parent):
- 
- SignonDaemonAdaptor::~SignonDaemonAdaptor()
- {
-+    qDeleteAll(m_registeredIdentities);
- }
- 
- void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext,
-@@ -46,7 +54,10 @@ void SignonDaemonAdaptor::registerNewIdentity(const QString &applicationContext,
-     Q_UNUSED(applicationContext);
- 
-     QObject *identity = m_parent->registerNewIdentity();
--    objectPath = registerObject(parentDBusContext().connection(), identity);
-+    QDBusConnection dbusConnection(parentDBusContext().connection());
-+    objectPath = registerObject(dbusConnection, identity);
-+    m_registeredIdentities.append(new RegisteredIdentity(dbusConnection, identity));
-+    connect(identity, SIGNAL(unregistered()), this, SLOT(onIdentityUnregistered()));
- 
-     SignonDisposable::destroyUnused();
- }
-@@ -130,6 +141,22 @@ void SignonDaemonAdaptor::getIdentity(const quint32 id,
-     SignonDisposable::destroyUnused();
- }
- 
-+void SignonDaemonAdaptor::onIdentityUnregistered()
-+{
-+    QObject *ident = sender();
-+    if (!ident) {
-+        return;
-+    }
-+
-+    for (int i = 0; i < m_registeredIdentities.size(); ++i) {
-+        if (m_registeredIdentities[i]->ident == ident) {
-+            m_registeredIdentities[i]->conn.unregisterObject(ident->objectName());
-+            delete m_registeredIdentities.takeAt(i);
-+            return;
-+        }
-+    }
-+}
-+
- void SignonDaemonAdaptor::onIdentityAccessReplyFinished()
- {
-     SignOn::AccessReply *reply = qobject_cast<SignOn::AccessReply*>(sender());
-diff --git a/src/signond/signondaemonadaptor.h b/src/signond/signondaemonadaptor.h
-index db8d875f..1c20cac3 100644
---- a/src/signond/signondaemonadaptor.h
-+++ b/src/signond/signondaemonadaptor.h
-@@ -34,6 +34,7 @@
- namespace SignonDaemonNS {
- 
- typedef QList<QVariantMap> MapList;
-+class RegisteredIdentity;
- 
- class SignonDaemonAdaptor: public QDBusAbstractAdaptor
- {
-@@ -74,10 +75,12 @@ private:
-                                    QObject *object);
- 
- private Q_SLOTS:
-+    void onIdentityUnregistered();
-     void onIdentityAccessReplyFinished();
-     void onAuthSessionAccessReplyFinished();
- 
- private:
-+    QList<RegisteredIdentity*> m_registeredIdentities;
-     SignonDaemon *m_parent;
- }; //class SignonDaemonAdaptor
- 
-diff --git a/src/signond/signonidentity.cpp b/src/signond/signonidentity.cpp
-index ce1ecfb0..a143c223 100644
---- a/src/signond/signonidentity.cpp
-+++ b/src/signond/signonidentity.cpp
-@@ -84,7 +84,8 @@ private:
- SignonIdentity::SignonIdentity(quint32 id, int timeout,
-                                SignonDaemon *parent):
-     SignonDisposable(timeout, parent),
--    m_pInfo(NULL)
-+    m_pInfo(NULL),
-+    m_destroyed(false)
- {
-     m_id = id;
- 
-@@ -112,7 +113,10 @@ SignonIdentity::SignonIdentity(quint32 id, int timeout,
- 
- SignonIdentity::~SignonIdentity()
- {
--    emit unregistered();
-+    if (!m_destroyed) {
-+        m_destroyed = true;
-+        Q_EMIT unregistered();
-+    }
- 
-     delete m_signonui;
-     delete m_pInfo;
-@@ -125,9 +129,8 @@ SignonIdentity *SignonIdentity::createIdentity(quint32 id, SignonDaemon *parent)
- 
- void SignonIdentity::destroy()
- {
--    /* Emitting the destroyed signal makes QDBusConnection unregister the
--     * object */
--    Q_EMIT destroyed();
-+    m_destroyed = true;
-+    Q_EMIT unregistered();
-     deleteLater();
- }
- 
-diff --git a/src/signond/signonidentity.h b/src/signond/signonidentity.h
-index 9ec9be4e..f6321f30 100644
---- a/src/signond/signonidentity.h
-+++ b/src/signond/signonidentity.h
-@@ -96,6 +96,7 @@ private:
-     quint32 m_id;
-     SignonUiAdaptor *m_signonui;
-     SignonIdentityInfo *m_pInfo;
-+    bool m_destroyed;
- }; //class SignonDaemon
- 
- } //namespace SignonDaemonNS
--- 
-2.26.2
-
diff --git a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
deleted file mode 100644
index 175d88361c43..000000000000
--- a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From e21867fa27e32f5391d73d145eef1c8d908dee44 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Thu, 18 Jun 2020 10:22:04 +0200
-Subject: [PATCH] Don't use -fno-rtti
-
-QProcess uses typeid and crashes otherwise.
----
- common-project-config.pri                       | 2 --
- src/extensions/cryptsetup/cryptsetup.pro        | 1 -
- src/plugins/plugins.pri                         | 3 +--
- src/remotepluginprocess/remotepluginprocess.pro | 3 +--
- tests/extensions/extensions.pri                 | 3 +--
- tests/libsignon-qt-tests/libsignon-qt-tests.pro | 3 +--
- tests/passwordplugintest/passwordplugintest.pro | 3 +--
- tests/signond-tests/signond-tests.pri           | 3 +--
- 8 files changed, 6 insertions(+), 15 deletions(-)
-
-diff --git a/common-project-config.pri b/common-project-config.pri
-index 606f70bb..abe6cf6d 100644
---- a/common-project-config.pri
-+++ b/common-project-config.pri
-@@ -13,8 +13,6 @@ RCC_DIR         = resources
- 
- # we don't like warnings...
- QMAKE_CXXFLAGS -= -Werror -Wno-write-strings
--# Disable RTTI
--QMAKE_CXXFLAGS += -fno-rtti
- # Disable exceptions
- CONFIG += exceptions_off
- # Use C++11
-diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro
-index f4b6e53b..5cc214e4 100644
---- a/src/extensions/cryptsetup/cryptsetup.pro
-+++ b/src/extensions/cryptsetup/cryptsetup.pro
-@@ -29,7 +29,6 @@ QT -= gui
- 
- QMAKE_CXXFLAGS += \
-     -fno-exceptions \
--    -fno-rtti \
-     -fvisibility=hidden
- 
- DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
-index 2c03e743..074896d5 100644
---- a/src/plugins/plugins.pri
-+++ b/src/plugins/plugins.pri
-@@ -22,8 +22,7 @@ LIBS += -lsignon-plugins
- QMAKE_LIBDIR += \
-     $${TOP_BUILD_DIR}/lib/plugins
- 
--QMAKE_CXXFLAGS += -fno-exceptions \
--    -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
- 
- headers.path = $${INSTALL_PREFIX}/include/signon-plugins
- 
-diff --git a/src/remotepluginprocess/remotepluginprocess.pro b/src/remotepluginprocess/remotepluginprocess.pro
-index 7c2ea007..36b4cbe0 100644
---- a/src/remotepluginprocess/remotepluginprocess.pro
-+++ b/src/remotepluginprocess/remotepluginprocess.pro
-@@ -40,8 +40,7 @@ LIBS += \
-     -lsignon-plugins-common \
-     -lsignon-plugins
- 
--QMAKE_CXXFLAGS += -fno-exceptions \
--                  -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
- 
- #DEFINES += QT_NO_CAST_TO_ASCII \
- #    QT_NO_CAST_FROM_ASCII
-diff --git a/tests/extensions/extensions.pri b/tests/extensions/extensions.pri
-index 179cd28d..2fd75955 100644
---- a/tests/extensions/extensions.pri
-+++ b/tests/extensions/extensions.pri
-@@ -20,5 +20,4 @@ INCLUDEPATH += . \
-     $$TOP_SRC_DIR/lib/signond
- 
- QMAKE_CXXFLAGS += \
--    -fno-exceptions \
--    -fno-rtti
-+    -fno-exceptions
-diff --git a/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro
-index 43f2d59f..ac87781d 100644
---- a/tests/libsignon-qt-tests/libsignon-qt-tests.pro
-+++ b/tests/libsignon-qt-tests/libsignon-qt-tests.pro
-@@ -36,8 +36,7 @@ INCLUDEPATH += . \
-     $$TOP_SRC_DIR/src/plugins/test
- DEFINES += SSO_CI_TESTMANAGEMENT
- DEFINES += "SIGNOND_PLUGINS_DIR=$${SIGNOND_PLUGINS_DIR_QUOTED}"
--QMAKE_CXXFLAGS += -fno-exceptions \
--    -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
- 
- check.depends = $$TARGET
- check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./libsignon-qt-tests"
-diff --git a/tests/passwordplugintest/passwordplugintest.pro b/tests/passwordplugintest/passwordplugintest.pro
-index 6132921e..ce16fdcf 100644
---- a/tests/passwordplugintest/passwordplugintest.pro
-+++ b/tests/passwordplugintest/passwordplugintest.pro
-@@ -19,5 +19,4 @@ INCLUDEPATH += $${TOP_SRC_DIR}/lib/plugins \
-     $${TOP_SRC_DIR}/src/plugins \
-     $${TOP_SRC_DIR}/lib
- 
--QMAKE_CXXFLAGS += -fno-exceptions \
--    -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
-diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri
-index 1bbd5a15..e95556ba 100644
---- a/tests/signond-tests/signond-tests.pri
-+++ b/tests/signond-tests/signond-tests.pri
-@@ -34,8 +34,7 @@ INCLUDEPATH += . \
-     $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common/SignOn \
-     $${TOP_SRC_DIR}/lib \
- 
--QMAKE_CXXFLAGS += -fno-exceptions \
--    -fno-rtti
-+QMAKE_CXXFLAGS += -fno-exceptions
- 
- check.depends = $$TARGET
- check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./$$TARGET"
--- 
-GitLab
-
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild
deleted file mode 100644
index f9995daf5819..000000000000
--- a/net-libs/signond/signond-8.60-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Signon daemon for libaccounts-glib"
-HOMEPAGE="https://gitlab.com/accounts-sso"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="doc test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	net-libs/libproxy
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-# tests are brittle; they all pass when stars align, bug 727666
-RESTRICT="test !test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-buildsystem.patch"
-	"${FILESDIR}/${P}-consistent-paths.patch" # bug 701142
-	"${FILESDIR}/${P}-crashfix.patch"
-	"${FILESDIR}/${P}-unused-dep.patch" # bug 727346
-	"${FILESDIR}/${P}-drop-fno-rtti.patch" # runtime crashes
-)
-
-S="${WORKDIR}/${PN}-VERSION_${PV}"
-
-src_prepare() {
-	default
-
-	# install docs to correct location
-	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \
-		-i doc/doc.pri || die
-	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/\$\${TARGET}/" \
-		-i lib/plugins/doc/doc.pri || die
-	sed -e "/^documentation.path = /c\documentation.path = \$\${INSTALL_PREFIX}/share/doc/${PF}/libsignon-qt/" \
-		-i lib/SignOn/doc/doc.pri || die
-
-	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \
-		-i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
-
-	use test || sed -e '/^SUBDIRS/s/tests//' \
-		-i signon.pro || die "couldn't disable tests"
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}"/usr LIBDIR=$(get_libdir)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/net-libs/signond/signond-8.61.ebuild b/net-libs/signond/signond-8.61.ebuild
index 5c5deb815a67..6aa2f1b9ab30 100644
--- a/net-libs/signond/signond-8.61.ebuild
+++ b/net-libs/signond/signond-8.61.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-VERSION_${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc test"
 
 # tests are brittle; they all pass when stars align, bug 727666