From 57f94677c5627b7af96ff6fe3f0643a3670364cb Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 22 Apr 2022 19:42:22 -0700 Subject: [PATCH 1/4] lxd-lts: remove package I do not have the bandwidth to maintain two versions, and the LTS version has a conflicting dependency with the non-LTS version. --- srcpkgs/lxd-lts/INSTALL.msg | 11 --------- srcpkgs/lxd-lts/files/lxd/run | 9 ------- srcpkgs/lxd-lts/template | 39 ------------------------------- srcpkgs/removed-packages/template | 3 ++- 4 files changed, 2 insertions(+), 60 deletions(-) delete mode 100755 srcpkgs/lxd-lts/INSTALL.msg delete mode 100755 srcpkgs/lxd-lts/files/lxd/run delete mode 100644 srcpkgs/lxd-lts/template diff --git a/srcpkgs/lxd-lts/INSTALL.msg b/srcpkgs/lxd-lts/INSTALL.msg deleted file mode 100755 index 966174f8132d..000000000000 --- a/srcpkgs/lxd-lts/INSTALL.msg +++ /dev/null @@ -1,11 +0,0 @@ -Start lxd service: - - $ sudo ln -s /etc/sv/lxd /var/service - -Run LXD initialization: - - $ sudo lxd init - -To use lxd client your user must be added to the 'lxd' group: - - $ sudo usermod -aG lxd diff --git a/srcpkgs/lxd-lts/files/lxd/run b/srcpkgs/lxd-lts/files/lxd/run deleted file mode 100755 index 147eb64e74dc..000000000000 --- a/srcpkgs/lxd-lts/files/lxd/run +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -_systemd_cgrp="/sys/fs/cgroup/systemd" -if [ ! -d ${_systemd_cgrp} ]; then - mkdir ${_systemd_cgrp} -fi -if ! mountpoint -q "${_systemd_cgrp}"; then - mount -t cgroup -o none,name=systemd cgroup ${_systemd_cgrp} -fi -exec lxd --group lxd 2>&1 diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template deleted file mode 100644 index 42e8a958093f..000000000000 --- a/srcpkgs/lxd-lts/template +++ /dev/null @@ -1,39 +0,0 @@ -# Template file for 'lxd-lts' -pkgname=lxd-lts -version=4.0.4 -revision=1 -wrksrc="lxd-$version" -build_style=go -go_import_path="github.com/lxc/lxd" -go_build_tags="libsqlite3" -go_package="${go_import_path}/lxd ${go_import_path}/lxc - ${go_import_path}/lxd-p2c ${go_import_path}/fuidshift" -hostmakedepends="pkg-config" -makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel" -depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables" -short_desc="Next generation system container manager (long term support channel)" -maintainer="Cameron Nemo " -license="Apache-2.0" -homepage="https://linuxcontainers.org/lxd" -distfiles="https://linuxcontainers.org/downloads/lxd/${wrksrc}.tar.gz" -checksum=372a666b84c7cbcb7ccbffbf4aa04a05b2fe22e5e0aafa022b700bbf211557f6 -conflicts="lxd" -provides="lxd-${version}_${revision}" -system_groups="lxd" - -do_configure() { - # the LXD tarball packages up the required dependencies - ln -s "$wrksrc/_dist" "$GOPATH" -} - -do_build() { - # don't go-get the dependencies, just install with what's there - cd "$GOSRCPATH" - go_package=${go_package:-$go_import_path} - go install -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package} -} - -post_install() { - vinstall scripts/bash/lxd-client 644 /usr/share/bash-completion/completions lxd - vsv lxd -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 0923c53cfc05..72191ecdbf85 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=69 +revision=70 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -244,6 +244,7 @@ replaces=" luxmark<=3.1_9 luxrays-devel<=3.1_18 luxrays<=3.1_18 + lxd-lts<=4.0.4_1 mac<=3.99u4b5s7_3 mailpile<=0.5.2_4 masterpassword-cli<=2.6_5 From a22c74d66f86a87900790a97b23e397482a110d6 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 22 Apr 2022 19:43:07 -0700 Subject: [PATCH 2/4] raft: update to 0.13.0 --- common/shlibs | 2 +- srcpkgs/raft/template | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 11328b15a9cc..c9a904bf65d1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3888,7 +3888,7 @@ libigraph.so.0 igraph-0.9.4_1 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1 librdkafka.so.1 librdkafka-1.4.4_3 librdkafka++.so.1 librdkafka-1.4.4_3 -libraft.so.0 raft-0.9.16_1 +libraft.so.2 raft-0.13.0_1 libmdnsd.so.1 libmdnsd-0.9_1 libosdGPU.so.3.4.3 OpenSubdiv-3.4.3_1 libosdCPU.so.3.4.3 OpenSubdiv-3.4.3_1 diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template index 85f12e9dd445..98ecc91fc144 100644 --- a/srcpkgs/raft/template +++ b/srcpkgs/raft/template @@ -1,6 +1,6 @@ # Template file for 'raft' pkgname=raft -version=0.11.2 +version=0.13.0 revision=1 build_style=gnu-configure configure_args="--enable-example=no" @@ -11,7 +11,8 @@ maintainer="Julio Galvan " license="custom:LGPL-3.0-only-linking-exception" homepage="https://github.com/canonical/raft" distfiles="https://github.com/canonical/raft/archive/v${version}.tar.gz" -checksum=c89fd6a6fa3c9e6d670b74e389b2d028dfd39d1eec2b18661fae73a9bfd6b89d +checksum=91b2b0437f443a60498cdf8c53da8a5934a51eee983d2f6eb6f0c8e40af07a8c +# https://github.com/void-linux/void-packages/pull/33347#issuecomment-937392150 make_check=ci-skip pre_configure() { From 5d3edf9d024d40552890e87c2761c98dfd820357 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 22 Apr 2022 19:43:20 -0700 Subject: [PATCH 3/4] dqlite: update to 1.10.0 --- srcpkgs/dqlite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template index 41af8cde377d..e7bccbc107aa 100644 --- a/srcpkgs/dqlite/template +++ b/srcpkgs/dqlite/template @@ -1,6 +1,6 @@ # Template file for 'dqlite' pkgname=dqlite -version=1.9.0 +version=1.10.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake libtool" @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="custom:LGPL-3.0-only-linking-exception" homepage="https://github.com/canonical/dqlite" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=b3f23019bcdc030b8f1d97ef585a34b24128414d6c2e79fcf729e053578d80a7 +checksum=46f57036bd5ac4c67b76c07ef3ce58b674458eb1564131c80f11a2d5ec7db962 pre_configure() { autoreconf -i From 8419e1c9baa2df6fb739ac9a2c626dffebfa299e Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 22 Apr 2022 19:43:31 -0700 Subject: [PATCH 4/4] lxd: update to 5.0.0 --- srcpkgs/lxd/template | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template index d216d7bb7f7c..df07ba816559 100644 --- a/srcpkgs/lxd/template +++ b/srcpkgs/lxd/template @@ -1,12 +1,16 @@ # Template file for 'lxd' pkgname=lxd -version=4.19 +version=5.0.0 revision=1 build_style=go go_import_path=github.com/lxc/lxd go_build_tags=libsqlite3 -go_package="${go_import_path}/lxd ${go_import_path}/lxc - ${go_import_path}/lxd-p2c ${go_import_path}/fuidshift" +go_package="${go_import_path}/lxd + ${go_import_path}/lxc + ${go_import_path}/lxc-to-lxd + ${go_import_path}/fuidshift + ${go_import_path}/lxd-benchmark + ${go_import_path}/lxd-user" hostmakedepends="pkg-config git" makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel" depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs" @@ -16,12 +20,18 @@ license="Apache-2.0" homepage="https://linuxcontainers.org/lxd" changelog="https://github.com/lxc/lxd/releases" distfiles="https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" -checksum=6e4cf6cb1549e1b56802d64ad24d812914e0c0102bfcf146bb18a8dcd1fbab57 +checksum=a99b7edfb52c8195b2de4988844d32d73be6426f6cff28408250517b238fdef9 system_groups="lxd" # whitelist dqlite LDFLAGS export CGO_LDFLAGS_ALLOW='-Wl,-z,now' +post_build() { + # these need special tags and/or LDFLAGS + CGO_LDFLAGS="$CGO_LDFLAGS -static" go install -p "$XBPS_MAKEJOBS" -mod=vendor -x -tags "agent" -ldflags "${go_ldflags}" "${go_import_path}/lxd-agent" + go install -p "$XBPS_MAKEJOBS" -mod=vendor -x -tags "netgo" -ldflags "${go_ldflags}" "${go_import_path}/lxd-migrate" +} + post_install() { vinstall scripts/bash/lxd-client 644 /usr/share/bash-completion/completions lxd vsv lxd