diff --git a/deskutils/kdeconnect-kde/Makefile b/deskutils/kdeconnect-kde/Makefile index b1a517866a50..8f25b2303832 100644 --- a/deskutils/kdeconnect-kde/Makefile +++ b/deskutils/kdeconnect-kde/Makefile @@ -1,42 +1,42 @@ PORTNAME= kdeconnect-kde DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Support for KDE to interface between your phone and your computer WWW= https://community.kde.org/KDEConnect LICENSE= GPLv2 LIB_DEPENDS= libfakekey.so:x11/libfakekey \ libwayland-client.so:graphics/wayland \ libKF5PulseAudioQt.so:audio/pulseaudio-qt@qt5 BUILD_DEPENDS= kpeoplevcard>0:net/kpeoplevcard \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ wayland-protocols>=0:graphics/wayland-protocols \ kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons RUN_DEPENDS= sshpass:security/sshpass \ sshfs:sysutils/fusefs-sshfs \ kpeoplevcard>0:net/kpeoplevcard \ kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \ pkgconfig qca qt:5 tar:xz xorg USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons dbusaddons doctools guiaddons i18n iconthemes \ itemviews jobwidgets kcmutils kio kirigami2 notifications \ people qqc2-desktop-style service solid wayland widgetsaddons \ windowsystem xmlgui \ ecm:build USE_QT= concurrent core dbus declarative gui multimedia network \ quickcontrols2 testlib wayland widgets x11extras xml \ buildtools:build qmake:build USE_XORG= ice sm x11 xext xtst USE_LDCONFIG= ${QT_QMLDIR}/org/kde/kdeconnect OPTIONS_DEFINE= DOCS KDE_APPLICATIONS_SHLIB_VER=${KDE_APPLICATIONS_VERSION} .include diff --git a/deskutils/kdeconnect-kde/files/patch-plugins_sftp_mounter.cpp b/deskutils/kdeconnect-kde/files/patch-plugins_sftp_mounter.cpp index 99fa7009b2dc..60f8103d702b 100644 --- a/deskutils/kdeconnect-kde/files/patch-plugins_sftp_mounter.cpp +++ b/deskutils/kdeconnect-kde/files/patch-plugins_sftp_mounter.cpp @@ -1,22 +1,22 @@ ---- plugins/sftp/mounter.cpp.orig 2022-11-30 00:45:32 UTC +--- plugins/sftp/mounter.cpp.orig 2024-02-10 04:18:49 UTC +++ plugins/sftp/mounter.cpp -@@ -129,7 +129,7 @@ void Mounter::onPackageReceived(const NetworkPacket &n - << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-dss\\,ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=351725 +@@ -130,7 +130,7 @@ void Mounter::onPackageReceived(const NetworkPacket &n + << QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=443155 << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid()) << QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid()) << QStringLiteral("-o") << QStringLiteral("reconnect") << QStringLiteral("-o") - << QStringLiteral("ServerAliveInterval=30") << QStringLiteral("-o") << QStringLiteral("password_stdin"); -+ << QStringLiteral("-o") << QStringLiteral("ssh_command=sshpass -p %1 %2").arg(np.get(QStringLiteral("password")), QStringLiteral("ssh")); ++ << QStringLiteral("ServerAliveInterval=30") << QStringLiteral("-o") << QStringLiteral("ssh_command=sshpass -p %1 %2").arg(np.get(QStringLiteral("password")), QStringLiteral("ssh")); m_proc->setProgram(program, arguments); -@@ -137,8 +137,8 @@ void Mounter::onPackageReceived(const NetworkPacket &n +@@ -138,8 +138,8 @@ void Mounter::onPackageReceived(const NetworkPacket &n m_proc->start(); // qCDebug(KDECONNECT_PLUGIN_SFTP) << "Passing password: " << np.get("password").toLatin1(); - m_proc->write(np.get(QStringLiteral("password")).toLatin1()); - m_proc->write("\n"); + //m_proc->write(np.get(QStringLiteral("password")).toLatin1()); + //m_proc->write("\n"); } void Mounter::onStarted()