gentoo resync : 29.12.2022

5 files changed, 149 insertions, 0 deletions

diff --git a/sys-cluster/kronosnet/Manifest b/sys-cluster/kronosnet/Manifest
index da118f542304..903c228f62df 100644
--- a/sys-cluster/kronosnet/Manifest
+++ b/sys-cluster/kronosnet/Manifest
@@ -1,3 +1,8 @@
+AUX kronosnet-1.19-no-Werror.patch 217 BLAKE2B 8d105b1f06b9ccf620cf4bcbe3726c4ffa260d831003417774d47813abc70cbcdc2fae38f2a8b2602b579588c82dc0cd81ee97ccb0492377ca9c6ac9d0f61412 SHA512 4c9be7909307e0ab4821cc83957633370adf8dd79cbed88b2a6caaf65874ee21abda2174e2512827bd588a60219fa21dd4795068f37f3e50d81421e305e3cd6e
+AUX kronosnet-1.23-no-extra-fortify-source.patch 564 BLAKE2B 289823a74e094f3186259ffcce34e516eed754137811a4cccbdf55ff1d956133dd623abdef7faa19637d1d609c67d95ae3e34108c9bae354917b48d750e6952f SHA512 9866265829bd46c3fd4a19cb8c1ce54ac115c4b1dbe017e84c3f1eccccb9a2991c8321b20e9dc2951831da9a7b0a704628ebe842b47ed077cc10e507ae93afab
 DIST kronosnet-1.19.tar.xz 461952 BLAKE2B ea6da6c760d73eb3d0b24827d019b479fe2d021f1eea8cb0e0497b390c04b64f99802159e61b1a8b26f38da542cbd52987504cb7c667a9b22ecb53b2fffdf20f SHA512 32b9d7254e9cf5768648aafe5cb019105e247edc1b8a427cc4e655ab4bd9d6a44614f67ba2ac4779f4d11d829d86e6fb8ceb27838dbb44bcefc351db76a41705
+DIST kronosnet-1.23.tar.xz 474048 BLAKE2B 47dd0ddfd59dd25091cffd85950be962747a5f7a6ccecbcdc921f4079a937186a6c3e03f75d8df80bf43441d761420b7d2f9e6fc6dce57f9c61a7ee1c63a2d9c SHA512 b3905affe35e88bed7a4a9e483ad81f46f5514495dd537e14734788933e573c679b8f971f5fef6a023dee852de2bed8250adc34c84e0d70fe4d506dd1782e105
+EBUILD kronosnet-1.19-r1.ebuild 1271 BLAKE2B 4e4cb234549be52431e8a56502a47639362947e71a853c340e1355590ad33bfb3ac25f54d057e6275d3be309ff4bb3ffe49afbca47d4f0c633f1c9f97ae43dd2 SHA512 c816b1e3413bd08884463e3ac2bf110a6ca374ea89303fefaf73324dcbf4de1d25cfeba9599adac66124ea2441b6e32d536b451f1885de929a5c01a41be38aeb
 EBUILD kronosnet-1.19.ebuild 1220 BLAKE2B 85951cf7cda65919a1094a97a7d1b88f660523cb356be41ec8eee48a4beb9715c4e2fc696c4131856f9744c3897a27c1f2d294620a739df66b355835bfd0f056 SHA512 b6be8fa1241939cf41a75d11c4b92293c7b1ac233e3a3e6bae15b92d53c8e4cc0f985945d0a03828607275f2496ea69531415b568cf5577f9d1e6c2e9a118019
+EBUILD kronosnet-1.23.ebuild 1315 BLAKE2B e3aa02d09bc44991452c2cd6d373f163dca816802413d22e50807c0e1dcefa60a5a9490db5f65f0172df47eed33ea6083c76b79557e850fbd28ca530b0ac2b6b SHA512 0d41ff2ab3f1f3d884af74c99e60a21d92aa3913f6a7da456296dc49e351f02188d25f362a4ef412797ecd561e85fd8cbd98a5e9fce84372c83d8e4e4476b5a1
 MISC metadata.xml 533 BLAKE2B 37d05a59d8b28ac4b616b955bcb7d1a2f65d789dbc875648b9efe90269148764cf523b1f2d9e38f8831de062387889f950fa7b390a57efecd5a9842ce5bd39b6 SHA512 e57121812a79ef088ad977420991b33e69d9e30cc114a6b7b566e5a1657db0d39268bfdadc5af938413491aeef0663362aa140e5ecfbb615fbaa967bc11257d2
diff --git a/sys-cluster/kronosnet/files/kronosnet-1.19-no-Werror.patch b/sys-cluster/kronosnet/files/kronosnet-1.19-no-Werror.patch
new file mode 100644
index 000000000000..a53d637f2525
--- /dev/null
+++ b/sys-cluster/kronosnet/files/kronosnet-1.19-no-Werror.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -307,7 +307,7 @@
+ 	GDB_FLAGS="-g"
+ fi
+ 
+-DEFAULT_CFLAGS="-Werror -Wall -Wextra"
++DEFAULT_CFLAGS="-Wall -Wextra"
+ 
+ # manual overrides
+ # generates too much noise for stub APIs
diff --git a/sys-cluster/kronosnet/files/kronosnet-1.23-no-extra-fortify-source.patch b/sys-cluster/kronosnet/files/kronosnet-1.23-no-extra-fortify-source.patch
new file mode 100644
index 000000000000..83acebb40298
--- /dev/null
+++ b/sys-cluster/kronosnet/files/kronosnet-1.23-no-extra-fortify-source.patch
@@ -0,0 +1,18 @@
+We already set this via GCC (patched in) and setting it individually per-package
+like this causes redefinition errors if folks try to use the new =3 level.
+
+So, protection is the same without this, and this patch removes
+the trouble of upgrading to =3 which we're working on.
+
+https://bugs.gentoo.org/847790
+--- a/configure.ac
++++ b/configure.ac
+@@ -324,7 +324,7 @@ if test "x${enable_debug}" = xyes; then
+ 	FORTIFY_CFLAGS=""
+ else
+ 	OPT_CFLAGS="-O3"
+-	FORTIFY_CFLAGS="-D_FORTIFY_SOURCE=2"
++	FORTIFY_CFLAGS=""
+ fi
+ 
+ # Check for availablility of hardening options
diff --git a/sys-cluster/kronosnet/kronosnet-1.19-r1.ebuild b/sys-cluster/kronosnet/kronosnet-1.19-r1.ebuild
new file mode 100644
index 000000000000..6ca8e8f2a526
--- /dev/null
+++ b/sys-cluster/kronosnet/kronosnet-1.19-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Network abstraction layer designed for High Availability use cases"
+HOMEPAGE="https://kronosnet.org"
+SRC_URI="https://kronosnet.org/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc nss +openssl zstd lz4 lzo2"
+
+DEPEND=">=sys-cluster/libqb-2.0.0:=
+	dev-libs/libnl:3
+	sys-libs/zlib:=
+	app-arch/bzip2:=
+	app-arch/xz-utils
+	zstd? ( app-arch/zstd:= )
+	lzo2? ( dev-libs/lzo:2 )
+	lz4? ( app-arch/lz4:= )
+	nss? ( dev-libs/nss )
+	openssl? ( dev-libs/openssl:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		>=sys-cluster/libqb-2.0.0
+		app-doc/doxygen[dot]
+	)"
+
+PATCHES=( "${FILESDIR}/${P}-no-Werror.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf_opts=(
+		$(use_enable doc man) \
+		--disable-static \
+		--enable-libnozzle \
+		--disable-libknet-sctp \
+		--enable-compress-zlib \
+		--enable-compress-bzip2 \
+		--enable-compress-lzma \
+		$(use_enable nss crypto-nss) \
+		$(use_enable openssl crypto-openssl) \
+		$(use_enable zstd compress-zstd) \
+		$(use_enable lz4 compress-lz4) \
+		$(use_enable lzo2 compress-lzo2)
+	)
+	econf "${econf_opts[@]}"
+}
diff --git a/sys-cluster/kronosnet/kronosnet-1.23.ebuild b/sys-cluster/kronosnet/kronosnet-1.23.ebuild
new file mode 100644
index 000000000000..355e4941778f
--- /dev/null
+++ b/sys-cluster/kronosnet/kronosnet-1.23.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Network abstraction layer designed for High Availability use cases"
+HOMEPAGE="https://kronosnet.org"
+SRC_URI="https://kronosnet.org/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc nss +openssl lz4 lzo2 test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=sys-cluster/libqb-2.0.0:=
+	dev-libs/libnl:3
+	sys-libs/zlib:=
+	app-arch/bzip2:=
+	app-arch/xz-utils
+	zstd? ( app-arch/zstd:= )
+	lzo2? ( dev-libs/lzo:2 )
+	lz4? ( app-arch/lz4:= )
+	nss? ( dev-libs/nss )
+	openssl? ( dev-libs/openssl:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		>=sys-cluster/libqb-2.0.0
+		app-doc/doxygen[dot]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.19-no-Werror.patch
+	"${FILESDIR}"/${PN}-1.23-no-extra-fortify-source.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc man)
+
+		--enable-libnozzle
+		--disable-libknet-sctp
+		--enable-compress-zlib
+		--enable-compress-bzip2
+		--enable-compress-lzma
+
+		$(use_enable nss crypto-nss)
+		$(use_enable openssl crypto-openssl)
+		$(use_enable zstd compress-zstd)
+		$(use_enable lz4 compress-lz4)
+		$(use_enable lzo2 compress-lzo2)
+
+		$(use_enable test functional-tests)
+	)
+
+	econf "${myeconfargs[@]}"
+}