* Re: Ocbil
2019-10-04 4:53 [PR PATCH] Ocbil voidlinux-github
@ 2019-10-04 5:33 ` voidlinux-github
2020-01-07 1:44 ` lxd: update to 3.18 voidlinux-github
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2019-10-04 5:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 703 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/15045#issuecomment-538242968
Comment:
build passes sans lint.
althoUGH, seeing this while testing.
```
Error: Failed instance creation: Create container from image: Unpack image: Unpack failed, Failed to run: unsquashfs -f -d /var/lib/lxd/storage-pools/default/containers/knowing-louse/rootfs -n /var/lib/lxd/images/f009e1cd8d9e1064a8db1e68fa400cd596db8e5fbfa2cbd3f62d28a202e7d5b0.rootfs: FATAL ERROR:write_file: failed to create file /var/lib/lxd/storage-pools/default/containers/knowing-louse/rootfs/usr/lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb, because Too many open files.
```
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: lxd: update to 3.18.
2019-10-04 4:53 [PR PATCH] Ocbil voidlinux-github
2019-10-04 5:33 ` Ocbil voidlinux-github
@ 2020-01-07 1:44 ` voidlinux-github
2020-01-07 4:14 ` [PR PATCH] [Updated] " voidlinux-github
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2020-01-07 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/15045#issuecomment-571394936
Comment:
Hey @CameronNemo I have been running this for my day-to-day stuff for around 2 months now, is this good to go?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] lxd: update to 3.18.
2019-10-04 4:53 [PR PATCH] Ocbil voidlinux-github
2019-10-04 5:33 ` Ocbil voidlinux-github
2020-01-07 1:44 ` lxd: update to 3.18 voidlinux-github
@ 2020-01-07 4:14 ` voidlinux-github
2020-01-07 4:15 ` voidlinux-github
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2020-01-07 4:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by CameronNemo against master on the void-packages repository
https://github.com/CameronNemo/void-packages ocbil
https://github.com/void-linux/void-packages/pull/15045
lxd: update to 3.18.
A patch file from https://github.com/void-linux/void-packages/pull/15045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocbil-15045.patch --]
[-- Type: text/x-diff, Size: 10644 bytes --]
From f23b2fbf2749bd763d6b65f0643ef84016fc1668 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 16 Nov 2019 12:27:14 -0800
Subject: [PATCH 1/5] sqlite-replication: update to 3.30.1.
---
srcpkgs/sqlite-replication/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sqlite-replication/template b/srcpkgs/sqlite-replication/template
index cd6cf735da9..afdc388f563 100644
--- a/srcpkgs/sqlite-replication/template
+++ b/srcpkgs/sqlite-replication/template
@@ -1,8 +1,8 @@
# Template file for 'sqlite-replication'
pkgname=sqlite-replication
-version=3.29.0
-revision=2
-wrksrc="sqlite-version-${version}-replication3"
+version=3.30.1
+revision=1
+wrksrc="sqlite-version-${version}-replication4"
build_style=gnu-configure
configure_args="--enable-replication --enable-threadsafe --enable-dynamic-extensions --enable-fts5"
hostmakedepends="tcl"
@@ -11,8 +11,8 @@ short_desc="Replication Enabled SQL Database Engine in a C Library"
maintainer="Cameron Nemo <camerontnorman@gmail.com>"
license="Public Domain"
homepage="https://github.com/CanonicalLtd/sqlite"
-distfiles="${homepage}/archive/version-${version}+replication3.tar.gz"
-checksum=516ae04b7bef44b6de71fed99f41f1f11afc781495145c7bccf3c1e1073c37be
+distfiles="${homepage}/archive/version-${version}+replication4.tar.gz"
+checksum=e9ab0542396be10e1b2951423f13b3e4d118a18e5d4ef39dc271e7dd17d3910f
replaces="sqlite>=3.8.11.1_3"
provides="sqlite-${version}_${revision}"
shlib_provides="libsqlite3.so"
From cad558b7bc887d573112852ed6de83846e557d50 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Tue, 16 Jul 2019 16:48:32 -0700
Subject: [PATCH 2/5] New package: libco-20.
---
common/shlibs | 2 ++
srcpkgs/libco-devel | 1 +
srcpkgs/libco/template | 26 ++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/libco-devel
create mode 100644 srcpkgs/libco/template
diff --git a/common/shlibs b/common/shlibs
index 611abc88b12..e826c3e3ec2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3709,3 +3709,5 @@ libnvpair.so.1 zfs-0.8.2_1
libjsonnet.so.0 jsonnet-0.14.0_2
libjsonnet++.so.0 jsonnet-0.14.0_2
libigdgmm.so.12 intel-gmmlib-19.3.4_1
+libco.so.0 libco-20_1
+libraft.so.0 raft-0.9.2_1
diff --git a/srcpkgs/libco-devel b/srcpkgs/libco-devel
new file mode 120000
index 00000000000..9cbee396adf
--- /dev/null
+++ b/srcpkgs/libco-devel
@@ -0,0 +1 @@
+libco
\ No newline at end of file
diff --git a/srcpkgs/libco/template b/srcpkgs/libco/template
new file mode 100644
index 00000000000..b17645c6738
--- /dev/null
+++ b/srcpkgs/libco/template
@@ -0,0 +1,26 @@
+# Template file for 'libco'
+pkgname=libco
+version=20
+revision=1
+build_style=gnu-makefile
+short_desc="Cooperative multithreading library written in C89"
+maintainer="Julio Galvan <juliogalvan@protonmail.com>"
+license="ISC"
+homepage="https://github.com/canonical/libco"
+distfiles="https://github.com/canonical/libco/archive/v${version}.tar.gz"
+checksum=6d6d6ada15a36224ee4aa59b8361c4b90f1ffb6c077b4932aa6e6344ee91be0e
+
+post_install() {
+ vlicense LICENSE
+}
+
+libco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
From fbb1349b2e03a5b30a2fef69243e49896cc0dcd7 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Tue, 16 Jul 2019 16:59:54 -0700
Subject: [PATCH 3/5] New package: raft-0.9.9.
---
srcpkgs/raft-devel | 1 +
srcpkgs/raft/template | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
create mode 120000 srcpkgs/raft-devel
create mode 100644 srcpkgs/raft/template
diff --git a/srcpkgs/raft-devel b/srcpkgs/raft-devel
new file mode 120000
index 00000000000..d96c908578a
--- /dev/null
+++ b/srcpkgs/raft-devel
@@ -0,0 +1 @@
+raft
\ No newline at end of file
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
new file mode 100644
index 00000000000..133150d335d
--- /dev/null
+++ b/srcpkgs/raft/template
@@ -0,0 +1,33 @@
+# Template file for 'raft'
+pkgname=raft
+version=0.9.9
+revision=1
+build_style=gnu-configure
+configure_args="--enable-example=no"
+hostmakedepends="pkg-config autoconf automake libtool"
+makedepends="libuv-devel"
+short_desc="C implementation of the Raft consensus protocol"
+maintainer="Julio Galvan <juliogalvan@protonmail.com>"
+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=29cd4e526db56d0d1b5eff04515551c4818ea20bb8e735dc10973a530e75be75
+
+pre_configure() {
+ autoreconf -i
+}
+
+post_install() {
+ vlicense LICENSE
+}
+
+raft-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
From b653f024c616d6c2e334b6aec924db202653ee66 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Mon, 19 Aug 2019 20:58:39 -0700
Subject: [PATCH 4/5] dqlite: update to 1.1.0.
---
srcpkgs/dqlite/template | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index b11c2e93bd9..ec19b6c9beb 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,24 +1,28 @@
# Template file for 'dqlite'
pkgname=dqlite
-version=0.2.6
+version=1.1.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config autoconf automake libtool"
-makedepends="libuv-devel sqlite-replication-devel"
+makedepends="sqlite-replication-devel raft-devel libco-devel"
depends="sqlite-replication"
short_desc="Distributed SQLite database using the Raft algorithm"
maintainer="Cameron Nemo <camerontnorman@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/CanonicalLtd/dqlite"
+license="custom:LGPL-3.0-only-linking-exception"
+homepage="https://github.com/canonical/dqlite"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=47d31550d970a12d25101c331896cfb855128c110d912f5da3371062d9ece52b
+checksum=b03ad557a461beed90cd3d6c13fb9cceb35cdf686fb9b7a5c6db7fd3e7950563
pre_configure() {
autoreconf -i
}
+post_install() {
+ vlicense LICENSE
+}
+
dqlite-devel_package() {
- depends="sqlite-replication-devel dqlite>=${version}_${revision}"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 00301aea34548e54146fe54114918156d38080d4 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 12 Sep 2019 22:57:04 -0700
Subject: [PATCH 5/5] lxd: update to 3.18.
---
srcpkgs/lxd/files/lxd/run | 4 +++
srcpkgs/lxd/patches/seccomp.patch | 41 -------------------------------
srcpkgs/lxd/template | 21 +++-------------
3 files changed, 8 insertions(+), 58 deletions(-)
delete mode 100644 srcpkgs/lxd/patches/seccomp.patch
diff --git a/srcpkgs/lxd/files/lxd/run b/srcpkgs/lxd/files/lxd/run
index 147eb64e74d..c03a2c0d766 100755
--- a/srcpkgs/lxd/files/lxd/run
+++ b/srcpkgs/lxd/files/lxd/run
@@ -6,4 +6,8 @@ fi
if ! mountpoint -q "${_systemd_cgrp}"; then
mount -t cgroup -o none,name=systemd cgroup ${_systemd_cgrp}
fi
+# workaround lxc bug -- next release of lxc should obsolete this
+if [ -e /sys/fs/cgroup/cpuset/cgroup.clone_children ]; then
+ echo 1 > /sys/fs/cgroup/cpuset/cgroup.clone_children 2>/dev/null || :
+fi
exec lxd --group lxd 2>&1
diff --git a/srcpkgs/lxd/patches/seccomp.patch b/srcpkgs/lxd/patches/seccomp.patch
deleted file mode 100644
index e7b52a31931..00000000000
--- a/srcpkgs/lxd/patches/seccomp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-lxc/lxd@a181ed4 [PATCH] seccomp: define __NR_mknod if missing
-lxc/lxd@c655ed5 [PATCH] seccomp: rework missing syscall number definitions
----
- lxd/seccomp.go | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/lxd/seccomp.go b/lxd/seccomp.go
-index 0afad7cacc..32397b9729 100644
---- lxd/seccomp.go
-+++ lxd/seccomp.go
-@@ -109,6 +109,14 @@
- return -EPERM;
- }
-
-+#ifndef __NR_mknodat
-+ #error missing kernel headers
-+#else
-+ #ifdef __NR_mknod
-+ #define LXD_MUST_CHECK_MKNOD
-+ #endif
-+#endif
-+
- static int seccomp_notify_mknod_set_response(int fd_mem, struct seccomp_notify_proxy_msg *msg,
- char *buf, size_t size,
- mode_t *mode, dev_t *dev,
-@@ -124,6 +132,7 @@ static int seccomp_notify_mknod_set_response(int fd_mem, struct seccomp_notify_p
- resp->val = 0;
-
- switch (req->data.nr) {
-+#ifdef LXD_MUST_CHECK_MKNOD
- case __NR_mknod:
- resp->error = device_allowed(req->data.args[2], req->data.args[1]);
- if (resp->error) {
-@@ -143,6 +149,7 @@ static int seccomp_notify_mknod_set_response(int fd_mem, struct seccomp_notify_p
- *pid = req->pid;
-
- break;
-+#endif
- case __NR_mknodat:
- if (req->data.args[0] != AT_FDCWD) {
- errno = EINVAL;
diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template
index 2a9cf44d88d..f2a2a4bf1a1 100644
--- a/srcpkgs/lxd/template
+++ b/srcpkgs/lxd/template
@@ -1,37 +1,24 @@
# Template file for 'lxd'
pkgname=lxd
-version=3.14
+version=3.18
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"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config git"
makedepends="lxc-devel acl-devel dqlite-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager"
-maintainer="Cameron Nemo <camerontnorman@gmail.com>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="Apache-2.0"
homepage="https://linuxcontainers.org/lxd"
distfiles="https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
-checksum=409e4758cbeb43b098d0265c4ce05aeeac5ae73f8914ceb1006e6a6d89fe1fe5
+checksum=b09434e089776fb0c48d384a6e04707ba1d99d60b7b59e8ba573d8c7d7130fdd
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
- vlicense COPYING LICENSE
vsv lxd
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: lxd: update to 3.18.
2019-10-04 4:53 [PR PATCH] Ocbil voidlinux-github
` (2 preceding siblings ...)
2020-01-07 4:14 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-07 4:15 ` voidlinux-github
2020-01-07 5:34 ` [PR PATCH] [Updated] " voidlinux-github
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2020-01-07 4:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/15045#issuecomment-571425568
Comment:
Rebased and pushed, waiting on CI. Once it is green you can try to ask someone with commit privileges to merge it.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] lxd: update to 3.18.
2019-10-04 4:53 [PR PATCH] Ocbil voidlinux-github
` (3 preceding siblings ...)
2020-01-07 4:15 ` voidlinux-github
@ 2020-01-07 5:34 ` voidlinux-github
2020-01-07 6:02 ` voidlinux-github
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2020-01-07 5:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by CameronNemo against master on the void-packages repository
https://github.com/CameronNemo/void-packages ocbil
https://github.com/void-linux/void-packages/pull/15045
lxd: update to 3.18.
A patch file from https://github.com/void-linux/void-packages/pull/15045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ocbil-15045.patch --]
[-- Type: text/x-diff, Size: 10646 bytes --]
From f23b2fbf2749bd763d6b65f0643ef84016fc1668 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 16 Nov 2019 12:27:14 -0800
Subject: [PATCH 1/5] sqlite-replication: update to 3.30.1.
---
srcpkgs/sqlite-replication/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sqlite-replication/template b/srcpkgs/sqlite-replication/template
index cd6cf735da9..afdc388f563 100644
--- a/srcpkgs/sqlite-replication/template
+++ b/srcpkgs/sqlite-replication/template
@@ -1,8 +1,8 @@
# Template file for 'sqlite-replication'
pkgname=sqlite-replication
-version=3.29.0
-revision=2
-wrksrc="sqlite-version-${version}-replication3"
+version=3.30.1
+revision=1
+wrksrc="sqlite-version-${version}-replication4"
build_style=gnu-configure
configure_args="--enable-replication --enable-threadsafe --enable-dynamic-extensions --enable-fts5"
hostmakedepends="tcl"
@@ -11,8 +11,8 @@ short_desc="Replication Enabled SQL Database Engine in a C Library"
maintainer="Cameron Nemo <camerontnorman@gmail.com>"
license="Public Domain"
homepage="https://github.com/CanonicalLtd/sqlite"
-distfiles="${homepage}/archive/version-${version}+replication3.tar.gz"
-checksum=516ae04b7bef44b6de71fed99f41f1f11afc781495145c7bccf3c1e1073c37be
+distfiles="${homepage}/archive/version-${version}+replication4.tar.gz"
+checksum=e9ab0542396be10e1b2951423f13b3e4d118a18e5d4ef39dc271e7dd17d3910f
replaces="sqlite>=3.8.11.1_3"
provides="sqlite-${version}_${revision}"
shlib_provides="libsqlite3.so"
From cad558b7bc887d573112852ed6de83846e557d50 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Tue, 16 Jul 2019 16:48:32 -0700
Subject: [PATCH 2/5] New package: libco-20.
---
common/shlibs | 2 ++
srcpkgs/libco-devel | 1 +
srcpkgs/libco/template | 26 ++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/libco-devel
create mode 100644 srcpkgs/libco/template
diff --git a/common/shlibs b/common/shlibs
index 611abc88b12..e826c3e3ec2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3709,3 +3709,5 @@ libnvpair.so.1 zfs-0.8.2_1
libjsonnet.so.0 jsonnet-0.14.0_2
libjsonnet++.so.0 jsonnet-0.14.0_2
libigdgmm.so.12 intel-gmmlib-19.3.4_1
+libco.so.0 libco-20_1
+libraft.so.0 raft-0.9.2_1
diff --git a/srcpkgs/libco-devel b/srcpkgs/libco-devel
new file mode 120000
index 00000000000..9cbee396adf
--- /dev/null
+++ b/srcpkgs/libco-devel
@@ -0,0 +1 @@
+libco
\ No newline at end of file
diff --git a/srcpkgs/libco/template b/srcpkgs/libco/template
new file mode 100644
index 00000000000..b17645c6738
--- /dev/null
+++ b/srcpkgs/libco/template
@@ -0,0 +1,26 @@
+# Template file for 'libco'
+pkgname=libco
+version=20
+revision=1
+build_style=gnu-makefile
+short_desc="Cooperative multithreading library written in C89"
+maintainer="Julio Galvan <juliogalvan@protonmail.com>"
+license="ISC"
+homepage="https://github.com/canonical/libco"
+distfiles="https://github.com/canonical/libco/archive/v${version}.tar.gz"
+checksum=6d6d6ada15a36224ee4aa59b8361c4b90f1ffb6c077b4932aa6e6344ee91be0e
+
+post_install() {
+ vlicense LICENSE
+}
+
+libco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
From 3cb2e7a8bb99ae5d665db85f310a10db8cacc496 Mon Sep 17 00:00:00 2001
From: Julio Galvan <julio@epazote.net>
Date: Tue, 16 Jul 2019 16:59:54 -0700
Subject: [PATCH 3/5] New package: raft-0.9.16.
---
srcpkgs/raft-devel | 1 +
srcpkgs/raft/template | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
create mode 120000 srcpkgs/raft-devel
create mode 100644 srcpkgs/raft/template
diff --git a/srcpkgs/raft-devel b/srcpkgs/raft-devel
new file mode 120000
index 00000000000..d96c908578a
--- /dev/null
+++ b/srcpkgs/raft-devel
@@ -0,0 +1 @@
+raft
\ No newline at end of file
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
new file mode 100644
index 00000000000..1118fa774ec
--- /dev/null
+++ b/srcpkgs/raft/template
@@ -0,0 +1,33 @@
+# Template file for 'raft'
+pkgname=raft
+version=0.9.16
+revision=1
+build_style=gnu-configure
+configure_args="--enable-example=no"
+hostmakedepends="pkg-config autoconf automake libtool"
+makedepends="libuv-devel"
+short_desc="C implementation of the Raft consensus protocol"
+maintainer="Julio Galvan <juliogalvan@protonmail.com>"
+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=b4c4ac15dd74a4c2bbe86149cb5fc1b937979a62e97439615175e3e218fac512
+
+pre_configure() {
+ autoreconf -i
+}
+
+post_install() {
+ vlicense LICENSE
+}
+
+raft-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
From 83cced9029503d37e05682933a522a17e18ae6bc Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Mon, 19 Aug 2019 20:58:39 -0700
Subject: [PATCH 4/5] dqlite: update to 1.3.0.
---
srcpkgs/dqlite/template | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index b11c2e93bd9..356311616cb 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,24 +1,28 @@
# Template file for 'dqlite'
pkgname=dqlite
-version=0.2.6
+version=1.3.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config autoconf automake libtool"
-makedepends="libuv-devel sqlite-replication-devel"
+makedepends="sqlite-replication-devel raft-devel libco-devel"
depends="sqlite-replication"
short_desc="Distributed SQLite database using the Raft algorithm"
maintainer="Cameron Nemo <camerontnorman@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/CanonicalLtd/dqlite"
+license="custom:LGPL-3.0-only-linking-exception"
+homepage="https://github.com/canonical/dqlite"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=47d31550d970a12d25101c331896cfb855128c110d912f5da3371062d9ece52b
+checksum=22e3d281c396cc409e4afced20e143c4a014b036146945e30f9ebf3bee410865
pre_configure() {
autoreconf -i
}
+post_install() {
+ vlicense LICENSE
+}
+
dqlite-devel_package() {
- depends="sqlite-replication-devel dqlite>=${version}_${revision}"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From e6cfaa9ca5b3dc6b031eb7da21ef882567838afb Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 12 Sep 2019 22:57:04 -0700
Subject: [PATCH 5/5] lxd: update to 3.18.
---
srcpkgs/lxd/files/lxd/run | 4 +++
srcpkgs/lxd/patches/seccomp.patch | 41 -------------------------------
srcpkgs/lxd/template | 21 +++-------------
3 files changed, 8 insertions(+), 58 deletions(-)
delete mode 100644 srcpkgs/lxd/patches/seccomp.patch
diff --git a/srcpkgs/lxd/files/lxd/run b/srcpkgs/lxd/files/lxd/run
index 147eb64e74d..c03a2c0d766 100755
--- a/srcpkgs/lxd/files/lxd/run
+++ b/srcpkgs/lxd/files/lxd/run
@@ -6,4 +6,8 @@ fi
if ! mountpoint -q "${_systemd_cgrp}"; then
mount -t cgroup -o none,name=systemd cgroup ${_systemd_cgrp}
fi
+# workaround lxc bug -- next release of lxc should obsolete this
+if [ -e /sys/fs/cgroup/cpuset/cgroup.clone_children ]; then
+ echo 1 > /sys/fs/cgroup/cpuset/cgroup.clone_children 2>/dev/null || :
+fi
exec lxd --group lxd 2>&1
diff --git a/srcpkgs/lxd/patches/seccomp.patch b/srcpkgs/lxd/patches/seccomp.patch
deleted file mode 100644
index e7b52a31931..00000000000
--- a/srcpkgs/lxd/patches/seccomp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-lxc/lxd@a181ed4 [PATCH] seccomp: define __NR_mknod if missing
-lxc/lxd@c655ed5 [PATCH] seccomp: rework missing syscall number definitions
----
- lxd/seccomp.go | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/lxd/seccomp.go b/lxd/seccomp.go
-index 0afad7cacc..32397b9729 100644
---- lxd/seccomp.go
-+++ lxd/seccomp.go
-@@ -109,6 +109,14 @@
- return -EPERM;
- }
-
-+#ifndef __NR_mknodat
-+ #error missing kernel headers
-+#else
-+ #ifdef __NR_mknod
-+ #define LXD_MUST_CHECK_MKNOD
-+ #endif
-+#endif
-+
- static int seccomp_notify_mknod_set_response(int fd_mem, struct seccomp_notify_proxy_msg *msg,
- char *buf, size_t size,
- mode_t *mode, dev_t *dev,
-@@ -124,6 +132,7 @@ static int seccomp_notify_mknod_set_response(int fd_mem, struct seccomp_notify_p
- resp->val = 0;
-
- switch (req->data.nr) {
-+#ifdef LXD_MUST_CHECK_MKNOD
- case __NR_mknod:
- resp->error = device_allowed(req->data.args[2], req->data.args[1]);
- if (resp->error) {
-@@ -143,6 +149,7 @@ static int seccomp_notify_mknod_set_response(int fd_mem, struct seccomp_notify_p
- *pid = req->pid;
-
- break;
-+#endif
- case __NR_mknodat:
- if (req->data.args[0] != AT_FDCWD) {
- errno = EINVAL;
diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template
index 2a9cf44d88d..f2a2a4bf1a1 100644
--- a/srcpkgs/lxd/template
+++ b/srcpkgs/lxd/template
@@ -1,37 +1,24 @@
# Template file for 'lxd'
pkgname=lxd
-version=3.14
+version=3.18
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"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config git"
makedepends="lxc-devel acl-devel dqlite-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager"
-maintainer="Cameron Nemo <camerontnorman@gmail.com>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="Apache-2.0"
homepage="https://linuxcontainers.org/lxd"
distfiles="https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
-checksum=409e4758cbeb43b098d0265c4ce05aeeac5ae73f8914ceb1006e6a6d89fe1fe5
+checksum=b09434e089776fb0c48d384a6e04707ba1d99d60b7b59e8ba573d8c7d7130fdd
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
- vlicense COPYING LICENSE
vsv lxd
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: lxd: update to 3.18.
2019-10-04 4:53 [PR PATCH] Ocbil voidlinux-github
` (4 preceding siblings ...)
2020-01-07 5:34 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-07 6:02 ` voidlinux-github
2020-01-25 0:09 ` voidlinux-github
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2020-01-07 6:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/15045#issuecomment-571448946
Comment:
CI fluke. I built with x86_64 and it was fine.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: lxd: update to 3.18.
2019-10-04 4:53 [PR PATCH] Ocbil voidlinux-github
` (5 preceding siblings ...)
2020-01-07 6:02 ` voidlinux-github
@ 2020-01-25 0:09 ` voidlinux-github
2020-01-26 4:04 ` [PR PATCH] [Closed]: " voidlinux-github
2020-01-26 4:04 ` voidlinux-github
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2020-01-25 0:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/15045#issuecomment-578350255
Comment:
Is this superseded by #18327?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Closed]: lxd: update to 3.18.
2019-10-04 4:53 [PR PATCH] Ocbil voidlinux-github
` (6 preceding siblings ...)
2020-01-25 0:09 ` voidlinux-github
@ 2020-01-26 4:04 ` voidlinux-github
2020-01-26 4:04 ` voidlinux-github
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2020-01-26 4:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
There's a closed pull request on the void-packages repository
lxd: update to 3.18.
https://github.com/void-linux/void-packages/pull/15045
Description:
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: lxd: update to 3.18.
2019-10-04 4:53 [PR PATCH] Ocbil voidlinux-github
` (7 preceding siblings ...)
2020-01-26 4:04 ` [PR PATCH] [Closed]: " voidlinux-github
@ 2020-01-26 4:04 ` voidlinux-github
8 siblings, 0 replies; 10+ messages in thread
From: voidlinux-github @ 2020-01-26 4:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 149 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/15045#issuecomment-578466569
Comment:
yeah
^ permalink raw reply [flat|nested] 10+ messages in thread