Index: head/deskutils/nextcloudclient/Makefile =================================================================== --- head/deskutils/nextcloudclient/Makefile (revision 520846) +++ head/deskutils/nextcloudclient/Makefile (revision 520847) @@ -1,60 +1,60 @@ # Created by: Mathieu Arnold # $FreeBSD$ PORTNAME= nextcloudclient -PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTVERSION= 2.6.2 +#PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= deskutils MAINTAINER= mr@FreeBSD.org COMMENT= NextCloud Desktop Syncing Client LICENSE= GPLv2 LIB_DEPENDS= libinotify.so:devel/libinotify \ libqt5keychain.so:security/qtkeychain USES= cmake:noninja compiler:c++11-lib gmake gnome iconv \ localbase:ldflags pkgconfig qt:5 sqlite ssl USE_QT= buildtools_build concurrent core dbus declarative gui linguist_build location network \ printsupport qmake_build sql webchannel webengine webkit widgets xml CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \ -DCMAKE_INSTALL_MANDIR:STRING=man \ -DWITH_STACK_PROTECTOR:BOOL=OFF USE_LDCONFIG= yes INSTALLS_ICONS= yes DEBUG= yes USE_GITHUB= yes GH_ACCOUNT= nextcloud GH_PROJECT= desktop #OPTIONS_DEFINE= DEBUG DOCS OPTIONS_DEFINE= DEBUG # DOCS doesn't build currently #DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ # doxygen:devel/doxygen #DOCS_USE= tex=dvipsk:build,latex:build #DOCS_CMAKE_ON= -DWITH_DOC:BOOL=ON PLIST_SUB= VERSION=${PORTVERSION} .include .ifdef WITH_DEBUG CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Debug .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && !${SSL_DEFAULT:Mopenssl111} BROKEN= nextcloudclient requires OpenSSL 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl111 to /etc/make.conf .endif post-patch: @${REINPLACE_CMD} -e \ 's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt pre-configure: @(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample) .include Index: head/deskutils/nextcloudclient/distinfo =================================================================== --- head/deskutils/nextcloudclient/distinfo (revision 520846) +++ head/deskutils/nextcloudclient/distinfo (revision 520847) @@ -1,3 +1,3 @@ -TIMESTAMP = 1573223167 -SHA256 (nextcloud-desktop-v2.6.1_GH0.tar.gz) = 82f591ddc8ad6c39f48e9ac16e7320c9b5342ede37838bd89e1977655f2482ea -SIZE (nextcloud-desktop-v2.6.1_GH0.tar.gz) = 18947504 +TIMESTAMP = 1577270816 +SHA256 (nextcloud-desktop-v2.6.2_GH0.tar.gz) = bbcb6593134836226640b108da7ad3db061417681e2d843bc371b1d697fb0551 +SIZE (nextcloud-desktop-v2.6.2_GH0.tar.gz) = 18982053 Index: head/deskutils/nextcloudclient/files/patch-fix_remote_wipe_keychain_storage =================================================================== --- head/deskutils/nextcloudclient/files/patch-fix_remote_wipe_keychain_storage (revision 520846) +++ head/deskutils/nextcloudclient/files/patch-fix_remote_wipe_keychain_storage (nonexistent) @@ -1,85 +0,0 @@ -From dcc84d35085d790a53b472d1edba663832af238a Mon Sep 17 00:00:00 2001 -From: Michael Schuster -Date: Fri, 29 Nov 2019 04:28:50 +0100 -Subject: [PATCH] Fix remote wipe keychain storage (issue #1592) - -The app password for the remote wipe was constantly being written in -WebFlowCredentials::slotFinished to the keychain, leading to unnecessary -write and log overhead on the system. - -This fix introduces a check to only store the app password once in -a lifetime of the Account class. Also the method used to store the -password will be renamed from setAppPassword to writeAppPasswordOnce -to be more expressive. - -Signed-off-by: Michael Schuster ---- - src/gui/creds/webflowcredentials.cpp | 2 +- - src/libsync/account.cpp | 9 +++++++-- - src/libsync/account.h | 5 ++++- - 3 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/src/gui/creds/webflowcredentials.cpp b/src/gui/creds/webflowcredentials.cpp -index 49c80e1ff..e2dc10b35 100644 ---- src/gui/creds/webflowcredentials.cpp -+++ src/gui/creds/webflowcredentials.cpp -@@ -420,7 +420,7 @@ void WebFlowCredentials::slotFinished(QNetworkReply *reply) { - _credentialsValid = true; - - /// Used later for remote wipe -- _account->setAppPassword(_password); -+ _account->writeAppPasswordOnce(_password); - } - } - -diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp -index 32e58b2e4..33032e3f8 100644 ---- src/libsync/account.cpp -+++ src/libsync/account.cpp -@@ -513,7 +513,10 @@ void Account::setNonShib(bool nonShib) - } - } - --void Account::setAppPassword(QString appPassword){ -+void Account::writeAppPasswordOnce(QString appPassword){ -+ if(_wroteAppPassword) -+ return; -+ - const QString kck = AbstractCredentials::keychainKey( - url().toString(), - davUser() + app_password, -@@ -524,8 +527,10 @@ void Account::setAppPassword(QString appPassword){ - job->setInsecureFallback(false); - job->setKey(kck); - job->setBinaryData(appPassword.toLatin1()); -- connect(job, &WritePasswordJob::finished, [](Job *) { -+ connect(job, &WritePasswordJob::finished, [this](Job *) { - qCInfo(lcAccount) << "appPassword stored in keychain"; -+ -+ _wroteAppPassword = true; - }); - job->start(); - } -diff --git a/src/libsync/account.h b/src/libsync/account.h -index 1f3e46a96..2b843dca9 100644 ---- src/libsync/account.h -+++ src/libsync/account.h -@@ -243,7 +243,7 @@ class OWNCLOUDSYNC_EXPORT Account : public QObject - - /// Used in RemoteWipe - void retrieveAppPassword(); -- void setAppPassword(QString appPassword); -+ void writeAppPasswordOnce(QString appPassword); - void deleteAppPassword(); - - public slots: -@@ -319,6 +319,9 @@ protected Q_SLOTS: - QString _davPath; // defaults to value from theme, might be overwritten in brandings - ClientSideEncryption _e2e; - -+ /// Used in RemoteWipe -+ bool _wroteAppPassword = false; -+ - friend class AccountManager; - }; - } Property changes on: head/deskutils/nextcloudclient/files/patch-fix_remote_wipe_keychain_storage ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/nextcloudclient/pkg-plist =================================================================== --- head/deskutils/nextcloudclient/pkg-plist (revision 520846) +++ head/deskutils/nextcloudclient/pkg-plist (revision 520847) @@ -1,139 +1,140 @@ bin/nextcloud bin/nextcloudcmd @sample etc/Nextcloud/sync-exclude.lst.sample include/nextcloudsync/creds/abstractcredentials.h include/nextcloudsync/creds/httpcredentials.h include/nextcloudsync/mirall/account.h include/nextcloudsync/mirall/configfile.h include/nextcloudsync/mirall/networkjobs.h include/nextcloudsync/mirall/progressdispatcher.h include/nextcloudsync/mirall/syncengine.h include/nextcloudsync/mirall/syncfileitem.h include/nextcloudsync/mirall/syncresult.h lib/libnextcloudsync.so lib/libnextcloudsync.so.0 lib/libnextcloudsync.so.%%VERSION%% lib/nextcloud/libocsync.so lib/nextcloud/libocsync.so.0 lib/nextcloud/libocsync.so.%%VERSION%% share/applications/nextcloud.desktop share/caja-python/extensions/syncstate-Nextcloud.py share/icons/hicolor/1024x1024/apps/Nextcloud.png share/icons/hicolor/128x128/apps/Nextcloud.png share/icons/hicolor/128x128/apps/Nextcloud_error.png share/icons/hicolor/128x128/apps/Nextcloud_error_shared.png share/icons/hicolor/128x128/apps/Nextcloud_ok.png share/icons/hicolor/128x128/apps/Nextcloud_ok_shared.png share/icons/hicolor/128x128/apps/Nextcloud_sync.png share/icons/hicolor/128x128/apps/Nextcloud_sync_shared.png share/icons/hicolor/128x128/apps/Nextcloud_warn.png share/icons/hicolor/128x128/apps/Nextcloud_warn_shared.png share/icons/hicolor/16x16/apps/Nextcloud.png share/icons/hicolor/16x16/apps/Nextcloud_error.png share/icons/hicolor/16x16/apps/Nextcloud_error_shared.png share/icons/hicolor/16x16/apps/Nextcloud_ok.png share/icons/hicolor/16x16/apps/Nextcloud_ok_shared.png share/icons/hicolor/16x16/apps/Nextcloud_sync.png share/icons/hicolor/16x16/apps/Nextcloud_sync_shared.png share/icons/hicolor/16x16/apps/Nextcloud_warn.png share/icons/hicolor/16x16/apps/Nextcloud_warn_shared.png share/icons/hicolor/24x24/apps/Nextcloud.png share/icons/hicolor/256x256/apps/Nextcloud.png share/icons/hicolor/256x256/apps/Nextcloud_error.png share/icons/hicolor/256x256/apps/Nextcloud_error_shared.png share/icons/hicolor/256x256/apps/Nextcloud_ok.png share/icons/hicolor/256x256/apps/Nextcloud_ok_shared.png share/icons/hicolor/256x256/apps/Nextcloud_sync.png share/icons/hicolor/256x256/apps/Nextcloud_sync_shared.png share/icons/hicolor/256x256/apps/Nextcloud_warn.png share/icons/hicolor/256x256/apps/Nextcloud_warn_shared.png share/icons/hicolor/32x32/apps/Nextcloud.png share/icons/hicolor/32x32/apps/Nextcloud_error.png share/icons/hicolor/32x32/apps/Nextcloud_error_shared.png share/icons/hicolor/32x32/apps/Nextcloud_ok.png share/icons/hicolor/32x32/apps/Nextcloud_ok_shared.png share/icons/hicolor/32x32/apps/Nextcloud_sync.png share/icons/hicolor/32x32/apps/Nextcloud_sync_shared.png share/icons/hicolor/32x32/apps/Nextcloud_warn.png share/icons/hicolor/32x32/apps/Nextcloud_warn_shared.png share/icons/hicolor/48x48/apps/Nextcloud.png share/icons/hicolor/48x48/apps/Nextcloud_error.png share/icons/hicolor/48x48/apps/Nextcloud_error_shared.png share/icons/hicolor/48x48/apps/Nextcloud_ok.png share/icons/hicolor/48x48/apps/Nextcloud_ok_shared.png share/icons/hicolor/48x48/apps/Nextcloud_sync.png share/icons/hicolor/48x48/apps/Nextcloud_sync_shared.png share/icons/hicolor/48x48/apps/Nextcloud_warn.png share/icons/hicolor/48x48/apps/Nextcloud_warn_shared.png share/icons/hicolor/512x512/apps/Nextcloud.png share/icons/hicolor/64x64/apps/Nextcloud.png share/icons/hicolor/64x64/apps/Nextcloud_error.png share/icons/hicolor/64x64/apps/Nextcloud_error_shared.png share/icons/hicolor/64x64/apps/Nextcloud_ok.png share/icons/hicolor/64x64/apps/Nextcloud_ok_shared.png share/icons/hicolor/64x64/apps/Nextcloud_sync.png share/icons/hicolor/64x64/apps/Nextcloud_sync_shared.png share/icons/hicolor/64x64/apps/Nextcloud_warn.png share/icons/hicolor/64x64/apps/Nextcloud_warn_shared.png share/icons/hicolor/72x72/apps/Nextcloud_error.png share/icons/hicolor/72x72/apps/Nextcloud_error_shared.png share/icons/hicolor/72x72/apps/Nextcloud_ok.png share/icons/hicolor/72x72/apps/Nextcloud_ok_shared.png share/icons/hicolor/72x72/apps/Nextcloud_sync.png share/icons/hicolor/72x72/apps/Nextcloud_sync_shared.png share/icons/hicolor/72x72/apps/Nextcloud_warn.png share/icons/hicolor/72x72/apps/Nextcloud_warn_shared.png share/nautilus-python/extensions/syncstate-Nextcloud.py share/nemo-python/extensions/syncstate-Nextcloud.py share/nextcloud/i18n/client_TW.qm share/nextcloud/i18n/client_bg.qm share/nextcloud/i18n/client_ca.qm share/nextcloud/i18n/client_cs.qm share/nextcloud/i18n/client_da.qm share/nextcloud/i18n/client_de.qm share/nextcloud/i18n/client_el.qm share/nextcloud/i18n/client_en.qm share/nextcloud/i18n/client_en_GB.qm share/nextcloud/i18n/client_eo.qm share/nextcloud/i18n/client_es.qm share/nextcloud/i18n/client_es_AR.qm share/nextcloud/i18n/client_es_CL.qm share/nextcloud/i18n/client_es_CO.qm share/nextcloud/i18n/client_es_CR.qm share/nextcloud/i18n/client_es_DO.qm share/nextcloud/i18n/client_es_EC.qm share/nextcloud/i18n/client_es_GT.qm share/nextcloud/i18n/client_es_HN.qm share/nextcloud/i18n/client_es_MX.qm share/nextcloud/i18n/client_es_SV.qm share/nextcloud/i18n/client_et.qm share/nextcloud/i18n/client_eu.qm share/nextcloud/i18n/client_fa.qm share/nextcloud/i18n/client_fi.qm share/nextcloud/i18n/client_fr.qm share/nextcloud/i18n/client_gl.qm share/nextcloud/i18n/client_he.qm -share/nextcloud/i18n/client_hu.qm share/nextcloud/i18n/client_hr.qm +share/nextcloud/i18n/client_hu.qm share/nextcloud/i18n/client_id.qm share/nextcloud/i18n/client_is.qm share/nextcloud/i18n/client_it.qm share/nextcloud/i18n/client_ja.qm +share/nextcloud/i18n/client_ko.qm share/nextcloud/i18n/client_lt_LT.qm share/nextcloud/i18n/client_lv.qm share/nextcloud/i18n/client_nb_NO.qm share/nextcloud/i18n/client_nl.qm share/nextcloud/i18n/client_pl.qm share/nextcloud/i18n/client_pt.qm share/nextcloud/i18n/client_pt_BR.qm share/nextcloud/i18n/client_ro.qm share/nextcloud/i18n/client_ru.qm share/nextcloud/i18n/client_sk.qm share/nextcloud/i18n/client_sl.qm share/nextcloud/i18n/client_sr.qm share/nextcloud/i18n/client_sv.qm share/nextcloud/i18n/client_th.qm share/nextcloud/i18n/client_tr.qm share/nextcloud/i18n/client_uk.qm share/nextcloud/i18n/client_zh_CN.qm share/nextcloud/i18n/client_zh_TW.qm