diff --git a/0001-smb-kio_smb_browse-Check-error-code-EINVAL-to-prompt.patch b/0001-smb-kio_smb_browse-Check-error-code-EINVAL-to-prompt.patch deleted file mode 100644 index 94017af..0000000 --- a/0001-smb-kio_smb_browse-Check-error-code-EINVAL-to-prompt.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 546c2b06e27f0e8460f5ddf1347d28aa0ec22979 Mon Sep 17 00:00:00 2001 -From: Anthony Hung -Date: Wed, 22 Jun 2022 17:37:51 +0800 -Subject: [PATCH] smb/kio_smb_browse: Check error code `EINVAL` to prompt the - password dialog - -With `samba-libs` >= 4.16, when user connect to the windows file sharing with incorrect user credential, the error code is `EINVAL`. - -The user should get the password dialog to enter username and password if the error code is `EINVAL`. - -Reference URL: -https://bugzilla.samba.org/show_bug.cgi?id=14983 -https://gitlab.gnome.org/GNOME/gvfs/-/issues/611 - -BUG: 453090 ---- - smb/kio_smb_browse.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/smb/kio_smb_browse.cpp b/smb/kio_smb_browse.cpp -index 3bc25d83..a773befa 100644 ---- a/smb/kio_smb_browse.cpp -+++ b/smb/kio_smb_browse.cpp -@@ -452,7 +452,7 @@ WorkerResult SMBWorker::listDir(const QUrl &kurl) - if (m_current_url.getType() != SMBURLTYPE_ENTIRE_NETWORK && smbc->error() != 0) { - // not smb:// and had an error -> handle it - const int err = smbc->error(); -- if (err == EPERM || err == EACCES || workaroundEEXIST(err)) { -+ if (err == EPERM || err == EACCES || err == EINVAL || workaroundEEXIST(err)) { - qCDebug(KIO_SMB_LOG) << "trying checkPassword"; - const int passwordError = checkPassword(m_current_url); - if (passwordError == KJob::NoError) { --- -2.36.1 - diff --git a/kio-extras-22.08.1.tar.xz b/kio-extras-22.08.1.tar.xz deleted file mode 100644 index 70335af..0000000 --- a/kio-extras-22.08.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89e140e1e6668754b8cb688b5375108d1dfafe0fad65600dd13694fe6ca53038 -size 643828 diff --git a/kio-extras-22.08.1.tar.xz.sig b/kio-extras-22.08.1.tar.xz.sig deleted file mode 100644 index 2ecd805..0000000 --- a/kio-extras-22.08.1.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmMWkF0ACgkQu0YzUNbv -Me+0MA//dJN6bCPwPVC4q5dqBTx1DQLjRZ3jV6K+oTfiDNtLeo7yXlQt0WoQ4iqI -tpJiWrRH6zm828yEsm91iSKzDXut24+Q2tQcQwP9AzBsLOsJ1v9w6O7Thg1Gb1Y4 -SS1bU+PXLqb1rHDwrZ01G5VsAuh2npG+9bZ1E1njiLm5GBlgynbsNOQXt0CAb5v6 -vRNTxiyvSDzi1p7yZD/LvjmSy7ueRHgupbaj9QqhJLI3CTuCmAYCnatUI8XAjqBh -e6mzPb1hpM5j1w42LIGO1Dv4pnVlx68/2Vx+AqfYRW5XqFJNNBuzuA/loWVDHcHK -uEuRyh7H7c2a5FyQCqqCu8YTtB8GhQoN9Cnl6QWSekkKVxay4xcLt+s8g10PHrRT -99ibCrLXkgd8ai74tjk55hfb/NAi6A2HPgrTDSZx3pTYPYRY+nDRCPQfAK9+fXLp -19OxP/Ef5vw33vjJ/UsBrWJjIaMgDohJ5w2XjQJ6ckoTFfToyWbYloWrkcAdGoKa -Ark3w+Kocgc6HcacV+HGxJsZHI3wb81U/YiFktL3xPR9hrS0pCTNaZKn33DqjsOI -oyRaeEL0E4S7nSi9bfORhEAm7LtqYDNLeZdmE4xqzivFZnUZcEDaF9knxghbHmiA -UDVYjniQptN+9zcL2/g899U1sDSU/Qh/59C9pbJSVNV6Bg03dss= -=6/EH ------END PGP SIGNATURE----- diff --git a/kio-extras-22.08.2.tar.xz b/kio-extras-22.08.2.tar.xz new file mode 100644 index 0000000..3252e6e --- /dev/null +++ b/kio-extras-22.08.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dd665138834b1401ddee84432107bb9bc9fbe16b599840cf841aebebfd7a466 +size 643824 diff --git a/kio-extras-22.08.2.tar.xz.sig b/kio-extras-22.08.2.tar.xz.sig new file mode 100644 index 0000000..b915276 --- /dev/null +++ b/kio-extras-22.08.2.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmNE+BgACgkQu0YzUNbv +Me8W1A//XrDYoZJon0NW+qIH3YVfmjPQIaJJb4S9Bvp+g4M2Q1HAccGj03vvGkeo +yvGknIMwrkJvDeA9u0XEOc81sdhtjiRxBQZz1Kakm+DWrNCHRf7k5PQheOCjYG2p +cMVdPKOfaBz4SSy0siEK+i5bp1qPHHHVM6ecLiy0s2VjavU+9aMMtQu2pLAXvr9s +9eao7aVvFkjKawYRjThmnx0rW6wBnKodNVInf1oLSNP7SBe/Z/nQ4jVKnrhSVsvz +z3QCzrnlNhhlZy+VTTeGDwtaJdrr22bD9Ws2Z1r5JUwDS7MVFmv3n3nEormxFLXK +uAV5dAuae8Rs3uJmXFAYsl7nD14S6425x9VXQYWrZwvS1apwUCqpL4Iu/hmPb7ke +uw0Vk8k7HJLsI6L6P+J0y4hJJwtk6Liw2CyAq4ko18qefzR1B9VU+xvfcOtPnh8O +FeM+6DvkTCXyIm1hl22xHssf9pzVFRrBwVKu8YD8B+msarOgzuO6xdc2KbLAp8qp +w801Aqh0gU/rsbQE/vLpaHwyQ6eLyGj17eawahq/4LHDup0iz0Dme4+PkD8D+EAM +RgdzZ5u5kG/0mQpZttC+M91AzqIRDbc5U6+gZoy17PjxMI1WV2rskr2JRmyXFPDX +bOWEsQe32JoJ+j1WKZVEP/2hbN9jM3JufE4IvINlgBW8xSHqVfA= +=ZQQc +-----END PGP SIGNATURE----- diff --git a/kio-extras5.changes b/kio-extras5.changes index 5143614..9233c83 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 11 14:32:41 UTC 2022 - Christophe Giboudeaux + +- Update to 22.08.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/22.08.2/ +- Drop 0001-smb-kio_smb_browse-Check-error-code-EINVAL-to-prompt.patch + Fixed upstream + ------------------------------------------------------------------- Tue Sep 6 15:19:54 UTC 2022 - Christophe Giboudeaux diff --git a/kio-extras5.spec b/kio-extras5.spec index e3284d0..2e12c0e 100644 --- a/kio-extras5.spec +++ b/kio-extras5.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: kio-extras5 -Version: 22.08.1 +Version: 22.08.2 Release: 0 Summary: Additional KIO slaves for KDE applications License: GPL-2.0-or-later @@ -32,8 +32,6 @@ Source: https://download.kde.org/stable/release-service/%{version}/src/% Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig Source2: applications.keyring %endif -# PATCH-FIX-UPSTREAM https://invent.kde.org/network/kio-extras/-/merge_requests/165 -Patch0: 0001-smb-kio_smb_browse-Check-error-code-EINVAL-to-prompt.patch # openEXR causes build issues for Leap 15.2 & 15.3 %if 0%{?suse_version} > 1500 BuildRequires: OpenEXR-devel