From nobody Fri Mar 22 20:39:44 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1Z2823WBz5FJk0; Fri, 22 Mar 2024 20:39:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1Z281MZhz4Cfg; Fri, 22 Mar 2024 20:39:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711139984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tPCSkyXUlSUQiVKk6QMQWF0N2uy8DxKi9GVbPmDxvA4=; b=XC20ZVNlar+5A/ql8K6x/S2Ut9B15PDuM1MhsbKxYBSwZ+TcSefPoKWFTBhFsZsv/+qOGA nwAF4tTBwukQ3gFg1nGw7KllROAQROmqiupbffTN0LZxtcRT1bhnTuBHWKnVMdhxqxvtXe DojlGZYPXJ95URXNWPAEaBzImRKynJDK/aoBRHqvvi3EHaJ0HlWxYemv9pEEnDU1NL54hG jY2XTttITtkSw/xNXWwykZkHG15pe+PfWmdNh8Ns2I7tTd2IastoY7Hc6dWePjkkX+Qjuq sGGyPiv6dbZb2/nmV63CLOOeQbGayrdvhVbqJV5VHezsJ9DS8gcMKkzy7z7Xmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711139984; a=rsa-sha256; cv=none; b=eX7Ukf4d1doszKp+JA54N9ZgwuFf+Q1EPpl4ccaYtxM0wSfIcujZ1x6hZCYCCAz/jQ28Nt yMflm6vFNJRr9MW4e4Itg8CRu7l5Y/T1oYrxjB/IjJCFG2nP6+rJhrEMHbAMNKPw+PplfP tNNPxD7mf4T+ovlfUSvENCTAaxFbnwbfRLuUuBskeY82+rumFfWXn7EJrd7azO9O+ELlZX UEYNrb4+GP5wKPdM9veH5ixn4dyyYvjsKAoFNnhfbzZ+17zx64OIUqeca8tR2f+lP4tWR3 hTkqxBzBl4Qf7P18i6eBd/BCnv4yQjNScSsVNBfM8j5N9z4cLkc4MwPC3Uz2jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711139984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tPCSkyXUlSUQiVKk6QMQWF0N2uy8DxKi9GVbPmDxvA4=; b=La9XqzOk1vD7mhJb6PDwmYAlHkOVwCtIeMgoDEzYeW16zvdVCCQes0dzZDvchX2N2doxqu 50EA5XI34i51Q8yzPfd6jHd0QuBA/gVPCRsSq1sYVzY+aOVikTmuljB7OSv13CFd7PrAWL mSLCo+VOqZdAv6+sQdTuG1AQDxegQY0aHBiNaSHHZIFHi1a2Dqbd6NUbZ6o7NkIz8mONMi wVmiw6ZEK+qUSHQudW3Q3IynaZcvnMlRbp3SQdyFaitk3fltb50f7U8bvTbDWPXX3I6xxe R83di1ZAyYgKnn3KIweqWOmGpO5dFzVQYFn6+unUgvf7h2v5xHkkzTuQoLd22Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1Z280z24zJvT; Fri, 22 Mar 2024 20:39:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MKdi9n018628; Fri, 22 Mar 2024 20:39:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MKdikj018625; Fri, 22 Mar 2024 20:39:44 GMT (envelope-from git) Date: Fri, 22 Mar 2024 20:39:44 GMT Message-Id: <202403222039.42MKdikj018625@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 6832fb6ba42f - main - deskutils/kdeconnect-kde: fix broken patch for the sftp_mounter List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6832fb6ba42f365f83bf04e2d832d1a6ba16749a Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6832fb6ba42f365f83bf04e2d832d1a6ba16749a commit 6832fb6ba42f365f83bf04e2d832d1a6ba16749a Author: Lars Herschke AuthorDate: 2024-03-22 20:30:22 +0000 Commit: Gleb Popov CommitDate: 2024-03-22 20:30:22 +0000 deskutils/kdeconnect-kde: fix broken patch for the sftp_mounter PR: 277765 --- deskutils/kdeconnect-kde/Makefile | 2 +- deskutils/kdeconnect-kde/files/patch-plugins_sftp_mounter.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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,6 +1,6 @@ PORTNAME= kdeconnect-kde DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org 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,15 +1,15 @@ ---- 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();