[PR PATCH] lxd 5.9

[PR PATCH] lxd 5.9

[CameronNemo]

[-- Attachment #1: Type: text/plain, Size: 1274 bytes --]

There is a new pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages lxd
https://github.com/void-linux/void-packages/pull/41096

lxd 5.9
- raft: update to 0.16.0
- dqlite: update to 1.13.0
- lxd: update to 5.9

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41096.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lxd-41096.patch --]
[-- Type: text/x-diff, Size: 4369 bytes --]

From e942cb1a499d6545f4ed9760075d90cead351707 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
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 <cam@nohom.org>"
 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 f9a57e4a78c909ecc266aa6e9c18581aac69a98c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
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           |  4 ++--
 2 files changed, 33 insertions(+), 2 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 <cam@nohom.org>
+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 <sys/fcntl.h> to <fcntl.h> [-Werror=cpp]
+        1 | #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h>
+          |  ^~~~~~~
+    cc1: all warnings being treated as errors
+    make: *** [Makefile:1314: src/vfs.lo] Error 1
+    
+    Signed-off-by: Cameron Nemo <cam@nohom.org>
+
+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 <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index f03c26efee5a..c67a8399e102 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"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cam@nohom.org>"
 license="custom:LGPL-3.0-only-linking-exception"
 homepage="https://github.com/canonical/dqlite"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f900b81b7ba66ba654c734f7fc9f01caf462408f3751f5357019db0c18d438b5
+checksum=14334a72389322d047576697f112da4cd6e1a5257d652d6162f195f2855fcd12
 
 pre_configure() {
 	autoreconf -i

From 7cb89a4557ef6f1cccf96fa967b127b26be19989 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
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

Re: [PR REVIEW] lxd 5.9

[paper42]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41096#discussion_r1051583002

Comment:
```suggestion
distfiles="https://github.com/canonical/dqlite/archive/v${version}.tar.gz"
```

Re: [PR PATCH] [Updated] lxd 5.9

[CameronNemo]

[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]

There is an updated pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages lxd
https://github.com/void-linux/void-packages/pull/41096

lxd 5.9
- raft: update to 0.16.0
- dqlite: update to 1.13.0
- lxd: update to 5.9

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41096.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lxd-41096.patch --]
[-- Type: text/x-diff, Size: 4512 bytes --]

From 4e03375cfe05440a49b0403843e79c25863b5d32 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
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 <cam@nohom.org>"
 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 <cam@nohom.org>
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 <cam@nohom.org>
+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 <sys/fcntl.h> to <fcntl.h> [-Werror=cpp]
+        1 | #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h>
+          |  ^~~~~~~
+    cc1: all warnings being treated as errors
+    make: *** [Makefile:1314: src/vfs.lo] Error 1
+    
+    Signed-off-by: Cameron Nemo <cam@nohom.org>
+
+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 <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
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 <cam@nohom.org>"
 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 <cam@nohom.org>
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

Re: [PR PATCH] [Merged]: lxd 5.9

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]

There's a merged pull request on the void-packages repository

lxd 5.9
https://github.com/void-linux/void-packages/pull/41096

Description:
- raft: update to 0.16.0
- dqlite: update to 1.13.0
- lxd: update to 5.9

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->