Date: Thursday, July 8, 2021 @ 01:40:34 Author: eschwartz Revision: 975321
archrelease: copy trunk to community-x86_64 Added: keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch (from rev 975320, keybase/trunk/0001-Don-t-use-electron-to-build.patch) keybase/repos/community-x86_64/0001-Maintain-current-contextIsolation-behavior-across-el.patch (from rev 975320, keybase/trunk/0001-Maintain-current-contextIsolation-behavior-across-el.patch) keybase/repos/community-x86_64/PKGBUILD (from rev 975320, keybase/trunk/PKGBUILD) keybase/repos/community-x86_64/kbfs.install (from rev 975320, keybase/trunk/kbfs.install) keybase/repos/community-x86_64/keybase-gui (from rev 975320, keybase/trunk/keybase-gui) Deleted: keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch keybase/repos/community-x86_64/PKGBUILD keybase/repos/community-x86_64/kbfs.install keybase/repos/community-x86_64/keybase-gui -----------------------------------------------------------------+ 0001-Don-t-use-electron-to-build.patch | 134 ++-- 0001-Maintain-current-contextIsolation-behavior-across-el.patch | 67 ++ PKGBUILD | 281 +++++----- kbfs.install | 30 - keybase-gui | 36 - 5 files changed, 311 insertions(+), 237 deletions(-) Deleted: 0001-Don-t-use-electron-to-build.patch =================================================================== --- 0001-Don-t-use-electron-to-build.patch 2021-07-08 01:40:00 UTC (rev 975320) +++ 0001-Don-t-use-electron-to-build.patch 2021-07-08 01:40:34 UTC (rev 975321) @@ -1,67 +0,0 @@ -From f13853908947e47a7853125865c98a406cd7772f Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwart...@gmail.com> -Date: Thu, 21 Jun 2018 05:00:37 -0400 -Subject: [PATCH] Don't use electron to build - ---- - shared/desktop/package.desktop.tsx | 4 ++-- - shared/desktop/yarn-helper/index.tsx | 2 -- - shared/package.json | 1 - - 3 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/shared/desktop/package.desktop.tsx b/shared/desktop/package.desktop.tsx -index b10bb10295..f4b5fc3e6a 100644 ---- a/shared/desktop/package.desktop.tsx -+++ b/shared/desktop/package.desktop.tsx -@@ -133,7 +133,7 @@ function main() { - // use the same version as the currently-installed electron - console.log('Finding electron version') - try { -- packagerOpts.electronVersion = require('../package.json').devDependencies.electron -+ packagerOpts.electronVersion = 'unused string' - console.log('Found electron version:', packagerOpts.electronVersion) - } catch (err) { - console.log("Couldn't parse yarn list to find electron:", err) -@@ -181,7 +181,7 @@ function startPack() { - .catch(postPackError) - }) - }) -- } else { -+ } else if (false) { - pack(platform, arch) - .then(postPack(platform, arch)) - .catch(postPackError) -diff --git a/shared/desktop/yarn-helper/index.tsx b/shared/desktop/yarn-helper/index.tsx -index c7b04af258..a752ccd8bc 100644 ---- a/shared/desktop/yarn-helper/index.tsx -+++ b/shared/desktop/yarn-helper/index.tsx -@@ -1,6 +1,5 @@ - // Helper for cross platform yarn run script commands - import buildCommands from './build' --import electronComands from './electron' - import fontCommands from './font' - import prettierCommands from './prettier' - import {execSync} from 'child_process' -@@ -14,7 +13,6 @@ const [, , command, ...rest] = process.argv - const commands = { - ...buildCommands, - ...fontCommands, -- ...electronComands, - ...prettierCommands, - help: { - code: () => { -diff --git a/shared/package.json b/shared/package.json -index 84e9247190..e5a9045157 100644 ---- a/shared/package.json -+++ b/shared/package.json -@@ -201,7 +201,6 @@ - "cross-env": "7.0.2", - "css-loader": "3.2.0", - "del": "3.0.0", -- "electron": "10.1.1", - "electron-packager": "14.0.6", - "eslint": "6.4.0", - "eslint-plugin-filenames": "1.3.2", --- -2.28.0 - Copied: keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch (from rev 975320, keybase/trunk/0001-Don-t-use-electron-to-build.patch) =================================================================== --- 0001-Don-t-use-electron-to-build.patch (rev 0) +++ 0001-Don-t-use-electron-to-build.patch 2021-07-08 01:40:34 UTC (rev 975321) @@ -0,0 +1,67 @@ +From f13853908947e47a7853125865c98a406cd7772f Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwart...@gmail.com> +Date: Thu, 21 Jun 2018 05:00:37 -0400 +Subject: [PATCH] Don't use electron to build + +--- + shared/desktop/package.desktop.tsx | 4 ++-- + shared/desktop/yarn-helper/index.tsx | 2 -- + shared/package.json | 1 - + 3 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/shared/desktop/package.desktop.tsx b/shared/desktop/package.desktop.tsx +index b10bb10295..f4b5fc3e6a 100644 +--- a/shared/desktop/package.desktop.tsx ++++ b/shared/desktop/package.desktop.tsx +@@ -133,7 +133,7 @@ function main() { + // use the same version as the currently-installed electron + console.log('Finding electron version') + try { +- packagerOpts.electronVersion = require('../package.json').devDependencies.electron ++ packagerOpts.electronVersion = 'unused string' + console.log('Found electron version:', packagerOpts.electronVersion) + } catch (err) { + console.log("Couldn't parse yarn list to find electron:", err) +@@ -181,7 +181,7 @@ function startPack() { + .catch(postPackError) + }) + }) +- } else { ++ } else if (false) { + pack(platform, arch) + .then(postPack(platform, arch)) + .catch(postPackError) +diff --git a/shared/desktop/yarn-helper/index.tsx b/shared/desktop/yarn-helper/index.tsx +index c7b04af258..a752ccd8bc 100644 +--- a/shared/desktop/yarn-helper/index.tsx ++++ b/shared/desktop/yarn-helper/index.tsx +@@ -1,6 +1,5 @@ + // Helper for cross platform yarn run script commands + import buildCommands from './build' +-import electronComands from './electron' + import fontCommands from './font' + import prettierCommands from './prettier' + import {execSync} from 'child_process' +@@ -14,7 +13,6 @@ const [, , command, ...rest] = process.argv + const commands = { + ...buildCommands, + ...fontCommands, +- ...electronComands, + ...prettierCommands, + help: { + code: () => { +diff --git a/shared/package.json b/shared/package.json +index 84e9247190..e5a9045157 100644 +--- a/shared/package.json ++++ b/shared/package.json +@@ -201,7 +201,6 @@ + "cross-env": "7.0.2", + "css-loader": "3.2.0", + "del": "3.0.0", +- "electron": "10.1.1", + "electron-packager": "14.0.6", + "eslint": "6.4.0", + "eslint-plugin-filenames": "1.3.2", +-- +2.28.0 + Copied: keybase/repos/community-x86_64/0001-Maintain-current-contextIsolation-behavior-across-el.patch (from rev 975320, keybase/trunk/0001-Maintain-current-contextIsolation-behavior-across-el.patch) =================================================================== --- 0001-Maintain-current-contextIsolation-behavior-across-el.patch (rev 0) +++ 0001-Maintain-current-contextIsolation-behavior-across-el.patch 2021-07-08 01:40:34 UTC (rev 975321) @@ -0,0 +1,67 @@ +From c9f8ba2091da223fa703923e36afa4ba5f1731aa Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwa...@archlinux.org> +Date: Wed, 23 Jun 2021 19:06:12 -0400 +Subject: [PATCH] Maintain current contextIsolation behavior across electron 11 + vs. >=12 + +For what this does, see: + +https://www.electronjs.org/docs/breaking-changes#default-changed-contextisolation-defaults-to-true +https://github.com/electron/electron/blob/main/docs/tutorial/context-isolation.md + +In electron 11, this logged: + +> The default of contextIsolation is deprecated and will be changing from +> false to true in a future release of Electron. + +In electron 12, Keybase refused to start. Explicitly specifying the old +behavior makes Keybase run again. + +"for the security of your application" Keybase may wish in future to +restructure and support context isolation, but that would be in the +future. +--- + shared/desktop/app/main-window.desktop.tsx | 1 + + shared/desktop/app/menu-bar.desktop.tsx | 1 + + shared/desktop/app/node.desktop.tsx | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/shared/desktop/app/main-window.desktop.tsx b/shared/desktop/app/main-window.desktop.tsx +index a93ffa11a7..9ef4f6f288 100644 +--- a/shared/desktop/app/main-window.desktop.tsx ++++ b/shared/desktop/app/main-window.desktop.tsx +@@ -275,6 +275,7 @@ export default () => { + minWidth: 740, + show: false, + webPreferences: { ++ contextIsolation: false, + backgroundThrottling: false, + devTools: showDevTools, + enableRemoteModule: true, +diff --git a/shared/desktop/app/menu-bar.desktop.tsx b/shared/desktop/app/menu-bar.desktop.tsx +index 1597c020bd..e1aa62a854 100644 +--- a/shared/desktop/app/menu-bar.desktop.tsx ++++ b/shared/desktop/app/menu-bar.desktop.tsx +@@ -40,6 +40,7 @@ export default (menubarWindowIDCallback: (id: number) => void) => { + resizable: false, + transparent: true, + webPreferences: { ++ contextIsolation: false, + enableRemoteModule: true, + nodeIntegration: true, + nodeIntegrationInWorker: false, +diff --git a/shared/desktop/app/node.desktop.tsx b/shared/desktop/app/node.desktop.tsx +index 6368bc18b9..7c8c4a34d5 100644 +--- a/shared/desktop/app/node.desktop.tsx ++++ b/shared/desktop/app/node.desktop.tsx +@@ -365,6 +365,7 @@ const plumbEvents = () => { + show: false, // Start hidden and show when we actually get props + titleBarStyle: 'customButtonsOnHover' as const, + webPreferences: { ++ contextIsolation: false, + enableRemoteModule: true, + nodeIntegration: true, + nodeIntegrationInWorker: false, +-- +2.32.0 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-07-08 01:40:00 UTC (rev 975320) +++ PKGBUILD 2021-07-08 01:40:34 UTC (rev 975321) @@ -1,137 +0,0 @@ -# Maintainer: Eli Schwartz <eschwa...@archlinux.org> -# Contributor: Felix Yan <felixonm...@archlinux.org> -# Contributor: Michael Hansen <zrax0111 gmail com> - -pkgbase=keybase -pkgname=('keybase' 'kbfs' 'keybase-gui') -pkgdesc='CLI tool for GPG with keybase.io' -pkgver=5.6.1 -pkgrel=2 -arch=('x86_64') -url='https://keybase.io/' -license=('BSD') -# git is needed for yarn... -makedepends=('git' 'go' 'yarn') -source=("https://github.com/keybase/client/releases/download/v${pkgver}/${pkgbase}-v${pkgver}.tar.xz"{,.sig} - "keybase-gui" - "0001-Don-t-use-electron-to-build.patch") -sha512sums=('1c975bf5381593e650d3fb7fc1c7345e66f04a8730f38d8f2d6f1985d41b34e349506e269ab6736dee6e50c4d5563f25465dbf01061b33ea385015a2856d1eee' - 'SKIP' - 'a0b306e2ade02a218d11f5220e140011e225d888deb8194aa2642531dde0c390fdf95aad5873b805208142ef47da9ef35f07311af84f1d1b08aed4a3d616fd39' - 'f759f69b774200261687842c66902a3c45638bb012ced9bd83d27491c8a0bbc0bc744dbb83ad7672d443f32d7303c15aeb0ded7a1a0d7ab56e7b1c1b64e263c3') -b2sums=('95558b9fb9f9a887945180bcff8932ca80ed1052a99c9c338a4e11ca17ff50fbdd56718784ad0d25c3255f95b0b2d674765858d7b517369ba580b56779d44669' - 'SKIP' - 'f98564298ff59de51e9c07172fc680e25ebab1280d06a9d2d8fef842b8bda3566ff8cfd210aee188bc7c55a18230a49e3060f38642dd12c9e57d8c5496bdfb5c' - '02d7876fb0d68b05e9ee262925a063049bfa2e5e063789008c4c74e406084d4441d2c860ecb2b08596f9d9a8c9a6e9136a2cdbd8312bcbf376d9d6e6c811bcfc') -validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) <c...@keybase.io> - -prepare() { - cd client-v${pkgver} - - export GOPATH="${srcdir}/.gopath" - mkdir -p "${GOPATH}"/src/github.com/keybase - ln -sf "${PWD}" "${GOPATH}"/src/github.com/keybase/client - - # Fix paths to run electron /path/to/app (or our minimal wrapper script). - # Also wire up "hideWindow" when running as a service or via XDG autostart. - sed -i 's@/opt/keybase/Keybase@/usr/bin/electron11 /usr/share/keybase-app@' \ - packaging/linux/systemd/keybase.gui.service - sed -i 's/run_keybase/keybase-gui/g' \ - packaging/linux/keybase.desktop go/install/install_unix.go - - patch -p1 -i ../0001-Don-t-use-electron-to-build.patch -} - -build() { - cd client-v${pkgver}/go/keybase - - # None of this should be necessary, but we duplicate the work of - # makepkg.conf here since golang CGO can't be bothered to respect - # standardized CFLAGS and we don't have native packaging integration for - # either this or the go-specific flags. Must be done here to make sure - # we're using debug or !buildflags. - - export CGO_CPPFLAGS="${CPPFLAGS}" - export CGO_CFLAGS="${CFLAGS}" - export CGO_CXXFLAGS="${CXXFLAGS}" - export CGO_LDFLAGS="${LDFLAGS}" - export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" - - export GO111MODULE=off - - export GOPATH="${srcdir}/.gopath" - go build -a -tags production -o ../bin/keybase github.com/keybase/client/go/keybase - go build -a -tags production -o ../bin/kbnm github.com/keybase/client/go/kbnm - go build -a -tags production -o ../bin/kbfsfuse github.com/keybase/client/go/kbfs/kbfsfuse - go build -a -tags production -o ../bin/git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase - - cd ../../shared - yarn install - yarn run package --appVersion $pkgver -} - -package_keybase() { - depends=('gnupg') - optdepends=('kbfs: for the fuse-based fileystem and the encryption subcommand') - - cd client-v${pkgver} - - install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{keybase,kbnm} - - # native messaging whitelists - KBNM_INSTALL_ROOT=1 KBNM_INSTALL_OVERLAY="${pkgdir}" "${pkgdir}/usr/bin/kbnm" install - # systemd activation - install -Dm644 packaging/linux/systemd/keybase.service "${pkgdir}"/usr/lib/systemd/user/keybase.service - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_kbfs() { - pkgdesc="The Keybase filesystem" - url="https://keybase.io/docs/kbfs" - depends=('fuse' 'keybase') - install=kbfs.install - - cd client-v${pkgver} - - install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{kbfsfuse,git-remote-keybase} - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - # more systemd activation - install -Dm644 packaging/linux/systemd/kbfs.service "$pkgdir"/usr/lib/systemd/user/kbfs.service -} - -package_keybase-gui() { - pkgdesc="GUI frontend for GPG with keybase.io" - depends=('electron11' 'keybase' 'kbfs') - - cd client-v${pkgver}/ - - install -Dm644 packaging/linux/x-saltpack.xml \ - "${pkgdir}"/usr/share/mime/packages/x-saltpack.xml - install -Dm644 packaging/linux/keybase.desktop \ - "${pkgdir}"/usr/share/applications/keybase.desktop - # more systemd activation - install -Dm644 packaging/linux/systemd/keybase.gui.service \ - "${pkgdir}"/usr/lib/systemd/user/keybase.gui.service - # wrapper for electron - install -Dm755 "${srcdir}"/keybase-gui "${pkgdir}"/usr/bin/keybase-gui - - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - - for i in 16 32 128 256 512 ; do - install -Dm644 media/icons/Keybase.iconset/icon_${i}x${i}.png \ - "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/keybase.png - install -Dm644 media/icons/Saltpack.iconset/icon_${i}x${i}.png \ - "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/mimetypes/application-x-saltpack.png - done - # ??? - install -Dm644 media/icons/Keybase.iconset/icon_32...@2x.png \ - "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/keybase.png - install -Dm644 media/icons/Keybase.iconset/icon_512x...@2x.png \ - "${pkgdir}"/usr/share/icons/hicolor/1024x1024/apps/keybase.png - - # the app itself - cd shared/desktop/build - rm -rf desktop/sourcemaps/ - mkdir -p "${pkgdir}"/usr/share/keybase-app - cp -r * "${pkgdir}"/usr/share/keybase-app/ -} Copied: keybase/repos/community-x86_64/PKGBUILD (from rev 975320, keybase/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-07-08 01:40:34 UTC (rev 975321) @@ -0,0 +1,144 @@ +# Maintainer: Eli Schwartz <eschwa...@archlinux.org> +# Contributor: Felix Yan <felixonm...@archlinux.org> +# Contributor: Michael Hansen <zrax0111 gmail com> + +pkgbase=keybase +pkgname=('keybase' 'kbfs' 'keybase-gui') +pkgdesc='CLI tool for GPG with keybase.io' +pkgver=5.7.1 +pkgrel=2 +arch=('x86_64') +url='https://keybase.io/' +license=('BSD') +# git is needed for yarn... +makedepends=('git' 'go' 'yarn') +source=("https://github.com/keybase/client/releases/download/v${pkgver}/${pkgbase}-v${pkgver}.tar.xz"{,.sig} + "keybase-gui" + "0001-Maintain-current-contextIsolation-behavior-across-el.patch" + "0001-Don-t-use-electron-to-build.patch") +sha512sums=('1cdf93a2e52e16eedd7fe4544a2b1f0e6f6d47802e17e029ae08b19302c44d5cca0b297aa827332a62202045f91c7c6b1d9d627f2915fcdb4cc2a77076adbd0d' + 'SKIP' + 'dc52d7c3d5798d9b83a4e42ba70a071b1cd5cb95c8b695a4b7a33d85744762ae644feef58cf4d582c8d8c169be68d57f392c33ff0796490e88f01f09b4c207d2' + '5cb3d93c4bb468fd47e1670f73cc3b8be14977ccf563a47d776285b6b9d96042647062427e58bd981727362caa23d17acdc0152dfd915efeeb6c4e76ca76ca65' + 'f759f69b774200261687842c66902a3c45638bb012ced9bd83d27491c8a0bbc0bc744dbb83ad7672d443f32d7303c15aeb0ded7a1a0d7ab56e7b1c1b64e263c3') +b2sums=('8f2501c3db8f0d3f82a5a597d1654af69a7d603b96d6143dc7df443290eb6b2ee299cc300f41061236b2738bc2a54018bc55705ddb903df326fd8850c12c506f' + 'SKIP' + 'ac27d14a9625a3bca6a4ac87adbe5bb2f0aee0c4a88bf39ac8b3d235801743b2e40e6cd7db26089398f016a25046a674f521b890ddf73c3c6637d0d6bf6e1397' + '67f416c59b549606d037167c796c5b99f0ca9158fb767d52c101f41db6d31927b57618efb4d6eaf590cbd3c7aab4dd71a64bc3b52580e2383f5389c95264a499' + '02d7876fb0d68b05e9ee262925a063049bfa2e5e063789008c4c74e406084d4441d2c860ecb2b08596f9d9a8c9a6e9136a2cdbd8312bcbf376d9d6e6c811bcfc') +validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) <c...@keybase.io> + +prepare() { + cd client-v${pkgver} + + export GOPATH="${srcdir}/.gopath" + mkdir -p "${GOPATH}"/src/github.com/keybase + ln -sf "${PWD}" "${GOPATH}"/src/github.com/keybase/client + + # Fix paths to run electron /path/to/app (or our minimal wrapper script). + # Also wire up "hideWindow" when running as a service or via XDG autostart. + sed -i 's@/opt/keybase/Keybase@/usr/bin/electron /usr/share/keybase-app@' \ + packaging/linux/systemd/keybase.gui.service + sed -i 's/run_keybase/keybase-gui/g' \ + packaging/linux/keybase.desktop go/install/install_unix.go + + patch -p1 -i ../0001-Don-t-use-electron-to-build.patch + # New versions of electron tighten sandboxing and applications need to adapt. + # Keybase did not, so loosen this back to pre v12 levels + # https://github.com/keybase/client/pull/24551 + patch -p1 -i ../0001-Maintain-current-contextIsolation-behavior-across-el.patch +} + +build() { + cd client-v${pkgver}/go/keybase + + # None of this should be necessary, but we duplicate the work of + # makepkg.conf here since golang CGO can't be bothered to respect + # standardized CFLAGS and we don't have native packaging integration for + # either this or the go-specific flags. Must be done here to make sure + # we're using debug or !buildflags. + + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" + + export GO111MODULE=off + + export GOPATH="${srcdir}/.gopath" + go build -a -tags production -o ../bin/keybase github.com/keybase/client/go/keybase + go build -a -tags production -o ../bin/kbnm github.com/keybase/client/go/kbnm + go build -a -tags production -o ../bin/kbfsfuse github.com/keybase/client/go/kbfs/kbfsfuse + go build -a -tags production -o ../bin/git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase + + cd ../../shared + yarn install + yarn run package --appVersion $pkgver +} + +package_keybase() { + depends=('gnupg') + optdepends=('kbfs: for the fuse-based fileystem and the encryption subcommand') + + cd client-v${pkgver} + + install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{keybase,kbnm} + + # native messaging whitelists + KBNM_INSTALL_ROOT=1 KBNM_INSTALL_OVERLAY="${pkgdir}" "${pkgdir}/usr/bin/kbnm" install + # systemd activation + install -Dm644 packaging/linux/systemd/keybase.service "${pkgdir}"/usr/lib/systemd/user/keybase.service + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_kbfs() { + pkgdesc="The Keybase filesystem" + url="https://keybase.io/docs/kbfs" + depends=('fuse' 'keybase') + install=kbfs.install + + cd client-v${pkgver} + + install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{kbfsfuse,git-remote-keybase} + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + # more systemd activation + install -Dm644 packaging/linux/systemd/kbfs.service "$pkgdir"/usr/lib/systemd/user/kbfs.service +} + +package_keybase-gui() { + pkgdesc="GUI frontend for GPG with keybase.io" + depends=('electron' 'keybase' 'kbfs') + + cd client-v${pkgver}/ + + install -Dm644 packaging/linux/x-saltpack.xml \ + "${pkgdir}"/usr/share/mime/packages/x-saltpack.xml + install -Dm644 packaging/linux/keybase.desktop \ + "${pkgdir}"/usr/share/applications/keybase.desktop + # more systemd activation + install -Dm644 packaging/linux/systemd/keybase.gui.service \ + "${pkgdir}"/usr/lib/systemd/user/keybase.gui.service + # wrapper for electron + install -Dm755 "${srcdir}"/keybase-gui "${pkgdir}"/usr/bin/keybase-gui + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + + for i in 16 32 128 256 512 ; do + install -Dm644 media/icons/Keybase.iconset/icon_${i}x${i}.png \ + "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/keybase.png + install -Dm644 media/icons/Saltpack.iconset/icon_${i}x${i}.png \ + "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/mimetypes/application-x-saltpack.png + done + # ??? + install -Dm644 media/icons/Keybase.iconset/icon_32...@2x.png \ + "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/keybase.png + install -Dm644 media/icons/Keybase.iconset/icon_512x...@2x.png \ + "${pkgdir}"/usr/share/icons/hicolor/1024x1024/apps/keybase.png + + # the app itself + cd shared/desktop/build + rm -rf desktop/sourcemaps/ + mkdir -p "${pkgdir}"/usr/share/keybase-app + cp -r * "${pkgdir}"/usr/share/keybase-app/ +} Deleted: kbfs.install =================================================================== --- kbfs.install 2021-07-08 01:40:00 UTC (rev 975320) +++ kbfs.install 2021-07-08 01:40:34 UTC (rev 975321) @@ -1,15 +0,0 @@ -post_install() { - cat << '__EOF__' -warning: the keybase-redirector is not included, so you will need to define -your `keybase config` mountdir to something you like (or install the -redirector on your own). - -See: https://github.com/keybase/client/issues/19840#issuecomment-533842074 -__EOF__ -} - -post_upgrade() { - if (( $(vercmp 4.7.1-1 $2) > 0 )); then - post_install - fi -} Copied: keybase/repos/community-x86_64/kbfs.install (from rev 975320, keybase/trunk/kbfs.install) =================================================================== --- kbfs.install (rev 0) +++ kbfs.install 2021-07-08 01:40:34 UTC (rev 975321) @@ -0,0 +1,15 @@ +post_install() { + cat << '__EOF__' +warning: the keybase-redirector is not included, so you will need to define +your `keybase config` mountdir to something you like (or install the +redirector on your own). + +See: https://github.com/keybase/client/issues/19840#issuecomment-533842074 +__EOF__ +} + +post_upgrade() { + if (( $(vercmp 4.7.1-1 $2) > 0 )); then + post_install + fi +} Deleted: keybase-gui =================================================================== --- keybase-gui 2021-07-08 01:40:00 UTC (rev 975320) +++ keybase-gui 2021-07-08 01:40:34 UTC (rev 975321) @@ -1,18 +0,0 @@ -#!/bin/sh - -keybase ctl init - -if ! keybase version --assert-matching >/dev/null 2>&1; then - echo "restarting outdated services..." - systemctl --user daemon-reload - systemctl --user restart keybase kbfs -else - systemctl --user start keybase kbfs -fi - -if [ $# -gt 0 ] || systemctl --user is-active --quiet keybase.gui; then - exec electron11 /usr/share/keybase-app "$@" -else - systemctl --user import-environment KEYBASE_AUTOSTART - exec systemctl start --user --wait keybase.gui -fi Copied: keybase/repos/community-x86_64/keybase-gui (from rev 975320, keybase/trunk/keybase-gui) =================================================================== --- keybase-gui (rev 0) +++ keybase-gui 2021-07-08 01:40:34 UTC (rev 975321) @@ -0,0 +1,18 @@ +#!/bin/sh + +keybase ctl init + +if ! keybase version --assert-matching >/dev/null 2>&1; then + echo "restarting outdated services..." + systemctl --user daemon-reload + systemctl --user restart keybase kbfs +else + systemctl --user start keybase kbfs +fi + +if [ $# -gt 0 ] || systemctl --user is-active --quiet keybase.gui; then + exec electron /usr/share/keybase-app "$@" +else + systemctl --user import-environment KEYBASE_AUTOSTART + exec systemctl start --user --wait keybase.gui +fi