From 2e361f01693e4aaf9d58dae918f76113d79c697c Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Tue, 16 Jul 2019 16:48:32 -0700 Subject: [PATCH 1/5] New package: libco-19.1. --- 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 09df4f3ceca..288da6538d3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3508,3 +3508,5 @@ libdrumstick-file.so.1 drumstick-1.1.2_1 libdrumstick-alsa.so.1 drumstick-1.1.2_1 libdrumstick-rt.so.1 drumstick-1.1.2_1 libnozzle.so.1 libnozzle1-1.11_2 +libco.so.0 libco-1.0.2_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..eb0e3eb9c97 --- /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 +short_desc="Cooperative multithreading library written in C89" +maintainer="Julio Galvan " +license="ISC" +homepage="https://github.com/canonical/libco" +distfiles="https://github.com/canonical/libco/archive/v${version}.tar.gz" +checksum=0cbb3a6ba23c5985683ba0be213bb33bd617490aeb54a4d4421967a4fe9e2b95 + +post_install() { + vlicense LICENSE +} + +libco-devel_package() { + depends="libco>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From 7e0c1259bde627f2751f0f83aae88e2a3addec74 Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Tue, 16 Jul 2019 16:59:54 -0700 Subject: [PATCH 2/5] New package: raft-0.9.3 --- srcpkgs/raft-devel | 1 + srcpkgs/raft/template | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 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..201fad9888c --- /dev/null +++ b/srcpkgs/raft/template @@ -0,0 +1,29 @@ +# Template file for 'raft' +pkgname=raft +version=0.9.5 +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 " +license="Apache-2.0" +homepage="https://github.com/CanonicalLtd/raft" +distfiles="https://github.com/CanonicalLtd/raft/archive/v${version}.tar.gz" +checksum=1f8e2530462546b39e5915c49b66ece41770fc40e7b1e537cf7a7fadabb5a87d + +pre_configure() { + autoreconf -i +} + +raft-devel_package() { + depends="${makedepends} raft>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From 7f58a6a19c94e22eb92468c62723f37ea556490d Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 19 Aug 2019 20:58:26 -0700 Subject: [PATCH 3/5] sqlite-replication: update to 3.29.0. --- srcpkgs/sqlite-replication/template | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/srcpkgs/sqlite-replication/template b/srcpkgs/sqlite-replication/template index b5b1063d8ca..818999f159d 100644 --- a/srcpkgs/sqlite-replication/template +++ b/srcpkgs/sqlite-replication/template @@ -1,10 +1,10 @@ # Template file for 'sqlite-replication' pkgname=sqlite-replication -version=3.28.0 +version=3.29.0 revision=1 wrksrc="sqlite-version-${version}-replication3" build_style=gnu-configure -configure_args="--enable-wal-replication --enable-threadsafe --enable-dynamic-extensions --enable-fts5" +configure_args="--enable-replication --enable-threadsafe --enable-dynamic-extensions --enable-fts5" hostmakedepends="tcl" makedepends="libedit-devel" short_desc="Replication Enabled SQL Database Engine in a C Library" @@ -12,7 +12,7 @@ maintainer="Cameron Nemo " license="Public Domain" homepage="https://github.com/CanonicalLtd/sqlite" distfiles="${homepage}/archive/version-${version}+replication3.tar.gz" -checksum=3e52fb92ef8f66ba640145941f05aabbffb4f422a0b9a42a97b6806e2c3c6812 +checksum=516ae04b7bef44b6de71fed99f41f1f11afc781495145c7bccf3c1e1073c37be replaces="sqlite>=3.8.11.1_3" provides="sqlite-${version}_${revision}" shlib_provides="libsqlite3.so" @@ -26,9 +26,6 @@ CFLAGS+=" -DHAVE_FDATASYNC" disable_parallel_build=yes pre_configure() { - printf -- "D 2019-03-09T15:45:46\n" > manifest - printf -- "8250984a368079bb1838d48d99f8c1a6282e00bc" > manifest.uuid - sed -i -e 's/ -ltinfo//g' configure } From 3c9824355617f078a3d762e96de53914e703a7bd Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Mon, 19 Aug 2019 20:58:39 -0700 Subject: [PATCH 4/5] dqlite: update to 1.0.0. --- srcpkgs/dqlite/patches/musl.patch | 13 +++++++++++++ srcpkgs/dqlite/template | 8 ++++---- 2 files changed, 17 insertions(+), 4 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 00000000000..283db0e2a56 --- /dev/null +++ b/srcpkgs/dqlite/patches/musl.patch @@ -0,0 +1,13 @@ +diff --git src/vfs.c src/vfs.c +index 31e138c..5d2a7c4 100644 +--- src/vfs.c ++++ src/vfs.c +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + + #include + + diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template index b11c2e93bd9..0f50d7b5779 100644 --- a/srcpkgs/dqlite/template +++ b/srcpkgs/dqlite/template @@ -1,24 +1,24 @@ # Template file for 'dqlite' pkgname=dqlite -version=0.2.6 +version=1.0.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 " license="Apache-2.0" homepage="https://github.com/CanonicalLtd/dqlite" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=47d31550d970a12d25101c331896cfb855128c110d912f5da3371062d9ece52b +checksum=f68a04f41829e453831b6ce71840370b16e793c735a0ded291cba95b24f7f254 pre_configure() { autoreconf -i } dqlite-devel_package() { - depends="sqlite-replication-devel dqlite>=${version}_${revision}" + depends="${makedepends} dqlite>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 23c52cd2676fa884858e034188cb34a52d8c30fd Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 12 Sep 2019 22:57:04 -0700 Subject: [PATCH 5/5] lxd: update to 3.17. --- srcpkgs/lxd/patches/seccomp.patch | 41 ------------------------------- srcpkgs/lxd/template | 20 +++------------ 2 files changed, 4 insertions(+), 57 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..4a37c86e5c7 100644 --- a/srcpkgs/lxd/template +++ b/srcpkgs/lxd/template @@ -1,35 +1,23 @@ # Template file for 'lxd' pkgname=lxd -version=3.14 +version=3.17 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 " +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=9484acb489b91f58ae8fe4518e5a09bdf2460808817efd32765ad9241ef729ef 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