From 4e03375cfe05440a49b0403843e79c25863b5d32 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Wed, 14 Dec 2022 15:34:11 -0800 Subject: [PATCH 1/3] raft: update to 0.16.0 --- srcpkgs/raft/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template index cfaed3f81b05..39cd14ecf3e8 100644 --- a/srcpkgs/raft/template +++ b/srcpkgs/raft/template @@ -1,6 +1,6 @@ # Template file for 'raft' pkgname=raft -version=0.15.0 +version=0.16.0 revision=1 build_style=gnu-configure configure_args="--enable-example=no" @@ -11,7 +11,7 @@ maintainer="Cameron Nemo " 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=33fd7ecdeb2d822beda5ac8964562f31a05aa817483bb63835ad7bab171f2d02 +checksum=ab5480c051bfbf482074f62c9c306d08ca68b8f0ad0c2db2ebf0488cfe692336 # test/unit/uv and test/integration/uv fail on CI make_check=ci-skip From 6727416d4a9406b22febd8bab500fe8e62ad4e64 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Wed, 14 Dec 2022 15:47:19 -0800 Subject: [PATCH 2/3] dqlite: update to 1.13.0 --- srcpkgs/dqlite/patches/musl.patch | 31 +++++++++++++++++++++++++++++++ srcpkgs/dqlite/template | 6 +++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/dqlite/patches/musl.patch diff --git a/srcpkgs/dqlite/patches/musl.patch b/srcpkgs/dqlite/patches/musl.patch new file mode 100644 index 000000000000..ab6a0395494e --- /dev/null +++ b/srcpkgs/dqlite/patches/musl.patch @@ -0,0 +1,31 @@ +commit dcc017a506a5d616d1ff511cfc590a7255f28de1 +Author: Cameron Nemo +Date: Wed Dec 14 15:41:15 2022 -0800 + + vfs: fix include on musl + + On musl, this fails to compile due to -Werror=cpp: + + CC src/vfs.lo + In file included from src/vfs.c:6: + /usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include to [-Werror=cpp] + 1 | #warning redirecting incorrect #include to + | ^~~~~~~ + cc1: all warnings being treated as errors + make: *** [Makefile:1314: src/vfs.lo] Error 1 + + Signed-off-by: Cameron Nemo + +diff --git a/src/vfs.c b/src/vfs.c +index 03df980..1760c62 100644 +--- a/src/vfs.c ++++ b/src/vfs.c +@@ -3,7 +3,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template index f03c26efee5a..d6f1ed50506d 100644 --- a/srcpkgs/dqlite/template +++ b/srcpkgs/dqlite/template @@ -1,6 +1,6 @@ # Template file for 'dqlite' pkgname=dqlite -version=1.11.1 +version=1.13.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake libtool" @@ -9,8 +9,8 @@ short_desc="Distributed SQLite database using the Raft algorithm" 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=f900b81b7ba66ba654c734f7fc9f01caf462408f3751f5357019db0c18d438b5 +distfiles="https://github.com/canonical/dqlite/archive/v${version}.tar.gz" +checksum=14334a72389322d047576697f112da4cd6e1a5257d652d6162f195f2855fcd12 pre_configure() { autoreconf -i From 3d05fc81d4ac5dfdef22aafd5a47793ba57f446e Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Wed, 14 Dec 2022 15:53:04 -0800 Subject: [PATCH 3/3] lxd: update to 5.9 --- srcpkgs/lxd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template index d28bf0ca9d6b..0a9910fffe16 100644 --- a/srcpkgs/lxd/template +++ b/srcpkgs/lxd/template @@ -1,6 +1,6 @@ # Template file for 'lxd' pkgname=lxd -version=5.6 +version=5.9 revision=1 build_style=go go_import_path=github.com/lxc/lxd @@ -20,7 +20,7 @@ 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=6cb2a5f4ea6fc57a339aa8d7f21636c4889579cb418a8843c53cdde5dbb9c3ee +checksum=a24cf7fbe3e5527a34deda7e8e92f17c05a51498723821f69b146d1e8e58117f system_groups="lxd" # whitelist dqlite LDFLAGS