[gentoo-commits] repo/gentoo:master commit in: dev-libs/raft/files/
commit: e6e583109227a50f4e162f95275fed046f3969ff
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Tue Nov 7 18:04:18 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Nov 9 06:32:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6e58310
dev-libs/raft: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33709
Signed-off-by: Joonas Niilola gentoo.org>
...ft-0.11.3-disable-automagic-check-for-lz4.patch | 79 --
1 file changed, 79 deletions(-)
diff --git
a/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
b/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
deleted file mode 100644
index 7cd81e53cea9..
--- a/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index e0dbfc8..e595cb7 100644
a/Makefile.am
-+++ b/Makefile.am
-@@ -80,7 +80,9 @@ libraft_la_LDFLAGS += $(LZ4_LIBS)
- endif # LZ4_AVAILABLE
- if LZ4_ENABLED
- test_unit_core_CFLAGS += -DLZ4_ENABLED
-+test_unit_core_LDFLAGS = $(LZ4_LIBS)
- libraft_la_CFLAGS += -DLZ4_ENABLED
-+libraft_la_LDFLAGS += $(LZ4_LIBS)
- endif # LZ4_ENABLED
-
- if FIXTURE_ENABLED
-@@ -210,6 +212,7 @@ test_integration_uv_LDFLAGS += $(LZ4_LIBS)
- endif # LZ4_AVAILABLE
- if LZ4_ENABLED
- test_integration_uv_CFLAGS += -DLZ4_ENABLED
-+test_integration_uv_LDFLAGS += $(LZ4_LIBS)
- endif # LZ4_ENABLED
-
- endif # UV_ENABLED
-diff --git a/configure.ac b/configure.ac
-index df7bea9..0e2949f 100644
a/configure.ac
-+++ b/configure.ac
-@@ -23,47 +23,13 @@ AM_CONDITIONAL(UV_ENABLED, test "x$have_uv" = "xyes")
- # explicitly disabled.
- AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [do not use lz4
compression]))
-
--# Thanks to the OpenVPN configure.ac file for this part.
--# If this fails, we will do another test next.
--# We also add set LZ4_LIBS otherwise linker will not know about the lz4
library
--PKG_CHECK_MODULES(LZ4, [liblz4 >= 1.7.1], [have_lz4="yes"],
[LZ4_LIBS="-llz4"])
--if test "${have_lz4}" != "yes" ; then
--AC_CHECK_HEADERS([lz4.h],
-- [have_lz4h="yes"],
-- [])
--if test "${have_lz4h}" = "yes" ; then
--AC_MSG_CHECKING([additionally if system LZ4 version >= 1.7.1])
--AC_COMPILE_IFELSE(
--[AC_LANG_PROGRAM([[
--#include
-- ]],
-- [[
--/* Version encoding: MMNNPP (Major miNor Patch) - see lz4.h for details */
--#if LZ4_VERSION_NUMBER < 10701L
--#error LZ4 is too old
--#endif
-- ]]
--)],
-- [
-- AC_MSG_RESULT([ok])
-- have_lz4="yes"
-- ],
-- [
-- AC_MSG_RESULT([system LZ4 library is too old])
-- have_lz4="no"
-- ]
--)
--fi
--fi
--
--AS_IF([test "x$enable_lz4" != "xno" -a "x$have_lz4" != "xyes"],
-- [AC_MSG_ERROR([liblz4 required but not found])], [])
--# LZ4 Can be available without being enabled, this allows a user to activate
--# it at a later stage through an API call.
--AM_CONDITIONAL(LZ4_AVAILABLE, test "x$have_lz4" = "xyes")
-+AS_IF([test "x$enable_lz4" != "xno"], [
-+ PKG_CHECK_MODULES(LZ4, [liblz4 >= 1.7.1], [LZ4_LIBS="-llz4"])
-+])
- # `LZ4_ENABLED` will cause the libuv snapshot implementation to use lz4
- # compression by default.
--AM_CONDITIONAL(LZ4_ENABLED, test "x$enable_lz4" != "xno" -a "x$have_lz4" =
"xyes")
-+AM_CONDITIONAL(LZ4_ENABLED, test "x$enable_lz4" != "xno")
-+AM_CONDITIONAL(LZ4_AVAILABLE, test "x$enable_lz4" != "xno")
-
- # The fake I/O implementation and associated fixture is built by default,
unless
- # explicitly disabled.
[gentoo-commits] repo/gentoo:master commit in: dev-libs/raft/files/, dev-libs/raft/
commit: 5453866a993b63770a377ce0b08b320e6248
Author: Joonas Niilola gentoo org>
AuthorDate: Mon Feb 14 09:04:11 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Feb 14 09:07:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5453866a
dev-libs/raft: add 0.11.3
Signed-off-by: Joonas Niilola gentoo.org>
dev-libs/raft/Manifest | 1 +
...ft-0.11.3-disable-automagic-check-for-lz4.patch | 90 ++
dev-libs/raft/raft-0.11.3.ebuild | 56 ++
3 files changed, 147 insertions(+)
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 310531d32c3c..c0a2a4c08610 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1 +1,2 @@
DIST raft-0.11.2.tar.gz 325098 BLAKE2B
d9366547440b431edec75a22bca3a50bb6d714b5d950c061723f0585c5ad33704d23c32f2e325dc566ebeab71e15e10f07932c854657837e190901b52c9b4950
SHA512
8be47270cf3b888ff6adeeec2480ccd5065b45c3c546da089cbb326cf429f0bcd4396001e20fbf52587c00d5757337812c834ec5064fafa4815a978a7cf0c35f
+DIST raft-0.11.3.tar.gz 329571 BLAKE2B
08b145bfbcc26b50f69c550599978ed365ccbbd021b9c4699784c08bd7e0f17f366b1709c22df1a467fbdb524668a753f431744419da8f18d57ea52c5b33de38
SHA512
7d1a7455ff8d58ed1f3d259cade1c74fcb22732a55242dcf761cc6554739c0ea1c462aa02591d28d8fa2b343b23e6261a5e15d02e2a31467969b7d9f9f3b5e92
diff --git
a/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
b/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
new file mode 100644
index ..f16936448091
--- /dev/null
+++ b/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
@@ -0,0 +1,90 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac 2021-12-14 18:47:55.0 +0200
b/configure.ac 2022-02-14 10:51:19.908763437 +0200
+@@ -23,47 +23,12 @@
+ # explicitly disabled.
+ AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [do not use lz4
compression]))
+
+-# Thanks to the OpenVPN configure.ac file for this part.
+-# If this fails, we will do another test next.
+-# We also add set LZ4_LIBS otherwise linker will not know about the lz4
library
+-PKG_CHECK_MODULES(LZ4, [liblz4 >= 1.7.1], [have_lz4="yes"],
[LZ4_LIBS="-llz4"])
+-if test "${have_lz4}" != "yes" ; then
+-AC_CHECK_HEADERS([lz4.h],
+- [have_lz4h="yes"],
+- [])
+-if test "${have_lz4h}" = "yes" ; then
+-AC_MSG_CHECKING([additionally if system LZ4 version >= 1.7.1])
+-AC_COMPILE_IFELSE(
+-[AC_LANG_PROGRAM([[
+-#include
+- ]],
+- [[
+-/* Version encoding: MMNNPP (Major miNor Patch) - see lz4.h for details */
+-#if LZ4_VERSION_NUMBER < 10701L
+-#error LZ4 is too old
+-#endif
+- ]]
+-)],
+- [
+- AC_MSG_RESULT([ok])
+- have_lz4="yes"
+- ],
+- [
+- AC_MSG_RESULT([system LZ4 library is too old])
+- have_lz4="no"
+- ]
+-)
+-fi
+-fi
+-
+-AS_IF([test "x$enable_lz4" != "xno" -a "x$have_lz4" != "xyes"],
+- [AC_MSG_ERROR([liblz4 required but not found])], [])
+-# LZ4 Can be available without being enabled, this allows a user to activate
+-# it at a later stage through an API call.
+-AM_CONDITIONAL(LZ4_AVAILABLE, test "x$have_lz4" = "xyes")
++AS_IF([test "x$enable_lz4" != "xno"], [
++ PKG_CHECK_MODULES(LZ4, [liblz4 >= 1.7.1], [LZ4_LIBS="-llz4"])
++])
+ # `LZ4_ENABLED` will cause the libuv snapshot implementation to use lz4
+ # compression by default.
+-AM_CONDITIONAL(LZ4_ENABLED, test "x$enable_lz4" != "xno" -a "x$have_lz4" =
"xyes")
++AM_CONDITIONAL(LZ4_ENABLED, test "x$enable_lz4" != "xno")
+
+ # The fake I/O implementation and associated fixture is built by default,
unless
+ # explicitly disabled.
+diff -Naur a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2021-12-14 18:47:55.0 +0200
b/Makefile.am 2022-02-14 10:55:37.467978443 +0200
+@@ -72,15 +72,11 @@
+ test_unit_core_CFLAGS = $(AM_CFLAGS) -Wno-conversion
+ test_unit_core_LDADD = libtest.la
+
+-if LZ4_AVAILABLE
+-test_unit_core_CFLAGS += -DLZ4_AVAILABLE
+-test_unit_core_LDFLAGS = $(LZ4_LIBS)
+-libraft_la_CFLAGS += -DLZ4_AVAILABLE
+-libraft_la_LDFLAGS += $(LZ4_LIBS)
+-endif # LZ4_AVAILABLE
+ if LZ4_ENABLED
+ test_unit_core_CFLAGS += -DLZ4_ENABLED
++test_unit_core_LDFLAGS = $(LZ4_LIBS)
+ libraft_la_CFLAGS += -DLZ4_ENABLED
++libraft_la_LDFLAGS += $(LZ4_LIBS)
+ endif # LZ4_ENABLED
+
+ if FIXTURE_ENABLED
+@@ -204,12 +200,9 @@
+
+ AM_CFLAGS += $(UV_CFLAGS)
+
+-if LZ4_AVAILABLE
+-test_integration_uv_CFLAGS += -DLZ4_AVAILABLE
+-test_integration_uv_LDFLAGS += $(LZ4_LIBS)
+-endif # LZ4_AVAILABLE
+ if LZ4_ENABLED
+ test_integration_uv_CFLAGS += -DLZ4_ENABLED
++test_integration_uv_LDFLAGS += $(LZ4_LIBS)
+ endif # LZ4_ENABLED
+
+ endif # UV_ENABLED
diff --git a/dev-libs/raft/raft-0.11.3.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-libs/raft/files/, dev-libs/raft/
commit: 34d68f5bbe8ae463cf03086821a23649f04daf64
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Mar 23 06:43:12 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Mar 23 06:44:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d68f5b
dev-libs/raft: bump 0.10.0
Signed-off-by: Joonas Niilola gentoo.org>
dev-libs/raft/Manifest | 1 +
dev-libs/raft/files/raft-0.10.0-toggle-zfs.patch | 21 ++
dev-libs/raft/metadata.xml | 3 ++
dev-libs/raft/raft-0.10.0.ebuild | 52
4 files changed, 77 insertions(+)
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 244ae96fe1f..efa508bf3f0 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1 +1,2 @@
+DIST raft-0.10.0.tar.gz 315569 BLAKE2B
2365ee2ef4aca44257cf7631875013a6778d8858427946443ec02411783517f3ef129529c3302eceedbd43d9a57de9a3fc20a762b51ce8c7ed96045d4c8d27b0
SHA512
5039e2305c92f5002de4ef33f3c0b76dac1e72b8d983440ae0f5cb65d99213278e23a80401476617f32857c1913ab30bf257265d92f6bb5992d2701d4c25f977
DIST raft-0.9.25.tar.gz 313444 BLAKE2B
a2a15287cef28b03b012ea372d83e7d0b70bc561f5996eb36fb5ef898261188ee8dfef1aa1619333ada2c8f20a37aa1af3f68a1d97c11919d521544c89629e55
SHA512
8709a909c527b7062072165356dcc012cf7af6cf85e3a3be515220ea4a863637dd06e7c4376af4284006bce65034002d1639ca52ac1ce108be2efa0725a82b70
diff --git a/dev-libs/raft/files/raft-0.10.0-toggle-zfs.patch
b/dev-libs/raft/files/raft-0.10.0-toggle-zfs.patch
new file mode 100644
index 000..f31b599b610
--- /dev/null
+++ b/dev-libs/raft/files/raft-0.10.0-toggle-zfs.patch
@@ -0,0 +1,21 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac 2021-03-16 14:45:58.0 +0200
b/configure.ac 2021-03-23 07:45:06.875557286 +0200
+@@ -47,13 +47,10 @@
+ # Checks for header files.
+ AC_CHECK_HEADERS([stdlib.h string.h stdio.h assert.h unistd.h
linux/io_uring.h linux/aio_abi.h])
+
+-# Check if zfs >= 0.8.0 is available (for direct I/O support).
+-AC_CHECK_PROG(have_zfs, zfs, yes)
+-AS_IF([test x"$have_zfs" = x"yes"],
+- [AX_COMPARE_VERSION($(cat /sys/module/zfs/version | cut -f 1 -d -), [ge],
[0.8.0],
+- [AC_DEFINE(RAFT_HAVE_ZFS_WITH_DIRECT_IO)], [])
+- ],
+- [])
++# zfs support. We have 0.8.6 as stable in Gentoo, which is plenty above the
required minimum.
++AC_ARG_WITH([zfs], AS_HELP_STRING([--with-zfs], [Build with zfs support
(default: disabled)]))
++AS_IF([test "x$with_zfs" = "xyes"],
++ [AC_DEFINE(RAFT_HAVE_ZFS_WITH_DIRECT_IO)], [])
+
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_SIZE_T
diff --git a/dev-libs/raft/metadata.xml b/dev-libs/raft/metadata.xml
index c96395f9024..d1012a6417a 100644
--- a/dev-libs/raft/metadata.xml
+++ b/dev-libs/raft/metadata.xml
@@ -9,6 +9,9 @@
virtualizat...@gentoo.org
Gentoo Virtualization Project
+
+ZFS support
+
The library has modular design: its core part implements only the core
Raft algorithm logic, in a fully platform independent way. On top of that,
diff --git a/dev-libs/raft/raft-0.10.0.ebuild b/dev-libs/raft/raft-0.10.0.ebuild
new file mode 100644
index 000..ffd134995c1
--- /dev/null
+++ b/dev-libs/raft/raft-0.10.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C implementation of the Raft consensus protocol"
+HOMEPAGE="https://github.com/canonical/raft;
+SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test zfs"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libuv"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch
+ "${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
+ )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-uv
+
+ --disable-benchmark
+ --disable-debug
+ --disable-example
+ --disable-sanitize
+ --disable-static
+
+ $(use_enable test fixture)
+
+ $(use_with zfs)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/raft/files/, dev-libs/raft/
commit: e61d57fc23f8c6248a546e2d228923309d240c46
Author: Joonas Niilola gentoo org>
AuthorDate: Sun Jan 3 06:56:32 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Jan 3 06:57:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61d57fc
dev-libs/raft: skip faulty test
Closes: https://bugs.gentoo.org/760072
Signed-off-by: Joonas Niilola gentoo.org>
.../raft-0.9.25-Always-skip-init-oom-test.patch| 31 ++
dev-libs/raft/raft-0.9.25.ebuild | 4 ++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch
b/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch
new file mode 100644
index 000..7a22682c2e0
--- /dev/null
+++ b/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch
@@ -0,0 +1,31 @@
+commit e0948518f6eedad85c7705fb3963cfdda3627d8f
+Author: Reto Gantenbein
+Date: Thu Oct 22 00:19:31 2020 +0200
+
+Always skip init/oom test
+
+The RPM package build in COPR is being executed on a tmpfs which
+always results in a failure of this test:
+
+init/oom
+ heap-fault-delay=1, heap-fault-repeat=1 [ ERROR ]
+Error: test/integration/test_uv_init.c:156: assertion failed: _rv == 1 (0
== 1)
+
+Instead only for certain architectures we always skip this test.
+For more informations see https://github.com/ganto/copr-lxc4/issues/8
+
+diff --git a/test/integration/test_uv_init.c b/test/integration/test_uv_init.c
+index 8c9b5f7..57db7f3 100644
+--- a/test/integration/test_uv_init.c
b/test/integration/test_uv_init.c
+@@ -144,10 +144,8 @@ static MunitParameterEnum oomParams[] = {
+ TEST(init, oom, setUp, tearDown, 0, oomParams)
+ {
+ struct fixture *f = data;
+-#if defined(__i686__)
+ /* XXX: tmpfs seems to not support O_DIRECT */
+ return MUNIT_SKIP;
+-#endif
+ #if defined(__powerpc64__)
+ /* XXX: fails on ppc64el */
+ return MUNIT_SKIP;
diff --git a/dev-libs/raft/raft-0.9.25.ebuild b/dev-libs/raft/raft-0.9.25.ebuild
index b1d2d3822b2..b5f0f01804e 100644
--- a/dev-libs/raft/raft-0.9.25.ebuild
+++ b/dev-libs/raft/raft-0.9.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,6 +18,8 @@ RESTRICT="!test? ( test )"
DEPEND="dev-libs/libuv"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch )
+
src_prepare() {
default
