From 8e5da49d3bce99d8a9b76de640ff492701c9dce6 Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 3 Dec 2023 14:38:28 -0500 Subject: [PATCH 1/7] dqlite: remove --- common/shlibs | 1 - srcpkgs/dqlite-devel | 1 - srcpkgs/dqlite/patches/musl.patch | 31 ------------------------------ srcpkgs/dqlite/template | 32 ------------------------------- srcpkgs/removed-packages/template | 2 ++ 5 files changed, 2 insertions(+), 65 deletions(-) delete mode 120000 srcpkgs/dqlite-devel delete mode 100644 srcpkgs/dqlite/patches/musl.patch delete mode 100644 srcpkgs/dqlite/template diff --git a/common/shlibs b/common/shlibs index 1b25a12956eeb..b2a6524cd758a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3521,7 +3521,6 @@ libcsfml-network.so.2.5 CSFML-2.5_1 libtokyocabinet.so.9 tokyocabinet-1.4.48_1 libdav1d.so.7 libdav1d-1.3.0_1 librav1e.so.0 rav1e-0.6.3_1 -libdqlite.so.0 dqlite-0.2.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-devel b/srcpkgs/dqlite-devel deleted file mode 120000 index cc516e6887f74..0000000000000 --- a/srcpkgs/dqlite-devel +++ /dev/null @@ -1 +0,0 @@ -dqlite \ No newline at end of file diff --git a/srcpkgs/dqlite/patches/musl.patch b/srcpkgs/dqlite/patches/musl.patch deleted file mode 100644 index ab6a0395494e7..0000000000000 --- a/srcpkgs/dqlite/patches/musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index f4539b9623d98..0000000000000 --- a/srcpkgs/dqlite/template +++ /dev/null @@ -1,32 +0,0 @@ -# Template file for 'dqlite' -pkgname=dqlite -version=1.13.0 -revision=2 -build_style=gnu-configure -hostmakedepends="pkg-config automake libtool" -makedepends="sqlite-devel raft-devel" -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="https://github.com/canonical/dqlite/archive/v${version}.tar.gz" -checksum=14334a72389322d047576697f112da4cd6e1a5257d652d6162f195f2855fcd12 - -pre_configure() { - autoreconf -i -} - -post_install() { - vlicense LICENSE -} - -dqlite-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" - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 512d1bce049bc..d2eb99b1d22d2 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -94,6 +94,8 @@ replaces=" dleyna-server<=0.6.0_2 dnote-cli<=0.6.2_1 docker2aci<=0.17.2_4 + dqlite<=1.13.0_2 + dqlite-devel<=1.13.0_2 dreampie<=1.2.1_3 dtkcore-devel<=2.1.1_2 dtkcore<=2.1.1_2 From 04f7b194d5df50a1e278ec650fdad99efc7d450b Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 3 Dec 2023 14:39:18 -0500 Subject: [PATCH 2/7] lxd: remove --- srcpkgs/lxd/files/README.voidlinux | 11 --------- srcpkgs/lxd/files/lxd/check | 2 -- srcpkgs/lxd/files/lxd/run | 12 --------- srcpkgs/lxd/template | 39 ------------------------------ srcpkgs/lxd/update | 1 - srcpkgs/removed-packages/template | 1 + 6 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 srcpkgs/lxd/files/README.voidlinux delete mode 100755 srcpkgs/lxd/files/lxd/check delete mode 100644 srcpkgs/lxd/files/lxd/run delete mode 100644 srcpkgs/lxd/template delete mode 100644 srcpkgs/lxd/update diff --git a/srcpkgs/lxd/files/README.voidlinux b/srcpkgs/lxd/files/README.voidlinux deleted file mode 100644 index 5958c9008817a..0000000000000 --- a/srcpkgs/lxd/files/README.voidlinux +++ /dev/null @@ -1,11 +0,0 @@ -Start lxd service: - - $ sudo ln -s /etc/sv/lxd /var/service/ - -Run LXD initialization: - - $ sudo lxd init - -To use lxd client your user must be added to the 'lxd' group: - - $ sudo usermod -aG lxd diff --git a/srcpkgs/lxd/files/lxd/check b/srcpkgs/lxd/files/lxd/check deleted file mode 100755 index 4b2112a3a76a7..0000000000000 --- a/srcpkgs/lxd/files/lxd/check +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -lxc config show >/dev/null 2>&1 diff --git a/srcpkgs/lxd/files/lxd/run b/srcpkgs/lxd/files/lxd/run deleted file mode 100644 index 4a9ea61ba9a67..0000000000000 --- a/srcpkgs/lxd/files/lxd/run +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -exec 2>&1 -_systemd_cgrp="/sys/fs/cgroup/systemd" -if [ ! -d ${_systemd_cgrp} ]; then - mkdir ${_systemd_cgrp} -fi -if ! mountpoint -q "${_systemd_cgrp}"; then - mount -t cgroup -o none,name=systemd cgroup ${_systemd_cgrp} -fi - -[ -r conf ] && . ./conf -exec lxd --group lxd ${OPTS:- --verbose} diff --git a/srcpkgs/lxd/template b/srcpkgs/lxd/template deleted file mode 100644 index 46954e9de9475..0000000000000 --- a/srcpkgs/lxd/template +++ /dev/null @@ -1,39 +0,0 @@ -# Template file for 'lxd' -pkgname=lxd -version=5.9 -revision=3 -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}/lxc-to-lxd - ${go_import_path}/fuidshift - ${go_import_path}/lxd-benchmark - ${go_import_path}/lxd-user" -hostmakedepends="pkg-config git" -makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel" -depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs" -short_desc="Next generation system container manager" -maintainer="Cameron Nemo " -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=a24cf7fbe3e5527a34deda7e8e92f17c05a51498723821f69b146d1e8e58117f -system_groups="lxd" - -# whitelist dqlite LDFLAGS -export CGO_LDFLAGS_ALLOW='-Wl,-z,now' - -post_build() { - # these need special tags and/or LDFLAGS - CGO_LDFLAGS="$CGO_LDFLAGS -static" go install -p "$XBPS_MAKEJOBS" -mod=vendor -x -tags "agent" -ldflags "${go_ldflags}" "${go_import_path}/lxd-agent" - go install -p "$XBPS_MAKEJOBS" -mod=vendor -x -tags "netgo" -ldflags "${go_ldflags}" "${go_import_path}/lxd-migrate" -} - -post_install() { - vinstall scripts/bash/lxd-client 644 /usr/share/bash-completion/completions lxd - vsv lxd - vdoc "${FILESDIR}/README.voidlinux" -} diff --git a/srcpkgs/lxd/update b/srcpkgs/lxd/update deleted file mode 100644 index 0c7e0abc90032..0000000000000 --- a/srcpkgs/lxd/update +++ /dev/null @@ -1 +0,0 @@ -site="https://linuxcontainers.org/lxd/downloads/" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index d2eb99b1d22d2..d212c840a8eb3 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -410,6 +410,7 @@ replaces=" luxmark<=3.1_9 luxrays-devel<=3.1_18 luxrays<=3.1_18 + lxd<=5.9_3 mac<=3.99u4b5s7_3 mailpile<=0.5.2_4 masterpassword-cli<=2.6_5 From b216084c9bbda44dc7c9cee6031f6a683a5eede4 Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 3 Dec 2023 14:39:52 -0500 Subject: [PATCH 3/7] lxd-lts: remove --- srcpkgs/lxd-lts/files/README.voidlinux | 11 ------- srcpkgs/lxd-lts/files/lxd/run | 12 -------- srcpkgs/lxd-lts/template | 41 -------------------------- srcpkgs/lxd-lts/update | 2 -- srcpkgs/removed-packages/template | 3 +- 5 files changed, 2 insertions(+), 67 deletions(-) delete mode 100755 srcpkgs/lxd-lts/files/README.voidlinux delete mode 100755 srcpkgs/lxd-lts/files/lxd/run delete mode 100644 srcpkgs/lxd-lts/template delete mode 100644 srcpkgs/lxd-lts/update diff --git a/srcpkgs/lxd-lts/files/README.voidlinux b/srcpkgs/lxd-lts/files/README.voidlinux deleted file mode 100755 index 5958c9008817a..0000000000000 --- a/srcpkgs/lxd-lts/files/README.voidlinux +++ /dev/null @@ -1,11 +0,0 @@ -Start lxd service: - - $ sudo ln -s /etc/sv/lxd /var/service/ - -Run LXD initialization: - - $ sudo lxd init - -To use lxd client your user must be added to the 'lxd' group: - - $ sudo usermod -aG lxd diff --git a/srcpkgs/lxd-lts/files/lxd/run b/srcpkgs/lxd-lts/files/lxd/run deleted file mode 100755 index 4a9ea61ba9a67..0000000000000 --- a/srcpkgs/lxd-lts/files/lxd/run +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -exec 2>&1 -_systemd_cgrp="/sys/fs/cgroup/systemd" -if [ ! -d ${_systemd_cgrp} ]; then - mkdir ${_systemd_cgrp} -fi -if ! mountpoint -q "${_systemd_cgrp}"; then - mount -t cgroup -o none,name=systemd cgroup ${_systemd_cgrp} -fi - -[ -r conf ] && . ./conf -exec lxd --group lxd ${OPTS:- --verbose} diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template deleted file mode 100644 index 5aacd6712c7d2..0000000000000 --- a/srcpkgs/lxd-lts/template +++ /dev/null @@ -1,41 +0,0 @@ -# Template file for 'lxd-lts' -pkgname=lxd-lts -version=5.0.1 -revision=2 -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}/lxc-to-lxd - ${go_import_path}/fuidshift - ${go_import_path}/lxd-benchmark - ${go_import_path}/lxd-user" -hostmakedepends="pkg-config git" -makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel" -depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs" -short_desc="Next generation system container manager (long term support channel)" -maintainer="Cameron Nemo " -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=63be0ec206da6914251271d2778124242029e3d3c0bf4aa2381d921ee0133382 -conflicts="lxd" -provides="lxd-${version}_${revision}" -system_groups="lxd" - -# whitelist dqlite LDFLAGS -export CGO_LDFLAGS_ALLOW='-Wl,-z,now' - -post_build() { - # these need special tags and/or LDFLAGS - CGO_LDFLAGS="$CGO_LDFLAGS -static" go install -p "$XBPS_MAKEJOBS" -mod=vendor -x -tags "agent" -ldflags "${go_ldflags}" "${go_import_path}/lxd-agent" - go install -p "$XBPS_MAKEJOBS" -mod=vendor -x -tags "netgo" -ldflags "${go_ldflags}" "${go_import_path}/lxd-migrate" -} - -post_install() { - vinstall scripts/bash/lxd-client 644 /usr/share/bash-completion/completions lxd - vsv lxd - vdoc "${FILESDIR}/README.voidlinux" -} diff --git a/srcpkgs/lxd-lts/update b/srcpkgs/lxd-lts/update deleted file mode 100644 index 114a630c6a87e..0000000000000 --- a/srcpkgs/lxd-lts/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://linuxcontainers.org/lxd/downloads/" -pattern='lxd-\K[\d]+\.\d+\.\d+(?=\.tar\.)' diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index d212c840a8eb3..3e78e812dbd1e 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20231114 +version=0.1.20231205 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -411,6 +411,7 @@ replaces=" luxrays-devel<=3.1_18 luxrays<=3.1_18 lxd<=5.9_3 + lxd-lts<=5.0.1_2 mac<=3.99u4b5s7_3 mailpile<=0.5.2_4 masterpassword-cli<=2.6_5 From ed566a9821545e46668a8f231654d69fa3100170 Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 3 Dec 2023 14:41:04 -0500 Subject: [PATCH 4/7] raft: update to 0.18.2 --- common/shlibs | 2 +- srcpkgs/raft/template | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index b2a6524cd758a..c5bd49b502bfd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3826,7 +3826,7 @@ libigraph.so.3 igraph-0.10.2_1 libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1 librdkafka.so.1 librdkafka-1.4.4_3 librdkafka++.so.1 librdkafka-1.4.4_3 -libraft.so.2 raft-0.13.0_1 +libraft.so.0 raft-0.18.2_1 libmdnsd.so.1 libmdnsd-0.9_1 libosdGPU.so.3.4.3 OpenSubdiv-3.4.3_1 libosdCPU.so.3.4.3 OpenSubdiv-3.4.3_1 diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template index 234a5a6da37f9..68f5044aead47 100644 --- a/srcpkgs/raft/template +++ b/srcpkgs/raft/template @@ -1,7 +1,7 @@ # Template file for 'raft' pkgname=raft -version=0.16.0 -revision=2 +version=0.18.2 +revision=1 build_style=gnu-configure configure_args="--enable-example=no" hostmakedepends="pkg-config autoconf automake libtool" @@ -9,11 +9,9 @@ makedepends="libuv-devel liblz4-devel" short_desc="C implementation of the Raft consensus protocol" 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=ab5480c051bfbf482074f62c9c306d08ca68b8f0ad0c2db2ebf0488cfe692336 -# test/unit/uv and test/integration/uv fail on CI -make_check=ci-skip +homepage="https://raft.readthedocs.io" +distfiles="https://github.com/cowsql/raft/archive/v${version}.tar.gz" +checksum=cc3e12877150cb9cdfa82486a9bfe39e4050dba8a6e8a55aa27c86b7d21237b9 pre_configure() { autoreconf -i From f434260106991d92594586aae818725db84af603 Mon Sep 17 00:00:00 2001 From: dkwo Date: Sun, 3 Dec 2023 14:41:23 -0500 Subject: [PATCH 5/7] new package: cowsql --- common/shlibs | 1 + srcpkgs/cowsql-devel | 1 + srcpkgs/cowsql/template | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 120000 srcpkgs/cowsql-devel create mode 100644 srcpkgs/cowsql/template diff --git a/common/shlibs b/common/shlibs index c5bd49b502bfd..fb54c76356705 100644 --- a/common/shlibs +++ b/common/shlibs @@ -52,6 +52,7 @@ libcidn.so.1 glibc-2.36_1 libmvec.so.1 glibc-2.36_1 libcddgmp.so.0 cddlib-0.94m_1 libcdd.so.0 cddlib-0.94m_1 +libcowsql.so.0 cowsql-1.15.4_1 libz.so.1 zlib-1.2.3_1 libb2.so.1 libb2-0.98.1_1 libbz2.so.1 bzip2-1.0.5_1 diff --git a/srcpkgs/cowsql-devel b/srcpkgs/cowsql-devel new file mode 120000 index 0000000000000..6ca7d46dc1870 --- /dev/null +++ b/srcpkgs/cowsql-devel @@ -0,0 +1 @@ +cowsql \ No newline at end of file diff --git a/srcpkgs/cowsql/template b/srcpkgs/cowsql/template new file mode 100644 index 0000000000000..7189bea57bb95 --- /dev/null +++ b/srcpkgs/cowsql/template @@ -0,0 +1,33 @@ +# Template file for 'cowsql' +pkgname=cowsql +version=1.15.4 +revision=1 +build_style=gnu-configure +configure_args="--enable-example" +hostmakedepends="automake libtool pkg-config" +makedepends="sqlite-devel libuv-devel raft-devel" +short_desc="Embeddable, replicated and fault tolerant SQL engine" +maintainer="dkwo " +license="custom:LGPL-3.0-only-linking-exception" +homepage="https://github.com/cowsql/cowsql" +distfiles="https://github.com/cowsql/cowsql/archive/refs/tags/v${version}.tar.gz" +checksum=f37ac775e8165ccf5cee4c981672072ac11e8d23c25c92e94bd25a299d170668 + +pre_configure() { + autoreconf -fi +} + +post_install() { + vlicense LICENSE +} + +cowsql-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 ee4734a8d2a831712998aa5c5a1f274a56164cf0 Mon Sep 17 00:00:00 2001 From: dkwo Date: Sat, 2 Dec 2023 21:43:28 -0500 Subject: [PATCH 6/7] new package: incus (wip) --- srcpkgs/incus/files/incus/run | 4 ++++ srcpkgs/incus/template | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 srcpkgs/incus/files/incus/run create mode 100644 srcpkgs/incus/template diff --git a/srcpkgs/incus/files/incus/run b/srcpkgs/incus/files/incus/run new file mode 100644 index 0000000000000..bfee08ea3a2db --- /dev/null +++ b/srcpkgs/incus/files/incus/run @@ -0,0 +1,4 @@ +#!/bin/sh +exec 2>&1 +[ -r conf ] && . ./conf +exec 'incus admin init' --group incus-admin diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template new file mode 100644 index 0000000000000..bcf9dd54a10a7 --- /dev/null +++ b/srcpkgs/incus/template @@ -0,0 +1,36 @@ +# Template file for 'incus' +pkgname=incus +version=0.3.0 +revision=1 +build_style=go +go_import_path=github.com/lxc/incus +go_build_tags=libsqlite3 +go_package="${go_import_path}/..." +hostmakedepends="pkg-config" +makedepends="lxc-devel acl-devel cowsql-devel raft-devel eudev-libudev-devel + libcap-devel" +depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables attr-progs" +short_desc="Powerful system container and virtual machine manager" +maintainer="dkwo " +license="Apache-2.0" +homepage="https://linuxcontainers.org/incus" +distfiles="https://github.com/lxc/incus/archive/refs/tags/v${version}.tar.gz" +checksum=e49b8ad5a292acbb15635415c159f081e595daa55da6f3bb61bac4c3f326787c +system_groups="incus-admin" + +export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" +export GOFLAGS="-buildmode=pie" + +post_build() { + CGO_LDFLAGS="${CGO_LDFLAGS} -static" go install -p "${XBPS_MAKEJOBS}" -v -tags agent,netgo "${go_import_path}/cmd/incus-agent" +} + +do_check() { + go test -v -tags ${go_build_tags} ./... + cd test && ./main.sh +} + +post_install() { + rm ${DESTDIR}/usr/bin/{sysinfo,incus-migrate} + vsv incus +} From 5ab9a1f043b331291831f7bb42c843e52296fa06 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 4 Dec 2023 18:30:58 -0500 Subject: [PATCH 7/7] incus: try to fix checks --- srcpkgs/incus/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template index bcf9dd54a10a7..3b568e2d01127 100644 --- a/srcpkgs/incus/template +++ b/srcpkgs/incus/template @@ -5,7 +5,8 @@ revision=1 build_style=go go_import_path=github.com/lxc/incus go_build_tags=libsqlite3 -go_package="${go_import_path}/..." +go_package="${go_import_path}/cmd/incus + ${go_import_path}/cmd/fuidshift" hostmakedepends="pkg-config" makedepends="lxc-devel acl-devel cowsql-devel raft-devel eudev-libudev-devel libcap-devel"