From 887afd019dcf5ea2889bc53af99c803b8f86c5fd Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 19 Sep 2019 23:39:47 -0400
Subject: [PATCH 1/2] keybase: update to 4.5.0. add kbfs as subpackage

---
 srcpkgs/kbfs                                  |  1 +
 srcpkgs/kbfs/template                         | 23 -------------------
 .../{kbfs/INSTALL => keybase/kbfs.INSTALL}    |  0
 srcpkgs/keybase/template                      | 22 +++++++++++++++---
 4 files changed, 20 insertions(+), 26 deletions(-)
 create mode 120000 srcpkgs/kbfs
 delete mode 100644 srcpkgs/kbfs/template
 rename srcpkgs/{kbfs/INSTALL => keybase/kbfs.INSTALL} (100%)

diff --git a/srcpkgs/kbfs b/srcpkgs/kbfs
new file mode 120000
index 00000000000..c02e554306a
--- /dev/null
+++ b/srcpkgs/kbfs
@@ -0,0 +1 @@
+keybase
\ No newline at end of file
diff --git a/srcpkgs/kbfs/template b/srcpkgs/kbfs/template
deleted file mode 100644
index 5bd004bae82..00000000000
--- a/srcpkgs/kbfs/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'kbfs'
-pkgname=kbfs
-version=2.11.0
-revision=1
-build_style=go
-go_import_path="github.com/keybase/kbfs"
-go_package="${go_import_path}/kbfsfuse ${go_import_path}/kbfsgit/git-remote-keybase ${go_import_path}/kbfstool ${go_import_path}/redirector"
-go_build_tags="production"
-depends="keybase util-linux"
-short_desc="Keybase Filesystem"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://keybase.io/docs/kbfs"
-distfiles="https://github.com/keybase/kbfs/archive/v${version}.tar.gz"
-checksum=0e97cab1c90592035ec6763e22c78c08a95dd3467419d15b9e45b3d0887b594d
-
-post_install() {
-	mv ${DESTDIR}/usr/bin/redirector ${DESTDIR}/usr/bin/keybase-redirector
-	# setuid
-	chmod 4755 ${DESTDIR}/usr/bin/keybase-redirector
-
-	vlicense LICENSE
-}
diff --git a/srcpkgs/kbfs/INSTALL b/srcpkgs/keybase/kbfs.INSTALL
similarity index 100%
rename from srcpkgs/kbfs/INSTALL
rename to srcpkgs/keybase/kbfs.INSTALL
diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index 1e64997394b..e5e1c8ef6d2 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,20 +1,36 @@
 # Template file for 'keybase'
 pkgname=keybase
-version=4.4.2
+version=4.5.0
 revision=1
 wrksrc="client-${version}"
 build_style=go
 go_import_path="github.com/keybase/client"
-go_package="${go_import_path}/go/keybase"
+go_package="${go_import_path}/go/keybase
+${go_import_path}/go/kbfs/kbfsfuse
+${go_import_path}/go/kbfs/kbfsgit/git-remote-keybase
+${go_import_path}/go/kbfs/kbfstool ${go_import_path}/go/kbfs/redirector"
 go_build_tags="production"
+hostmakedepends="git"
 depends="gnupg2"
 short_desc="Client for keybase.io"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://keybase.io/"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=9d19f684d1e375605449f7c37aaecea6518d095ee54837386281c538ebac61f1
+checksum=c74a909b53a3d62c2d71a7209e74c3f5721782a007eba8e48ddd80121343a8da
 
 post_install() {
 	vlicense LICENSE
 }
+
+kbfs_package() {
+	depends="keybase fuse"
+	short_desc="Keybase Filesystem"
+
+	pkg_install() {
+		vmove usr/bin/redirector
+		mv ${PKGDESTDIR}/usr/bin/redirector ${PKGDESTDIR}/usr/bin/keybase-redirector
+		# setuid
+		chmod 4755 ${PKGDESTDIR}/usr/bin/keybase-redirector
+	}
+}

From f8488221c77f7b95be634256aa25d7d4dc79b3e9 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 24 Sep 2019 17:32:31 -0400
Subject: [PATCH 2/2] keybase-desktop: update to 4.5.0.

---
 srcpkgs/keybase-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 9ae1bab1ec5..c5b3bb92a2e 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'keybase-desktop'
 pkgname=keybase-desktop
-version=4.4.2
+version=4.5.0
 revision=1
 wrksrc="client-${version}"
 hostmakedepends="git nodejs-lts yarn"
@@ -10,7 +10,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="BSD-3-Clause"
 homepage="https://keybase.io"
 distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=9d19f684d1e375605449f7c37aaecea6518d095ee54837386281c538ebac61f1
+checksum=c74a909b53a3d62c2d71a7209e74c3f5721782a007eba8e48ddd80121343a8da
 nostrip_files="Keybase"
 
 case "${XBPS_TARGET_MACHINE}" in