From 8a112fbd5592272373bcd90d32c0c849fe1fca28 Mon Sep 17 00:00:00 2001 From: heronhaye Date: Tue, 4 Jun 2024 15:53:06 -0400 Subject: [PATCH] Update debian packages (#26971) --- packaging/linux/deb/package_binaries.sh | 3 +-- packaging/linux/smoketest/debian-stable/Vagrantfile | 2 +- packaging/linux/smoketest/fedora/Vagrantfile | 2 +- packaging/linux/test/keybase-arch-test/Dockerfile | 2 +- packaging/linux/test/keybase-ubuntu-systemd-test/Dockerfile | 2 +- packaging/linux/test/keybase-ubuntu-test/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packaging/linux/deb/package_binaries.sh b/packaging/linux/deb/package_binaries.sh index cfd8511eeca8..d3ccb98de92d 100755 --- a/packaging/linux/deb/package_binaries.sh +++ b/packaging/linux/deb/package_binaries.sh @@ -29,13 +29,12 @@ if [ "$mode" = "production" ] ; then repo_url="http://dist.keybase.io/linux/deb/repo" elif [ "$mode" = "prerelease" ] ; then repo_url="http://prerelease.keybase.io/deb" - # debian bullseye removed libappindicator1 in favor of libayatana-appindicator1, so allow both. # "psmisc" provides "killall", which is used in run_keybase and # post_install.sh. # lsof used in post_install.sh # systemd-container provides machinectl, which is used in post_install.sh # 'libasound2, libnss3, libxss1, libxtst6' is required by the GUI (issue #9872 and #17365) - dependencies="Depends: libappindicator1 | libayatana-appindicator1, fuse, libgconf-2-4, psmisc, lsof, procps, libasound2, libnss3, libxss1, libxtst6, libgtk-3-0" + dependencies="Depends: libayatana-appindicator3-1, fuse, psmisc, lsof, procps, libasound2, libnss3, libxss1, libxtst6, libgtk-3-0" elif [ "$mode" = "staging" ] ; then # Note: This doesn't exist yet. But we need to be distinct from the # production URL, because we're moving to a model where we build a clean repo diff --git a/packaging/linux/smoketest/debian-stable/Vagrantfile b/packaging/linux/smoketest/debian-stable/Vagrantfile index 2e842254f38b..fe9342b88d37 100644 --- a/packaging/linux/smoketest/debian-stable/Vagrantfile +++ b/packaging/linux/smoketest/debian-stable/Vagrantfile @@ -1,5 +1,5 @@ Vagrant.configure("2") do |config| - config.vm.box = "debian/bullseye64" + config.vm.box = "debian/bookworm64" config.vm.synced_folder "../vagrantcommon/", "/vagrant", type: "rsync" config.vm.provider "virtualbox" do |vb| vb.memory = "4096" diff --git a/packaging/linux/smoketest/fedora/Vagrantfile b/packaging/linux/smoketest/fedora/Vagrantfile index 30ae5e5e60f1..854e45c78bd7 100644 --- a/packaging/linux/smoketest/fedora/Vagrantfile +++ b/packaging/linux/smoketest/fedora/Vagrantfile @@ -1,5 +1,5 @@ Vagrant.configure("2") do |config| - config.vm.box = "generic/fedora36" + config.vm.box = "bento/fedora-40" config.vm.synced_folder "../vagrantcommon/", "/vagrant", type: "rsync" config.vm.provider "virtualbox" do |vb| vb.memory = "4096" diff --git a/packaging/linux/test/keybase-arch-test/Dockerfile b/packaging/linux/test/keybase-arch-test/Dockerfile index eb9472cd5825..321cc8d986d0 100644 --- a/packaging/linux/test/keybase-arch-test/Dockerfile +++ b/packaging/linux/test/keybase-arch-test/Dockerfile @@ -3,4 +3,4 @@ MAINTAINER Keybase RUN pacman -Syy -RUN pacman -S --noconfirm git binutils fuse gconf libxss gtk3 fakeroot lsof +RUN pacman -S --noconfirm git binutils fuse libxss gtk3 fakeroot lsof diff --git a/packaging/linux/test/keybase-ubuntu-systemd-test/Dockerfile b/packaging/linux/test/keybase-ubuntu-systemd-test/Dockerfile index 74b98002b0c0..62ab8caf0aed 100644 --- a/packaging/linux/test/keybase-ubuntu-systemd-test/Dockerfile +++ b/packaging/linux/test/keybase-ubuntu-systemd-test/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Keybase RUN apt-get update # Install dependencies for keybase -RUN apt-get install -y libappindicator1 fuse libgconf-2-4 psmisc procps lsof +RUN apt-get install -y fuse psmisc procps lsof # Nice to have RUN apt-get install -y vim less curl diff --git a/packaging/linux/test/keybase-ubuntu-test/Dockerfile b/packaging/linux/test/keybase-ubuntu-test/Dockerfile index ca5cd2a81b79..835dec9e793f 100644 --- a/packaging/linux/test/keybase-ubuntu-test/Dockerfile +++ b/packaging/linux/test/keybase-ubuntu-test/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Keybase RUN apt-get update # Install dependencies for keybase -RUN apt-get install -y libappindicator1 fuse libgconf-2-4 psmisc procps lsof +RUN apt-get install -y libappindicator1 fuse psmisc procps lsof # Nice to have RUN apt-get install -y vim less curl sudo