Date: Thursday, November 4, 2021 @ 13:41:49 Author: arojas Revision: 427260
archrelease: copy trunk to extra-x86_64 Added: kdeconnect/repos/extra-x86_64/PKGBUILD (from rev 427259, kdeconnect/trunk/PKGBUILD) kdeconnect/repos/extra-x86_64/kdeconnect-openssh-8.8.patch (from rev 427259, kdeconnect/trunk/kdeconnect-openssh-8.8.patch) Deleted: kdeconnect/repos/extra-x86_64/PKGBUILD kdeconnect/repos/extra-x86_64/kdeconnect-openssh-8.8.patch ------------------------------+ PKGBUILD | 76 ++++++++++++++++++++--------------------- kdeconnect-openssh-8.8.patch | 28 +++++++-------- 2 files changed, 52 insertions(+), 52 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-11-04 13:41:38 UTC (rev 427259) +++ PKGBUILD 2021-11-04 13:41:49 UTC (rev 427260) @@ -1,38 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> - -pkgname=kdeconnect -pkgver=21.08.2 -pkgrel=1 -pkgdesc='Adds communication between KDE and your smartphone' -url='https://kdeconnect.kde.org/' -arch=(x86_64) -license=(GPL) -groups=(kde-applications kde-network) -depends=(kcmutils kwayland libfakekey qca-qt5 kpeoplevcard pulseaudio-qt qqc2-desktop-style hicolor-icon-theme) -makedepends=(extra-cmake-modules kdoctools) -optdepends=('sshfs: remote filesystem browser' 'python-nautilus: Nautilus integration' 'qt5-tools: for some runcommand plugin actions') -source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-kde-$pkgver.tar.xz{,.sig} - kdeconnect-openssh-8.8.patch) -sha256sums=('dbfd0eeef729be25b72f238a750d991db5e1fdeab386a0dea55172f00a1dbb25' - 'SKIP' - 'e5cb803e7b21f31fd40639fa74e6f6aaaa7e136053a79f3b88f2bbb36bb58a4f') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cf...@kde.org> - D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.bec...@kde.org> - -prepare() { - patch -d $pkgname-kde-$pkgver -p1 < kdeconnect-openssh-8.8.patch # Fix file browsing with openssh 8.8 -} - -build() { - cmake -B build -S $pkgname-kde-$pkgver \ - -DBUILD_TESTING=OFF \ - -DCMAKE_INSTALL_LIBEXECDIR=lib - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build -} Copied: kdeconnect/repos/extra-x86_64/PKGBUILD (from rev 427259, kdeconnect/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-11-04 13:41:49 UTC (rev 427260) @@ -0,0 +1,38 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> + +pkgname=kdeconnect +pkgver=21.08.3 +pkgrel=1 +pkgdesc='Adds communication between KDE and your smartphone' +url='https://kdeconnect.kde.org/' +arch=(x86_64) +license=(GPL) +groups=(kde-applications kde-network) +depends=(kcmutils kwayland libfakekey qca-qt5 kpeoplevcard pulseaudio-qt qqc2-desktop-style hicolor-icon-theme) +makedepends=(extra-cmake-modules kdoctools) +optdepends=('sshfs: remote filesystem browser' 'python-nautilus: Nautilus integration' 'qt5-tools: for some runcommand plugin actions') +source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-kde-$pkgver.tar.xz{,.sig} + kdeconnect-openssh-8.8.patch) +sha256sums=('324663336db1000163eae91a63be84b6a614131ed62bd6dd6563639ecd5bdabd' + 'SKIP' + 'e5cb803e7b21f31fd40639fa74e6f6aaaa7e136053a79f3b88f2bbb36bb58a4f') +validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aa...@kde.org> + F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cf...@kde.org> + D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.bec...@kde.org> + +prepare() { + patch -d $pkgname-kde-$pkgver -p1 < kdeconnect-openssh-8.8.patch # Fix file browsing with openssh 8.8 +} + +build() { + cmake -B build -S $pkgname-kde-$pkgver \ + -DBUILD_TESTING=OFF \ + -DCMAKE_INSTALL_LIBEXECDIR=lib + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} Deleted: kdeconnect-openssh-8.8.patch =================================================================== --- kdeconnect-openssh-8.8.patch 2021-11-04 13:41:38 UTC (rev 427259) +++ kdeconnect-openssh-8.8.patch 2021-11-04 13:41:49 UTC (rev 427260) @@ -1,14 +0,0 @@ -diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp -index 2a484186..23ddc616 100644 ---- a/plugins/sftp/mounter.cpp -+++ b/plugins/sftp/mounter.cpp -@@ -129,7 +129,8 @@ void Mounter::onPackageReceived(const NetworkPacket& np) - << QStringLiteral("-o") << QStringLiteral("IdentityFile=") + KdeConnectConfig::instance().privateKeyPath() - << QStringLiteral("-o") << QStringLiteral("StrictHostKeyChecking=no") //Do not ask for confirmation because it is not a known host - << QStringLiteral("-o") << QStringLiteral("UserKnownHostsFile=/dev/null") //Prevent storing as a known host -- << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-dss") //https://bugs.kde.org/show_bug.cgi?id=351725 -+ << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-rsa") //https://bugs.kde.org/show_bug.cgi?id=351725 -+ << QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa") - << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid()) - << QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid()) - << QStringLiteral("-o") << QStringLiteral("reconnect") Copied: kdeconnect/repos/extra-x86_64/kdeconnect-openssh-8.8.patch (from rev 427259, kdeconnect/trunk/kdeconnect-openssh-8.8.patch) =================================================================== --- kdeconnect-openssh-8.8.patch (rev 0) +++ kdeconnect-openssh-8.8.patch 2021-11-04 13:41:49 UTC (rev 427260) @@ -0,0 +1,14 @@ +diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp +index 2a484186..23ddc616 100644 +--- a/plugins/sftp/mounter.cpp ++++ b/plugins/sftp/mounter.cpp +@@ -129,7 +129,8 @@ void Mounter::onPackageReceived(const NetworkPacket& np) + << QStringLiteral("-o") << QStringLiteral("IdentityFile=") + KdeConnectConfig::instance().privateKeyPath() + << QStringLiteral("-o") << QStringLiteral("StrictHostKeyChecking=no") //Do not ask for confirmation because it is not a known host + << QStringLiteral("-o") << QStringLiteral("UserKnownHostsFile=/dev/null") //Prevent storing as a known host +- << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-dss") //https://bugs.kde.org/show_bug.cgi?id=351725 ++ << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-rsa") //https://bugs.kde.org/show_bug.cgi?id=351725 ++ << QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa") + << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid()) + << QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid()) + << QStringLiteral("-o") << QStringLiteral("reconnect")