Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: nextcloud-desk...@packages.debian.org, he...@debian.org
Control: affects -1 + src:nextcloud-desktop
[ Reason ]
This pu will fix two issues maarked as important:
#1051071: some files with special characters are not synced.
#1053922: Two-factor authentication notifications unusable.
[ Impact ]
#1051071: Some files are not synced because of ":" in its name without
any feedback.
#1053922: Keeps Two-factor authentification not usable.
[ Tests ]
3.10.0 with the fixes included seems to run fine.
[ Risks ]
The fixes are very small and clear what they do and what they fix, so
the risk of side effects is very small.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
Added to backported patches for upstream and updated the debian-branch
in gbp.conf.
diff -Nru nextcloud-desktop-3.7.3/debian/changelog
nextcloud-desktop-3.7.3/debian/changelog
--- nextcloud-desktop-3.7.3/debian/changelog 2023-02-15 15:00:39.000000000
+0100
+++ nextcloud-desktop-3.7.3/debian/changelog 2023-12-12 13:06:40.000000000
+0100
@@ -1,3 +1,13 @@
+nextcloud-desktop (3.7.3-1+deb12u1) bookworm; urgency=medium
+
+ * Backport patch to fix "fails to sync files with special chars like ':'"
+ (Closes: #1051071)
+ * Backport patch 'Two-factor authentication notifications unusable'
+ (Closes: #1056327)
+ * Update debian-branch in gbp.conf to point to the stable branch.
+
+ -- Sandro Knauß <he...@debian.org> Tue, 12 Dec 2023 13:06:40 +0100
+
nextcloud-desktop (3.7.3-1) unstable; urgency=medium
* New upstream release.
diff -Nru nextcloud-desktop-3.7.3/debian/gbp.conf
nextcloud-desktop-3.7.3/debian/gbp.conf
--- nextcloud-desktop-3.7.3/debian/gbp.conf 2023-02-15 15:00:39.000000000
+0100
+++ nextcloud-desktop-3.7.3/debian/gbp.conf 2023-12-12 13:06:35.000000000
+0100
@@ -1,5 +1,5 @@
[DEFAULT]
-debian-branch = master
+debian-branch = debian/bookworm
upstream-branch = upstream
pristine-tar = True
compression = gz
diff -Nru nextcloud-desktop-3.7.3/debian/.gitignore
nextcloud-desktop-3.7.3/debian/.gitignore
--- nextcloud-desktop-3.7.3/debian/.gitignore 2023-02-15 15:00:39.000000000
+0100
+++ nextcloud-desktop-3.7.3/debian/.gitignore 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-files
diff -Nru
nextcloud-desktop-3.7.3/debian/patches/0005-fixed-detection-of-server-version-in-cmd-client-simi.patch
nextcloud-desktop-3.7.3/debian/patches/0005-fixed-detection-of-server-version-in-cmd-client-simi.patch
---
nextcloud-desktop-3.7.3/debian/patches/0005-fixed-detection-of-server-version-in-cmd-client-simi.patch
1970-01-01 01:00:00.000000000 +0100
+++
nextcloud-desktop-3.7.3/debian/patches/0005-fixed-detection-of-server-version-in-cmd-client-simi.patch
2023-12-12 13:06:35.000000000 +0100
@@ -0,0 +1,60 @@
+From: Patrick Cernko <err...@errror.org>
+Date: Tue, 5 Sep 2023 06:11:54 +0200
+Subject: fixed detection of server version in cmd client similar to gui
+ client:
+
+first check status.php for version and then capabilities, only use version
string if not empty
+
+this also fixes 'File names containing the character ":" are not supported on
this file system.' errors in nextcloudcmd (on Linux): The invalidFilenameRegex
was set to a static default in case the server version was not set correctly.
As newer versions of nextcloud do not return the version in capabilities but
status.php, the server version was empty.
+
+Signed-off-by: Patrick Cernko <err...@errror.org>
+---
+ src/cmd/cmd.cpp | 30 +++++++++++++++++++++++++++++-
+ 1 file changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
+index 37c456d..2764f72 100644
+--- a/src/cmd/cmd.cpp
++++ b/src/cmd/cmd.cpp
+@@ -442,12 +442,40 @@ int main(int argc, char **argv)
+ account->setTrustCertificates(options.trustSSL);
+
+ QEventLoop loop;
++ auto *csjob = new CheckServerJob(account);
++ csjob->setIgnoreCredentialFailure(true);
++ QObject::connect(csjob, &CheckServerJob::instanceFound, [&](const QUrl &,
const QJsonObject &info) {
++ // see ConnectionValidator::slotCapabilitiesRecieved: only set server
version if not empty
++ QString serverVersion = CheckServerJob::version(info);
++ if (!serverVersion.isEmpty()) {
++ account->setServerVersion(serverVersion);
++ }
++ loop.quit();
++ });
++ QObject::connect(csjob, &CheckServerJob::instanceNotFound, [&]() {
++ loop.quit();
++ });
++ QObject::connect(csjob, &CheckServerJob::timeout, [&](const QUrl &) {
++ loop.quit();
++ });
++ csjob->start();
++ loop.exec();
++
++ if (csjob->reply()->error() != QNetworkReply::NoError){
++ std::cout<<"Error connecting to server for status\n";
++ return EXIT_FAILURE;
++ }
++
+ auto *job = new JsonApiJob(account,
QLatin1String("ocs/v1.php/cloud/capabilities"));
+ QObject::connect(job, &JsonApiJob::jsonReceived, [&](const QJsonDocument
&json) {
+ auto caps =
json.object().value("ocs").toObject().value("data").toObject().value("capabilities").toObject();
+ qDebug() << "Server capabilities" << caps;
+ account->setCapabilities(caps.toVariantMap());
+-
account->setServerVersion(caps["core"].toObject()["status"].toObject()["version"].toString());
++ // see ConnectionValidator::slotCapabilitiesRecieved: only set server
version if not empty
++ QString serverVersion =
caps["core"].toObject()["status"].toObject()["version"].toString();
++ if (!serverVersion.isEmpty()) {
++ account->setServerVersion(serverVersion);
++ }
+ loop.quit();
+ });
+ job->start();
diff -Nru
nextcloud-desktop-3.7.3/debian/patches/0006-Fix-display-of-2FA-notification.patch
nextcloud-desktop-3.7.3/debian/patches/0006-Fix-display-of-2FA-notification.patch
---
nextcloud-desktop-3.7.3/debian/patches/0006-Fix-display-of-2FA-notification.patch
1970-01-01 01:00:00.000000000 +0100
+++
nextcloud-desktop-3.7.3/debian/patches/0006-Fix-display-of-2FA-notification.patch
2023-12-12 13:06:35.000000000 +0100
@@ -0,0 +1,29 @@
+From: Camila <hello@camila.codes>
+Date: Tue, 28 Feb 2023 18:24:00 +0100
+Subject: Fix display of 2FA notification.
+
+Fix for issue #5421: add server notifications to the activities list
+when the user needs to act on it.
+
+Signed-off-by: Camila <hello@camila.codes>
+---
+ src/gui/tray/usermodel.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
+index a057248..5c6f24e 100644
+--- a/src/gui/tray/usermodel.cpp
++++ b/src/gui/tray/usermodel.cpp
+@@ -120,6 +120,12 @@ void User::showDesktopNotification(const Activity
&activity)
+ {
+ const auto notificationId = activity._id;
+ const auto message = AccountManager::instance()->accounts().count() == 1
? "" : activity._accName;
++
++ // the user needs to interact with this notification
++ if (activity._links.size() > 0) {
++ _activityModel->addNotificationToActivityList(activity);
++ }
++
+ showDesktopNotification(activity._subject, message, notificationId);
+ }
+
diff -Nru nextcloud-desktop-3.7.3/debian/patches/series
nextcloud-desktop-3.7.3/debian/patches/series
--- nextcloud-desktop-3.7.3/debian/patches/series 2023-02-15
15:00:39.000000000 +0100
+++ nextcloud-desktop-3.7.3/debian/patches/series 2023-12-12
13:06:35.000000000 +0100
@@ -2,3 +2,5 @@
0002-use_system_buildflags.patch
0003-Use-release-version-for-Debian.patch
0004-Don-t-use-GuiPrivate.patch
+0005-fixed-detection-of-server-version-in-cmd-client-simi.patch
+0006-Fix-display-of-2FA-notification.patch
