Date: Saturday, June 11, 2022 @ 07:35:01
Author: alerque
Revision: 1232092
upgpkg: keybase 6.0.2-1
Modified:
keybase/trunk/0001-Don-t-use-electron-to-build.patch
keybase/trunk/PKGBUILD
----------------------------------------+
0001-Don-t-use-electron-to-build.patch | 35 ++-------
PKGBUILD | 112 ++++++++++++++-----------------
2 files changed, 61 insertions(+), 86 deletions(-)
Modified: 0001-Don-t-use-electron-to-build.patch
===================================================================
--- 0001-Don-t-use-electron-to-build.patch 2022-06-11 07:34:56 UTC (rev
1232091)
+++ 0001-Don-t-use-electron-to-build.patch 2022-06-11 07:35:01 UTC (rev
1232092)
@@ -13,7 +13,7 @@
index b10bb10295..f4b5fc3e6a 100644
--- a/shared/desktop/package.desktop.tsx
+++ b/shared/desktop/package.desktop.tsx
-@@ -133,7 +133,7 @@ function main() {
+@@ -133,7 +133,7 @@
// use the same version as the currently-installed electron
console.log('Finding electron version')
try {
@@ -22,15 +22,15 @@
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)
+@@ -190,7 +190,7 @@
+ aps.forEach(([arch, plat]) => {
+ pack(plat, arch).then(postPack(plat, arch)).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
@@ -50,18 +50,3 @@
...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": "11.5.0",
- "electron-packager": "14.0.6",
- "eslint": "6.4.0",
- "eslint-plugin-filenames": "1.3.2",
---
-2.28.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-11 07:34:56 UTC (rev 1232091)
+++ PKGBUILD 2022-06-11 07:35:01 UTC (rev 1232092)
@@ -6,8 +6,8 @@
pkgbase=keybase
pkgname=(keybase kbfs keybase-gui)
pkgdesc='CLI tool for GPG with keybase.io'
-pkgver=5.9.3
-pkgrel=2
+pkgver=6.0.2
+pkgrel=1
arch=(x86_64)
url=https://keybase.io
_url=https://github.com/keybase/client
@@ -15,22 +15,17 @@
# git is needed for yarn...
makedepends=(git
go
+ jq
+ moreutils
yarn)
_archive="$pkgbase-v$pkgver"
source=("$_url/releases/download/v$pkgver/$_archive.tar.xz"{,.sig}
- 'keybase-gui'
- '0001-Maintain-current-contextIsolation-behavior-across-el.patch'
- '0001-Don-t-use-electron-to-build.patch')
-sha512sums=('eadbc4ef3975db277527f45a3c1e281b82bbf611c6cc835b4415a4ef274e8263cb19259190f6fc8519467b99f70ccc46b153e75952ad298ecf4c3e37420472e3'
+ keybase-gui
+ 0001-Don-t-use-electron-to-build.patch)
+sha256sums=('22e5ae4d1f951ea9f3ffc3cb74de9b9f41b828b2c8a4e5cb6401de6fbccf497b'
'SKIP'
-
'bdecad57f8703eb6011b0c9ff238b9f3d78192031adfb5a27a7e6910119c600726b87aaacada88877eaeddcd6134fbe72b014bcaeb6cc7563c3753fcb33c52c9'
-
'5cb3d93c4bb468fd47e1670f73cc3b8be14977ccf563a47d776285b6b9d96042647062427e58bd981727362caa23d17acdc0152dfd915efeeb6c4e76ca76ca65'
-
'3d38410574ac9d3a09a9ed4ba82bffb3078b15986d8447fe53d7499f538f5c54093f0893667ee64ddd22609b83a8c9c15e50f11f61ddb48cff3ecdf5b8c4628e')
-b2sums=('2de5fb062701bac493c569edcceb1b4980b08f2314adcf4e0478f8299b6ab0bf78b6e0f81bb7353ef7f1e9a9134645c0d56751d2744709d8100f4ee3c5fc5289'
- 'SKIP'
-
'1ecf08e4a0b2836828fc4f9283a69e1fbda6f268195ae56433050d54070038aacf1ae3057202324c678b242c88345cc8f453c7798129753f083c33db256517a4'
-
'67f416c59b549606d037167c796c5b99f0ca9158fb767d52c101f41db6d31927b57618efb4d6eaf590cbd3c7aab4dd71a64bc3b52580e2383f5389c95264a499'
-
'd556694526d973431012c36891d82578aeafdd159e7f7f9108325946e874cef4303dff8dc12f0ec7d2c5b731d5cf20bec26c7f18b6483d8f2910c93e3a1a7a68')
+ '1eca47356815ad95437911d9abe80e2d68eb96dabaedf7f95dce7d361501dc9f'
+ '74fd7a777275bdf2128f121e27f722f692302a50d89c6c1d3ec82df1deaffee3')
validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code
Signing (v1) <[email protected]>
prepare() {
@@ -37,25 +32,21 @@
ln -sf "${_archive/$pkgbase/client}" "$_archive"
cd "$_archive"
- # Fixup unsecured git access blocked by GitHub
- sed -i -E 's#git://#git+https://#' shared/package.json shared/yarn.lock
+ export GOPATH="$srcdir/.gopath"
+ mkdir -p "$GOPATH"/src/github.com/keybase
+ ln -sf "$PWD" "$GOPATH"/src/github.com/keybase/client
- 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/electron13
/usr/share/keybase-app@' \
packaging/linux/systemd/keybase.gui.service
+
+ # Don't let desktop launcher automatically start services on boot
sed -i 's/run_keybase/keybase-gui/g' \
- packaging/linux/keybase.desktop go/install/install_unix.go
+ packaging/linux/keybase.desktop
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
+ jq 'del(.devDependencies["electron"])' shared/package.json | sponge
shared/package.json
cd go
go mod tidy
@@ -70,13 +61,13 @@
# 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 CGO_CPPFLAGS="$CPPFLAGS"
+ export CGO_CFLAGS="$CFLAGS"
+ export CGO_CXXFLAGS="$CXXFLAGS"
+ export CGO_LDFLAGS="$LDFLAGS"
export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external
-mod=readonly -modcacherw"
- export GOPATH="${srcdir}/.gopath"
+ 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
@@ -88,67 +79,66 @@
}
package_keybase() {
- depends=('gnupg')
+ depends=(gnupg)
optdepends=('kbfs: for the fuse-based fileystem and the encryption
subcommand')
cd "$_archive"
- install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{keybase,kbnm}
+ install -Dm0755 -t "$pkgdir/usr/bin/" go/bin/{keybase,kbnm}
# native messaging whitelists
- KBNM_INSTALL_ROOT=1 KBNM_INSTALL_OVERLAY="${pkgdir}"
"${pkgdir}/usr/bin/kbnm" install
+ 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
+ install -Dm0644 -t "$pkgdir/usr/lib/systemd/user/"
packaging/linux/systemd/keybase.service
+ install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE
}
package_kbfs() {
- pkgdesc="The Keybase filesystem"
- url="https://keybase.io/docs/kbfs";
- depends=('fuse' 'keybase')
+ pkgdesc='The Keybase filesystem'
+ url='https://keybase.io/docs/kbfs'
+ depends=(fuse keybase)
install=kbfs.install
cd "$_archive"
- install -Dm755 -t "${pkgdir}"/usr/bin/
go/bin/{kbfsfuse,git-remote-keybase}
- install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+ install -Dm0755 -t "$pkgdir/usr/bin/"
go/bin/{kbfsfuse,git-remote-keybase}
+ install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE
# more systemd activation
- install -Dm644 packaging/linux/systemd/kbfs.service
"$pkgdir"/usr/lib/systemd/user/kbfs.service
+ install -Dm0644 -t "$pkgdir/usr/lib/systemd/user/"
packaging/linux/systemd/kbfs.service
}
package_keybase-gui() {
- pkgdesc="GUI frontend for GPG with keybase.io"
- depends=('electron13' 'keybase' 'kbfs')
+ pkgdesc='GUI frontend for GPG with keybase.io'
+ depends=(electron13 keybase kbfs)
cd "$_archive"
- 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
+ install -Dm0644 -t "$pkgdir/usr/share/mime/packages/"
packaging/linux/x-saltpack.xml
+ install -Dm0644 -t "$pkgdir/usr/share/applications/"
packaging/linux/keybase.desktop
# more systemd activation
- install -Dm644 packaging/linux/systemd/keybase.gui.service \
- "${pkgdir}"/usr/lib/systemd/user/keybase.gui.service
+ install -Dm0644 -t "$pkgdir/usr/lib/systemd/user/"
packaging/linux/systemd/keybase.gui.service
# wrapper for electron
- install -Dm755 "${srcdir}"/keybase-gui "${pkgdir}"/usr/bin/keybase-gui
+ install -Dm0755 -t "$pkgdir/usr/bin/" "$srcdir/keybase-gui"
+ # Upstream launcher / wrapper / autostart service maker
+ install -Dm0755 -t "$pkgdir/usr/bin/" packaging/linux/run_keybase
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+ install -Dm0644 -t "$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
+ install -Dm0644 media/icons/Keybase.iconset/icon_${i}x${i}.png \
+
"$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/keybase.png"
+ install -Dm0644 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/[email protected] \
- "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/keybase.png
- install -Dm644 media/icons/Keybase.iconset/[email protected] \
- "${pkgdir}"/usr/share/icons/hicolor/1024x1024/apps/keybase.png
+ install -Dm0644 media/icons/Keybase.iconset/[email protected] \
+ "$pkgdir/usr/share/icons/hicolor/64x64/apps/keybase.png"
+ install -Dm0644 media/icons/Keybase.iconset/[email protected] \
+ "$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/
+ mkdir -p "$pkgdir/usr/share/keybase-app"
+ cp -r * "$pkgdir/usr/share/keybase-app/"
}
