From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kEvyCW5wNV/UdwAA0tVLHw (envelope-from ) for ; Thu, 13 Aug 2020 16:55:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id COmuBW5wNV9PBAAAB5/wlQ (envelope-from ) for ; Thu, 13 Aug 2020 16:55:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B68B99404CB for ; Thu, 13 Aug 2020 16:55:09 +0000 (UTC) Received: from localhost ([::1]:36270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6GVQ-000183-Ow for larch@yhetil.org; Thu, 13 Aug 2020 12:55:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6GVK-00017j-KJ for guix-patches@gnu.org; Thu, 13 Aug 2020 12:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39304) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6GVK-0004Vx-Be for guix-patches@gnu.org; Thu, 13 Aug 2020 12:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k6GVK-0006vD-BZ for guix-patches@gnu.org; Thu, 13 Aug 2020 12:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42853] [PATCH 2/2] gnu: Add dbxfs. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Aug 2020 16:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42853@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 42853-submit@debbugs.gnu.org id=B42853.159733766926541 (code B ref 42853); Thu, 13 Aug 2020 16:55:02 +0000 Received: (at 42853) by debbugs.gnu.org; 13 Aug 2020 16:54:29 +0000 Received: from localhost ([127.0.0.1]:50846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k6GUl-0006tz-RG for submit@debbugs.gnu.org; Thu, 13 Aug 2020 12:54:29 -0400 Received: from flashner.co.il ([178.62.234.194]:55668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k6GUg-0006tj-TR for 42853@debbugs.gnu.org; Thu, 13 Aug 2020 12:54:26 -0400 Received: from localhost (unknown [31.210.177.29]) by flashner.co.il (Postfix) with ESMTPSA id 13F334000F; Thu, 13 Aug 2020 16:54:16 +0000 (UTC) From: Efraim Flashner Date: Thu, 13 Aug 2020 19:53:06 +0300 Message-Id: <20200813165306.11564-2-efraim@flashner.co.il> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200813165306.11564-1-efraim@flashner.co.il> References: <20200813165306.11564-1-efraim@flashner.co.il> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: brdi8vrPt1Mp * gnu/packages/file-systems.scm (dbxfs): New variable. * gnu/packages/patches/dbxfs-remove-sentry-sdk.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/file-systems.scm | 30 ++++++++++++++ .../patches/dbxfs-remove-sentry-sdk.patch | 40 +++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 gnu/packages/patches/dbxfs-remove-sentry-sdk.patch diff --git a/gnu/local.mk b/gnu/local.mk index 27dcf965ca..38167eea37 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -887,6 +887,7 @@ dist_patch_DATA = \ %D%/packages/patches/dbus-CVE-2020-12049.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ + %D%/packages/patches/dbxfs-remove-sentry-sdk.patch \ %D%/packages/patches/dconf-meson-0.52.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 7d06e3e899..2e74cb33e8 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -889,3 +889,33 @@ compatible directories.") (description "This package provides a Python SDK for integrating with the Dropbox API v2.") (license license:expat))) + +(define-public dbxfs + (package + (name "dbxfs") + (version "1.0.43") + (source + (origin + (method url-fetch) + (uri (pypi-uri "dbxfs" version)) + (sha256 + (base32 + "1f9sy2ax215dxiwszrrcadffjdsmrlxm4kwrbiap9dhxvzm226ks")) + (patches (search-patches "dbxfs-remove-sentry-sdk.patch")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; tests requires safefs + (propagated-inputs + `(("python-appdirs" ,python-appdirs) + ("python-block-tracing" ,python-block-tracing) + ("python-dropbox" ,python-dropbox) + ("python-keyring" ,python-keyring) + ("python-keyrings.alt" ,python-keyrings.alt) + ("python-privy" ,python-privy) + ("python-userspacefs" ,python-userspacefs))) + (home-page "https://github.com/rianhunter/dbxfs") + (synopsis "User-space file system for Dropbox") + (description + "@code{dbxfs} allows you to mount your Dropbox folder as if it were a +local filesystem.") + (license license:gpl3+))) diff --git a/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch b/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch new file mode 100644 index 0000000000..a17872fb56 --- /dev/null +++ b/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch @@ -0,0 +1,40 @@ +diff --git a/dbxfs/main.py b/dbxfs/main.py +index 5a6cea1..fb9bb1f 100755 +--- a/dbxfs/main.py ++++ b/dbxfs/main.py +@@ -40,8 +40,6 @@ import userspacefs + import keyring + from keyring.errors import KeyringError + +-import sentry_sdk +- + from block_tracing import block_tracing, BLOCK_TRACING_INHERITS + + from dbxfs.dbxfs import FileSystem as DropboxFileSystem +@@ -315,14 +313,6 @@ def _main(argv=None): + + log.info("Starting %s...", APP_NAME) + +- if config.get('send_error_reports', False): +- try: +- sentry_sdk.init("https://b4b13ebd300849bd92260507a594e618@sentry.io/1293235", +- release='%s@%s' % (APP_NAME, version), +- with_locals=False) +- except Exception: +- log.warning("Failed to initialize sentry", exc_info=True) +- + if cache_folder is None: + cache_folder = os.path.join(appdirs.user_cache_dir(APP_NAME), "file_cache") + try: +diff --git a/setup.py b/setup.py +index 89e25c6..f940d47 100644 +--- a/setup.py ++++ b/setup.py +@@ -43,7 +43,6 @@ setup( + "privy>=6.0,<7", + "keyring>=15.1.0", + "keyrings.alt>=3.1,<4", +- "sentry_sdk>=0.3,<1", + ], + extras_require={ + 'safefs': ["safefs"], -- 2.28.0