Hello community, here is the log from the commit of package kbfs for openSUSE:Factory checked in at 2018-11-12 09:45:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbfs (Old) and /work/SRC/openSUSE:Factory/.kbfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbfs" Mon Nov 12 09:45:17 2018 rev:2 rq:648258 version:2.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbfs/kbfs.changes 2018-11-10 17:02:23.603532540 +0100 +++ /work/SRC/openSUSE:Factory/.kbfs.new/kbfs.changes 2018-11-12 09:46:24.900737485 +0100 @@ -1,0 +2,7 @@ +Sun Nov 11 20:03:58 UTC 2018 - ma...@marix.org + +- Add ensure-service-stop-unmounts-filesystem.patch: Ensures the + Keybase Filesystem is properly unmounted when stopping the kbfs + service. + +------------------------------------------------------------------- New: ---- ensure-service-stop-unmounts-filesystem.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbfs.spec ++++++ --- /var/tmp/diff_new_pack.KZYvg4/_old 2018-11-12 09:46:25.540736514 +0100 +++ /var/tmp/diff_new_pack.KZYvg4/_new 2018-11-12 09:46:25.544736508 +0100 @@ -1,4 +1,7 @@ # +# spec file for package kbfs +# +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018, Matthias Bach <ma...@marix.org> # # All modifications and additions to the file contributed by third parties @@ -13,24 +16,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{go_nostrip} Name: kbfs Version: 2.8.0 Release: 0 -License: BSD-3-Clause and LGPL-3.0-or-later Summary: Encrypted remote storage based on Keybase identities -Url: https://github.com/keybase/kbfs/ +License: BSD-3-Clause AND LGPL-3.0-or-later Group: Productivity/Security +Url: https://github.com/keybase/kbfs/ Source: https://github.com/keybase/kbfs/archive/v%{version}.tar.gz Source1: README.SUSE Source2: README.SUSE.git Source3: README.SUSE.tool Patch1: ensure-mount-dir-exists.patch +Patch2: ensure-service-stop-unmounts-filesystem.patch +BuildRequires: fdupes BuildRequires: git BuildRequires: golang-packaging BuildRequires: gzip -BuildRequires: fdupes BuildRequires: systemd %{?systemd_requires} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,8 +52,9 @@ %package git Summary: Git remote helper for repositories stored on Keybase -Requires: keybase-client +Group: Productivity/Security Requires: kbfs +Requires: keybase-client Supplements: keybase-client %description git @@ -59,6 +65,7 @@ %package tool Summary: Keybase Filesystem command line utility +Group: Productivity/Security Requires: keybase-client Supplements: keybase-client @@ -69,7 +76,7 @@ %prep %setup -q -n %{name}-%{version} -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 %build %goprep github.com/keybase/%{name} ++++++ ensure-service-stop-unmounts-filesystem.patch ++++++ From: Matthias Bach <ma...@marix.org> Date: 2018-11-09 21:15:00 +0100 Subject: Ensure stopping the kbfs service also unmounts the filesystem Upstream: never Stopping the service will leave the filesystem in an unmounted but non- working state. Explicitly unmounting it when stopping the service solves this. This patch can't be upstreamed in this form as it includes the hardcoded mountpoint assumption which mirrors usptreams assumption, but they would always have the mountdir config filled. diff -rub kbfs-2.8.0o/packaging/linux/systemd/kbfs.service kbfs-2.8.0/packaging/linux/systemd/kbfs.service --- kbfs-2.8.0o/packaging/linux/systemd/kbfs.service 2018-11-09 21:16:12.174349778 +0100 +++ kbfs-2.8.0/packaging/linux/systemd/kbfs.service 2018-11-09 21:15:25.715795959 +0100 @@ -9,8 +9,9 @@ # means that error codes from this command are ignored. Without this line, # `systemctl --user restart kbfs.service` will hit mount failures if there # are any running shells cd'd into a Keybase folder. -ExecStartPre=-/bin/sh -c 'fusermount -uz "$(keybase config get -d -b mountdir)"' +ExecStartPre=-/bin/sh -c 'SERVICE=$(keybase config get -d -b mountdir); fusermount -uz "${SERVICE:-${XDG_RUNTIME_DIR}/keybase/kbfs}"' ExecStart=/usr/bin/kbfsfuse -debug -log-to-file +ExecStop=/bin/sh -c 'SERVICE=$(keybase config get -d -b mountdir); fusermount -uz "${SERVICE:-${XDG_RUNTIME_DIR}/keybase/kbfs}"' Restart=on-failure # Ensure the default mountdir exists RuntimeDirectory=keybase/kbfs
