Skip to content

Commit

Permalink
kdeconnect: Disable built-in mDNS resolving
Browse files Browse the repository at this point in the history
**Summary**

Disable built-in mDNS resolving as it conflicts with Avahi or systemd-resolved.
Provide a systemd-resolved service definition so Solus devices can still be discovered.
  • Loading branch information
silkeh committed Sep 8, 2024
1 parent ca880ae commit 3381f6f
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 80 deletions.
43 changes: 0 additions & 43 deletions packages/k/kdeconnect/abi_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,6 @@ libkdeconnectcore.so.24:_ZN10OpenConfig11qt_metacastEPKc
libkdeconnectcore.so.24:_ZN10OpenConfig16staticMetaObjectE
libkdeconnectcore.so.24:_ZN10OpenConfig17openConfigurationERK7QStringS2_
libkdeconnectcore.so.24:_ZN10OpenConfig21setXdgActivationTokenERK7QString
libkdeconnectcore.so.24:_ZN11MdnsWrapper10Discoverer11qt_metacallEN11QMetaObject4CallEiPPv
libkdeconnectcore.so.24:_ZN11MdnsWrapper10Discoverer11qt_metacastEPKc
libkdeconnectcore.so.24:_ZN11MdnsWrapper10Discoverer12serviceFoundERKNS0_11MdnsServiceE
libkdeconnectcore.so.24:_ZN11MdnsWrapper10Discoverer15stopDiscoveringEv
libkdeconnectcore.so.24:_ZN11MdnsWrapper10Discoverer16startDiscoveringERK7QString
libkdeconnectcore.so.24:_ZN11MdnsWrapper10Discoverer16staticMetaObjectE
libkdeconnectcore.so.24:_ZN11MdnsWrapper10Discoverer23listenForQueryResponsesEv
libkdeconnectcore.so.24:_ZN11MdnsWrapper10Discoverer30stopListeningForQueryResponsesEv
libkdeconnectcore.so.24:_ZN11MdnsWrapper10Discoverer9sendQueryERK7QString
libkdeconnectcore.so.24:_ZN11MdnsWrapper9Announcer11qt_metacallEN11QMetaObject4CallEiPPv
libkdeconnectcore.so.24:_ZN11MdnsWrapper9Announcer11qt_metacastEPKc
libkdeconnectcore.so.24:_ZN11MdnsWrapper9Announcer14stopAnnouncingEv
libkdeconnectcore.so.24:_ZN11MdnsWrapper9Announcer15startAnnouncingEv
libkdeconnectcore.so.24:_ZN11MdnsWrapper9Announcer16listenForQueriesEv
libkdeconnectcore.so.24:_ZN11MdnsWrapper9Announcer16staticMetaObjectE
libkdeconnectcore.so.24:_ZN11MdnsWrapper9Announcer19detectHostAddressesEv
libkdeconnectcore.so.24:_ZN11MdnsWrapper9Announcer21sendMulticastAnnounceEb
libkdeconnectcore.so.24:_ZN11MdnsWrapper9Announcer23stopListeningForQueriesEv
libkdeconnectcore.so.24:_ZN11MdnsWrapper9AnnouncerC1ERK7QStringS3_t
libkdeconnectcore.so.24:_ZN11MdnsWrapper9AnnouncerC2ERK7QStringS3_t
libkdeconnectcore.so.24:_ZN12LinkProvider11qt_metacallEN11QMetaObject4CallEiPPv
libkdeconnectcore.so.24:_ZN12LinkProvider11qt_metacastEPKc
libkdeconnectcore.so.24:_ZN12LinkProvider16staticMetaObjectE
Expand All @@ -118,17 +98,6 @@ libkdeconnectcore.so.24:_ZN13LanDeviceLink16staticMetaObjectE
libkdeconnectcore.so.24:_ZN13LanDeviceLink5resetEP10QSslSocket
libkdeconnectcore.so.24:_ZN13LanDeviceLinkC1ERK10DeviceInfoP15LanLinkProviderP10QSslSocket
libkdeconnectcore.so.24:_ZN13LanDeviceLinkC2ERK10DeviceInfoP15LanLinkProviderP10QSslSocket
libkdeconnectcore.so.24:_ZN13MdnsDiscovery11qt_metacallEN11QMetaObject4CallEiPPv
libkdeconnectcore.so.24:_ZN13MdnsDiscovery11qt_metacastEPKc
libkdeconnectcore.so.24:_ZN13MdnsDiscovery15onNetworkChangeEv
libkdeconnectcore.so.24:_ZN13MdnsDiscovery16staticMetaObjectE
libkdeconnectcore.so.24:_ZN13MdnsDiscovery6onStopEv
libkdeconnectcore.so.24:_ZN13MdnsDiscovery7onStartEv
libkdeconnectcore.so.24:_ZN13MdnsDiscoveryC1EP15LanLinkProvider
libkdeconnectcore.so.24:_ZN13MdnsDiscoveryC2EP15LanLinkProvider
libkdeconnectcore.so.24:_ZN13MdnsDiscoveryD0Ev
libkdeconnectcore.so.24:_ZN13MdnsDiscoveryD1Ev
libkdeconnectcore.so.24:_ZN13MdnsDiscoveryD2Ev
libkdeconnectcore.so.24:_ZN13NetworkPacket11unserializeERK10QByteArrayPS_
libkdeconnectcore.so.24:_ZN13NetworkPacket16staticMetaObjectE
libkdeconnectcore.so.24:_ZN13NetworkPacket17s_protocolVersionE
Expand Down Expand Up @@ -368,8 +337,6 @@ libkdeconnectcore.so.24:_ZN9UploadJob9setSocketEP10QSslSocket
libkdeconnectcore.so.24:_ZN9UploadJobC1ERK13NetworkPacket
libkdeconnectcore.so.24:_ZN9UploadJobC2ERK13NetworkPacket
libkdeconnectcore.so.24:_ZNK10OpenConfig10metaObjectEv
libkdeconnectcore.so.24:_ZNK11MdnsWrapper10Discoverer10metaObjectEv
libkdeconnectcore.so.24:_ZNK11MdnsWrapper9Announcer10metaObjectEv
libkdeconnectcore.so.24:_ZNK12LinkProvider10metaObjectEv
libkdeconnectcore.so.24:_ZNK12PluginLoader13getPluginInfoERK7QString
libkdeconnectcore.so.24:_ZNK12PluginLoader13getPluginListEv
Expand All @@ -380,7 +347,6 @@ libkdeconnectcore.so.24:_ZNK12PluginLoader22pluginsForCapabilitiesERK4QSetI7QStr
libkdeconnectcore.so.24:_ZNK12PluginLoader26instantiatePluginForDeviceERK7QStringP6Device
libkdeconnectcore.so.24:_ZNK13LanDeviceLink10metaObjectEv
libkdeconnectcore.so.24:_ZNK13LanDeviceLink11hostAddressEv
libkdeconnectcore.so.24:_ZNK13MdnsDiscovery10metaObjectEv
libkdeconnectcore.so.24:_ZNK13NetworkPacket24createPayloadTransferJobERK4QUrl
libkdeconnectcore.so.24:_ZNK13NetworkPacket9serializeEv
libkdeconnectcore.so.24:_ZNK14PairingHandler10metaObjectEv
Expand Down Expand Up @@ -434,7 +400,6 @@ libkdeconnectcore.so.24:_ZNK9UploadJob10metaObjectEv
libkdeconnectcore.so.24:_ZTI10OpenConfig
libkdeconnectcore.so.24:_ZTI12LinkProvider
libkdeconnectcore.so.24:_ZTI13LanDeviceLink
libkdeconnectcore.so.24:_ZTI13MdnsDiscovery
libkdeconnectcore.so.24:_ZTI14PairingHandler
libkdeconnectcore.so.24:_ZTI15FileTransferJob
libkdeconnectcore.so.24:_ZTI15LanLinkProvider
Expand All @@ -447,12 +412,9 @@ libkdeconnectcore.so.24:_ZTI6Daemon
libkdeconnectcore.so.24:_ZTI6Device
libkdeconnectcore.so.24:_ZTI6Server
libkdeconnectcore.so.24:_ZTI9UploadJob
libkdeconnectcore.so.24:_ZTIN11MdnsWrapper10DiscovererE
libkdeconnectcore.so.24:_ZTIN11MdnsWrapper9AnnouncerE
libkdeconnectcore.so.24:_ZTS10OpenConfig
libkdeconnectcore.so.24:_ZTS12LinkProvider
libkdeconnectcore.so.24:_ZTS13LanDeviceLink
libkdeconnectcore.so.24:_ZTS13MdnsDiscovery
libkdeconnectcore.so.24:_ZTS14PairingHandler
libkdeconnectcore.so.24:_ZTS15FileTransferJob
libkdeconnectcore.so.24:_ZTS15LanLinkProvider
Expand All @@ -465,12 +427,9 @@ libkdeconnectcore.so.24:_ZTS6Daemon
libkdeconnectcore.so.24:_ZTS6Device
libkdeconnectcore.so.24:_ZTS6Server
libkdeconnectcore.so.24:_ZTS9UploadJob
libkdeconnectcore.so.24:_ZTSN11MdnsWrapper10DiscovererE
libkdeconnectcore.so.24:_ZTSN11MdnsWrapper9AnnouncerE
libkdeconnectcore.so.24:_ZTV10OpenConfig
libkdeconnectcore.so.24:_ZTV12LinkProvider
libkdeconnectcore.so.24:_ZTV13LanDeviceLink
libkdeconnectcore.so.24:_ZTV13MdnsDiscovery
libkdeconnectcore.so.24:_ZTV14PairingHandler
libkdeconnectcore.so.24:_ZTV15FileTransferJob
libkdeconnectcore.so.24:_ZTV15LanLinkProvider
Expand All @@ -483,8 +442,6 @@ libkdeconnectcore.so.24:_ZTV6Daemon
libkdeconnectcore.so.24:_ZTV6Device
libkdeconnectcore.so.24:_ZTV6Server
libkdeconnectcore.so.24:_ZTV9UploadJob
libkdeconnectcore.so.24:_ZTVN11MdnsWrapper10DiscovererE
libkdeconnectcore.so.24:_ZTVN11MdnsWrapper9AnnouncerE
libkdeconnectcore.so.24:_Zls6QDebugRK13NetworkPacket
libkdeconnectdeclarativeplugin.so:_Z37qml_register_types_org_kde_kdeconnectv
libkdeconnectdeclarativeplugin.so:qt_plugin_instance
Expand Down
29 changes: 1 addition & 28 deletions packages/k/kdeconnect/abi_used_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ libQt6Core.so.6:_Z26qt_QMetaEnum_debugOperatorR6QDebugxPK11QMetaObjectPKc
libQt6Core.so.6:_Z27qEnvironmentVariableIsEmptyPKc
libQt6Core.so.6:_Z30qt_QMetaEnum_flagDebugOperatorR6QDebugyPK11QMetaObjectPKc
libQt6Core.so.6:_Z5qHash11QStringViewm
libQt6Core.so.6:_Z5qHash14QByteArrayViewm
libQt6Core.so.6:_Z7qgetenvPKc
libQt6Core.so.6:_Z7qputenvPKc14QByteArrayView
libQt6Core.so.6:_Z7qstrcmpPKcS0_
Expand All @@ -330,7 +329,6 @@ libQt6Core.so.6:_ZN10QByteArray6appendEc
libQt6Core.so.6:_ZN10QByteArray6insertEx14QByteArrayView
libQt6Core.so.6:_ZN10QByteArray6resizeEx
libQt6Core.so.6:_ZN10QByteArrayC1EPKcx
libQt6Core.so.6:_ZN10QByteArrayC1ExN2Qt14InitializationE
libQt6Core.so.6:_ZN10QByteArrayaSEPKc
libQt6Core.so.6:_ZN10QByteArrayaSERKS_
libQt6Core.so.6:_ZN10QEventLoop11qt_metacallEN11QMetaObject4CallEiPPv
Expand Down Expand Up @@ -419,9 +417,6 @@ libQt6Core.so.6:_ZN14QWaitCondition4waitEP6QMutex14QDeadlineTimer
libQt6Core.so.6:_ZN14QWaitCondition7wakeAllEv
libQt6Core.so.6:_ZN14QWaitConditionC1Ev
libQt6Core.so.6:_ZN14QWaitConditionD1Ev
libQt6Core.so.6:_ZN15QSocketNotifier16staticMetaObjectE
libQt6Core.so.6:_ZN15QSocketNotifier9activatedE17QSocketDescriptorNS_4TypeENS_14QPrivateSignalE
libQt6Core.so.6:_ZN15QSocketNotifierC1ExNS_4TypeEP7QObject
libQt6Core.so.6:_ZN15QtSharedPointer20ExternalRefCountData9getAndRefEPK7QObject
libQt6Core.so.6:_ZN16QCoreApplication12setAttributeEN2Qt20ApplicationAttributeEb
libQt6Core.so.6:_ZN16QCoreApplication18applicationDirPathEv
Expand Down Expand Up @@ -810,7 +805,6 @@ libQt6Core.so.6:_ZNK14QMessageLogger8criticalEPFRK16QLoggingCategoryvE
libQt6Core.so.6:_ZNK14QMessageLogger8criticalEv
libQt6Core.so.6:_ZNK14QTemporaryFile8fileNameEv
libQt6Core.so.6:_ZNK15QJsonParseError11errorStringEv
libQt6Core.so.6:_ZNK15QSocketNotifier6socketEv
libQt6Core.so.6:_ZNK18QAbstractItemModel10headerDataEiN2Qt11OrientationEi
libQt6Core.so.6:_ZNK18QAbstractItemModel12canFetchMoreERK11QModelIndex
libQt6Core.so.6:_ZNK18QAbstractItemModel15canDropMimeDataEPK9QMimeDataN2Qt10DropActionEiiRK11QModelIndex
Expand Down Expand Up @@ -1284,7 +1278,6 @@ libQt6Network.so.6:_ZN10QUdpSocket13writeDatagramEPKcxRK12QHostAddresst
libQt6Network.so.6:_ZN10QUdpSocketC1EP7QObject
libQt6Network.so.6:_ZN10QUdpSocketD1Ev
libQt6Network.so.6:_ZN12QHostAddressC1ENS_14SpecialAddressE
libQt6Network.so.6:_ZN12QHostAddressC1EPK8sockaddr
libQt6Network.so.6:_ZN12QHostAddressC1ERK7QString
libQt6Network.so.6:_ZN12QHostAddressC1ERKS_
libQt6Network.so.6:_ZN12QHostAddressC1Ej
Expand All @@ -1311,9 +1304,6 @@ libQt6Network.so.6:_ZN15QNetworkRequestD1Ev
libQt6Network.so.6:_ZN15QSslCertificateC1ERK10QByteArrayN4QSsl14EncodingFormatE
libQt6Network.so.6:_ZN15QSslCertificateC1ERKS_
libQt6Network.so.6:_ZN15QSslCertificateD1Ev
libQt6Network.so.6:_ZN17QNetworkInterface13allInterfacesEv
libQt6Network.so.6:_ZN17QNetworkInterfaceC1ERKS_
libQt6Network.so.6:_ZN17QNetworkInterfaceD1Ev
libQt6Network.so.6:_ZN17QSslConfiguration13setPrivateKeyERK7QSslKey
libQt6Network.so.6:_ZN17QSslConfiguration17setCaCertificatesERK5QListI15QSslCertificateE
libQt6Network.so.6:_ZN17QSslConfiguration17setPeerVerifyModeEN10QSslSocket14PeerVerifyModeE
Expand All @@ -1325,8 +1315,6 @@ libQt6Network.so.6:_ZN19QNetworkInformation19reachabilityChangedENS_12Reachabili
libQt6Network.so.6:_ZN19QNetworkInformation21loadBackendByFeaturesE6QFlagsINS_7FeatureEE
libQt6Network.so.6:_ZN19QNetworkInformation22transportMediumChangedENS_15TransportMediumE
libQt6Network.so.6:_ZN19QNetworkInformation8instanceEv
libQt6Network.so.6:_ZN20QNetworkAddressEntryC1ERKS_
libQt6Network.so.6:_ZN20QNetworkAddressEntryD1Ev
libQt6Network.so.6:_ZN21QNetworkAccessManager3putERK15QNetworkRequestP9QIODevice
libQt6Network.so.6:_ZN21QNetworkAccessManagerC1EP7QObject
libQt6Network.so.6:_ZN7QSslKeyC1ERK10QByteArrayN4QSsl12KeyAlgorithmENS3_14EncodingFormatENS3_7KeyTypeES2_
Expand All @@ -1343,7 +1331,6 @@ libQt6Network.so.6:_ZNK10QUdpSocket19hasPendingDatagramsEv
libQt6Network.so.6:_ZNK10QUdpSocket19pendingDatagramSizeEv
libQt6Network.so.6:_ZNK12QHostAddress10isLoopbackEv
libQt6Network.so.6:_ZNK12QHostAddress13toIPv4AddressEPb
libQt6Network.so.6:_ZNK12QHostAddress13toIPv6AddressEv
libQt6Network.so.6:_ZNK12QHostAddress6isNullEv
libQt6Network.so.6:_ZNK12QHostAddress8protocolEv
libQt6Network.so.6:_ZNK12QHostAddress8toStringEv
Expand All @@ -1358,10 +1345,7 @@ libQt6Network.so.6:_ZNK15QSslCertificate6digestEN18QCryptographicHash9AlgorithmE
libQt6Network.so.6:_ZNK15QSslCertificate6isNullEv
libQt6Network.so.6:_ZNK15QSslCertificate9publicKeyEv
libQt6Network.so.6:_ZNK15QSslCertificateeqERKS_
libQt6Network.so.6:_ZNK17QNetworkInterface14addressEntriesEv
libQt6Network.so.6:_ZNK17QNetworkInterface5flagsEv
libQt6Network.so.6:_ZNK19QNetworkInformation12reachabilityEv
libQt6Network.so.6:_ZNK20QNetworkAddressEntry2ipEv
libQt6Network.so.6:_ZNK7QSslKey5toDerERK10QByteArray
libQt6Network.so.6:_ZNK7QSslKey5toPemERK10QByteArray
libQt6Network.so.6:_ZNK7QSslKey6isNullEv
Expand Down Expand Up @@ -1763,34 +1747,23 @@ libX11.so.6:XKeysymToKeycode
libXtst.so.6:XTestFakeButtonEvent
libXtst.so.6:XTestFakeKeyEvent
libc.so.6:__cxa_atexit
libc.so.6:__errno_location
libc.so.6:__libc_start_main
libc.so.6:__stack_chk_fail
libc.so.6:bind
libc.so.6:close
libc.so.6:__vfprintf_chk
libc.so.6:exit
libc.so.6:fcntl
libc.so.6:free
libc.so.6:fwrite
libc.so.6:getgid
libc.so.6:getsockname
libc.so.6:getuid
libc.so.6:in6addr_any
libc.so.6:memchr
libc.so.6:memcmp
libc.so.6:memcpy
libc.so.6:memmove
libc.so.6:recvfrom
libc.so.6:sendto
libc.so.6:setsockopt
libc.so.6:socket
libc.so.6:stderr
libc.so.6:stdin
libc.so.6:stdout
libc.so.6:strcmp
libc.so.6:strerror
libc.so.6:strlen
libc.so.6:strncasecmp
libcrypto.so.3:BIO_ctrl
libcrypto.so.3:BIO_free_all
libcrypto.so.3:BIO_new
Expand Down
3 changes: 3 additions & 0 deletions packages/k/kdeconnect/files/kdeconnect.dnssd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Service]
Name=%H
Type=_kdeconnect._udp
12 changes: 9 additions & 3 deletions packages/k/kdeconnect/package.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name : kdeconnect

Check notice on line 1 in packages/k/kdeconnect/package.yml

View workflow job for this annotation

GitHub Actions / Checks

This package is included in the ISO. Consider validating the functionality in a newly built ISO.
version : 24.05.2
release : 77
release : 78
source :
- https://download.kde.org/stable/release-service/24.05.2/src/kdeconnect-kde-24.05.2.tar.xz : 03d827abed7b0552b536298920ce5815e321f9101b020bfcebf5bcaa4ccf054a
homepage : https://kdeconnect.kde.org/
Expand Down Expand Up @@ -45,14 +45,20 @@ optimize :
- speed
- thin-lto
setup : |
# https://bugs.kde.org/show_bug.cgi?id=481870
%cmake_kf6 -DBLUETOOTH_ENABLED=OFF
# Bluetooth: https://bugs.kde.org/show_bug.cgi?id=481870
# mDNS: https://bugs.kde.org/show_bug.cgi?id=487719
%cmake_kf6 \
-DBLUETOOTH_ENABLED=OFF \
-DMDNS_ENABLED=OFF
build : |
%ninja_build
install : |
%ninja_install
%qml6_cache
# Install mDNS service definition for autodiscovery
install -Dm0644 -t $installdir/usr/lib/systemd/dnssd $pkgfiles/*.dnssd
# remove doc
rm -rfv $installdir/usr/share/doc
Expand Down
13 changes: 7 additions & 6 deletions packages/k/kdeconnect/pspec_x86_64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<Name>kdeconnect</Name>
<Homepage>https://kdeconnect.kde.org/</Homepage>
<Packager>
<Name>Reilly Brogan</Name>
<Email>[email protected]</Email>
<Name>Silke Hofstra</Name>
<Email>[email protected]</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<PartOf>desktop.kde</PartOf>
Expand All @@ -27,6 +27,7 @@
<Path fileType="executable">/usr/bin/kdeconnect-settings</Path>
<Path fileType="executable">/usr/bin/kdeconnect-sms</Path>
<Path fileType="executable">/usr/bin/kdeconnectd</Path>
<Path fileType="library">/usr/lib/systemd/dnssd/kdeconnect.dnssd</Path>
<Path fileType="library">/usr/lib64/libkdeconnectcore.so.24</Path>
<Path fileType="library">/usr/lib64/libkdeconnectcore.so.24.05.2</Path>
<Path fileType="library">/usr/lib64/libkdeconnectpluginkcm.so.24</Path>
Expand Down Expand Up @@ -925,12 +926,12 @@
</Files>
</Package>
<History>
<Update release="77">
<Date>2024-07-04</Date>
<Update release="78">
<Date>2024-09-08</Date>
<Version>24.05.2</Version>
<Comment>Packaging update</Comment>
<Name>Reilly Brogan</Name>
<Email>[email protected]</Email>
<Name>Silke Hofstra</Name>
<Email>[email protected]</Email>
</Update>
</History>
</PISI>

0 comments on commit 3381f6f

Please sign in to comment.