From a0ba9be17c165d0a6e815bce3bb9efe51ee6da18 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 30 Oct 2019 17:43:16 +1100 Subject: [PATCH 1/4] add new package: raft-0.9.7 --- common/shlibs | 1 + srcpkgs/raft/template | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 srcpkgs/raft/template diff --git a/common/shlibs b/common/shlibs index a79ef996138..37fcbe98a7a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -609,6 +609,7 @@ libcanberra.so.0 libcanberra-0.23_1 libcanberra-gtk.so.0 libcanberra-gtk-0.30_6 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6 libgtop-2.0.so.11 libgtop-2.38.0_1 +libraft.so.0 raft-0.9.7_1 librarian.so.0 rarian-0.8.1_1 libmusikcore.so musikcube-0.60.1_1 libgnome-menu-3.so.0 gnome-menus-2.91.6_1 diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template new file mode 100644 index 00000000000..7d2dd569abc --- /dev/null +++ b/srcpkgs/raft/template @@ -0,0 +1,27 @@ +# Template file for 'raft' +pkgname=raft +version=0.9.7 +revision=1 +build_style=gnu-configure +hostmakedepends="autoconf automake libtool pkg-config" +makedepends="libuv-devel" +short_desc="C implementation of the Raft consensus protocol" +maintainer="fosslinux " +license="LGPL-3.0-only" +homepage="https://github.com/canonical/raft" +distfiles="https://github.com/canonical/raft/archive/v${version}.tar.gz" +checksum=789d39ca2e9272cf7a564e1584de8abb82983b09b7c97a8a5eeaa2ecf0de29b6 + +pre_configure() { + autoreconf -i +} + +raft-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + vmove "usr/include" + vmove "usr/lib/pkgconfig" + } +} From 4d293788084e866125bb956e7176e8104cfda418 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 30 Oct 2019 17:44:15 +1100 Subject: [PATCH 2/4] add new package: libco-19.1 --- common/shlibs | 1 + srcpkgs/libco-devel | 1 + srcpkgs/libco/template | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 120000 srcpkgs/libco-devel create mode 100644 srcpkgs/libco/template diff --git a/common/shlibs b/common/shlibs index 37fcbe98a7a..539d814f3f7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -221,6 +221,7 @@ libgirepository-1.0.so.1 libgirepository-1.30_1 libudev.so.1 eudev-libudev-1.6_1 libgudev-1.0.so.0 libgudev-230_1 libext2fs.so.2 e2fsprogs-libs-1.41.5_1 +libco.so.0 libco-19.1_1 libcom_err.so.2 e2fsprogs-libs-1.41.5_1 libe2p.so.2 e2fsprogs-libs-1.41.5_1 libss.so.2 e2fsprogs-libs-1.41.5_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..ba8581bc1ca --- /dev/null +++ b/srcpkgs/libco/template @@ -0,0 +1,26 @@ +# Template file for 'libco' +pkgname=libco +version=19.1 +revision=1 +build_style=gnu-makefile +hostmakedepends="autoconf automake libtool" +short_desc="Cooperative multithreading library written in C89" +maintainer="fosslinux " +license="ISC" +homepage="https://code.byuu.org/libco" +distfiles="https://github.com/canonical/libco/archive/v${version}.tar.gz" +checksum=0cbb3a6ba23c5985683ba0be213bb33bd617490aeb54a4d4421967a4fe9e2b95 + +post_install() { + vlicense LICENSE +} + +libco-devel_package() { + short_desc+=" - development files" + pkg_install() { + vmove "usr/lib/*.so" + vmove "usr/lib/*.a" + vmove "usr/include" + vmove "usr/lib/pkgconfig" + } +} From 1482bfbfe1286643b8d0aa272df4ba880d0c8272 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 30 Oct 2019 17:49:43 +1100 Subject: [PATCH 3/4] dqlite: update to 1.01 --- common/shlibs | 2 +- srcpkgs/dqlite/template | 6 +++--- srcpkgs/raft-devel | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/raft-devel diff --git a/common/shlibs b/common/shlibs index 539d814f3f7..abd38f81b1a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3370,7 +3370,7 @@ libcsfml-system.so.2.5 CSFML-2.5_1 libcsfml-network.so.2.5 CSFML-2.5_1 libtokyocabinet.so.9 tokyocabinet-1.4.48_1 libdav1d.so.3 libdav1d3-0.5.0_1 -libdqlite.so.0 dqlite-0.2.1_1 +libdqlite.so.0 dqlite-1.0.1_1 libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1 diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template index b11c2e93bd9..3c156bc69c8 100644 --- a/srcpkgs/dqlite/template +++ b/srcpkgs/dqlite/template @@ -1,17 +1,17 @@ # Template file for 'dqlite' pkgname=dqlite -version=0.2.6 +version=1.0.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config autoconf automake libtool" -makedepends="libuv-devel sqlite-replication-devel" +makedepends="raft raft-devel libco-devel libuv-devel sqlite-replication-devel" depends="sqlite-replication" short_desc="Distributed SQLite database using the Raft algorithm" maintainer="Cameron Nemo " license="Apache-2.0" homepage="https://github.com/CanonicalLtd/dqlite" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=47d31550d970a12d25101c331896cfb855128c110d912f5da3371062d9ece52b +checksum=42d0684523728f169a8024cbd9cd1909b2a6a5ba5c62d8903625bd4c61c79cf8 pre_configure() { autoreconf -i 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 From ddca52a6d9b3fd744d6c9cc5c71d5019391d3e0e Mon Sep 17 00:00:00 2001 From: fosslinux Date: Tue, 29 Oct 2019 19:47:27 +1100 Subject: [PATCH 4/4] lxd: update to 3.18 --- srcpkgs/lxd/patches/seccomp.patch | 41 ------------------------------- srcpkgs/lxd/template | 9 +++---- 2 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 srcpkgs/lxd/patches/seccomp.patch 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..42d5481520c 100644 --- a/srcpkgs/lxd/template +++ b/srcpkgs/lxd/template @@ -1,6 +1,6 @@ # Template file for 'lxd' pkgname=lxd -version=3.14 +version=3.18 revision=1 build_style=go go_import_path=github.com/lxc/lxd @@ -8,19 +8,19 @@ 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" +makedepends="raft-devel libco-devel 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 " 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" + ln -s "$wrksrc/_dist" "$GOPATH" } do_build() { @@ -32,6 +32,5 @@ do_build() { post_install() { vinstall scripts/bash/lxd-client 644 /usr/share/bash-completion/completions lxd - vlicense COPYING LICENSE vsv lxd }