commit: ef38c15ea21423cd4eff1951f28171c8b139f392 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Wed Feb 26 08:57:04 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Wed Feb 26 09:02:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef38c15e
net-misc/sysrepo: add 3.3.10 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> net-misc/sysrepo/Manifest | 1 + .../sysrepo-3.3.10-disable-automagic-plugins.patch | 37 ++++++++++++++++ .../files/sysrepo-3.3.10-respect-cflags.patch | 41 +++++++++++++++++ net-misc/sysrepo/sysrepo-3.3.10.ebuild | 51 ++++++++++++++++++++++ 4 files changed, 130 insertions(+) diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest index 698c7ace23b3..76f4cf28ddd8 100644 --- a/net-misc/sysrepo/Manifest +++ b/net-misc/sysrepo/Manifest @@ -1 +1,2 @@ DIST sysrepo-2.2.150.tar.gz 873758 BLAKE2B 55a9d22fede4f226f24b87829c88b72096ea8a18aa9aa44e168cd3f9817f49080a4757c99d5a179cadf0352c3cbbe09d92006195140a9973d39bc0db6ed103d8 SHA512 b9ee7db9ca32c68576fdb300c3c5605c130b6639d942d5e39bd9ce48039fe90e0e69756e7914071f49c2db3083ba36f1f431f3f9bdaf02e3d040646e051e4cef +DIST sysrepo-3.3.10.tar.gz 957832 BLAKE2B 0c4377b9af73361aeeee9a69aea5369ebbedc4cee789f83a69c266f5a51ce51fa81bf9eb673d9618942457fa8c42bd4f67f47b113c21ff5765e7042882438d78 SHA512 d6d2bb0f2b8743a13947395369716f9d60342d2842eddbf199b72acdc14fc6adde21a9bc94f7edcd061ce53fbd936ab13be89f4c52ca3637c290eb3ca25ceda7 diff --git a/net-misc/sysrepo/files/sysrepo-3.3.10-disable-automagic-plugins.patch b/net-misc/sysrepo/files/sysrepo-3.3.10-disable-automagic-plugins.patch new file mode 100644 index 000000000000..a937687b5df0 --- /dev/null +++ b/net-misc/sysrepo/files/sysrepo-3.3.10-disable-automagic-plugins.patch @@ -0,0 +1,37 @@ +From 30df9454d901fe6cb75028f4868439e01fe8f521 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <[email protected]> +Date: Wed, 26 Feb 2025 08:39:31 +0000 +Subject: [PATCH] Hard disable Redis and MongoDB datastore plugins + +This solves automagic properties of those two plugins. + +See-also: https://github.com/sysrepo/sysrepo/pull/3554 +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4992e29c..eb4b3594 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -387,7 +387,7 @@ list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_DEFAULT_SOURCE) + # libmongoc - optional + find_package(mongoc-1.0 1.24.0 CONFIG) + find_program(MONGOSH mongosh) +-if(TARGET mongo::mongoc_shared AND MONGOSH) ++if(0 AND TARGET mongo::mongoc_shared AND MONGOSH) + # datastore plugin added if libraries exist + list(APPEND LIB_SRC src/plugins/ds_mongo.c) + set(SR_ENABLED_DS_PLG_MONGO 1) +@@ -414,7 +414,7 @@ endif() + # libhiredis - optional + find_package(LibHiredis 1.1.0) + find_program(REDIS_CLI redis-cli) +-if(LIBHIREDIS_FOUND AND REDIS_CLI) ++if(0 AND LIBHIREDIS_FOUND AND REDIS_CLI) + # datastore plugin added if libraries exist + list(APPEND LIB_SRC src/plugins/ds_redis.c) + set(SR_ENABLED_DS_PLG_REDIS 1) +-- +2.48.1 + diff --git a/net-misc/sysrepo/files/sysrepo-3.3.10-respect-cflags.patch b/net-misc/sysrepo/files/sysrepo-3.3.10-respect-cflags.patch new file mode 100644 index 000000000000..b4a7ab3686b1 --- /dev/null +++ b/net-misc/sysrepo/files/sysrepo-3.3.10-respect-cflags.patch @@ -0,0 +1,41 @@ +From 53c8873e2c44baa18f64ae44eecb1e725fb589ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <[email protected]> +Date: Wed, 26 Feb 2025 07:14:58 +0000 +Subject: [PATCH] respect cflags + +--- + CMakeLists.txt | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 84990130..4992e29c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,24 +27,6 @@ if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Debug) + endif() + string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UPPER) +-# see https://github.com/CESNET/libyang/pull/1692 for why CMAKE_C_FLAGS_<type> are not used directly +-if("${BUILD_TYPE_UPPER}" STREQUAL "RELEASE") +- set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE) +- set(CMAKE_C_FLAGS "-DNDEBUG -O2 ${CMAKE_C_FLAGS}") +-elseif("${BUILD_TYPE_UPPER}" STREQUAL "DEBUG") +- set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE) +- set(CMAKE_C_FLAGS "-g -O0 ${CMAKE_C_FLAGS}") +-elseif("${BUILD_TYPE_UPPER}" STREQUAL "RELWITHDEBINFO") +- set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build Type" FORCE) +- set(CMAKE_C_FLAGS "-DNDEBUG -g -O2 ${CMAKE_C_FLAGS}") +-elseif("${BUILD_TYPE_UPPER}" STREQUAL "RELWITHDEBUG") +- set(CMAKE_BUILD_TYPE "RelWithDebug" CACHE STRING "Build Type" FORCE) +-elseif("${BUILD_TYPE_UPPER}" STREQUAL "ABICHECK") +- set(CMAKE_BUILD_TYPE "ABICheck" CACHE STRING "Build Type" FORCE) +- set(CMAKE_C_FLAGS "-g -Og ${CMAKE_C_FLAGS}") +-elseif("${BUILD_TYPE_UPPER}" STREQUAL "DOCONLY") +- set(CMAKE_BUILD_TYPE "DocOnly" CACHE STRING "Build Type" FORCE) +-endif() + + set(CMAKE_EXPORT_COMPILE_COMMANDS 1) + +-- +2.48.1 + diff --git a/net-misc/sysrepo/sysrepo-3.3.10.ebuild b/net-misc/sysrepo/sysrepo-3.3.10.ebuild new file mode 100644 index 000000000000..a54ce088c685 --- /dev/null +++ b/net-misc/sysrepo/sysrepo-3.3.10.ebuild @@ -0,0 +1,51 @@ +# Copyright 2021-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="YANG-based configuration and operational state data store" +HOMEPAGE="https://www.sysrepo.org"; +SRC_URI=" + https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND=">=net-libs/libyang-3.7.5:=" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) +" +BDEPEND="doc? ( app-text/doxygen[dot] )" + +PATCHES=( + "${FILESDIR}/${P}-respect-cflags.patch" + "${FILESDIR}/${P}-disable-automagic-plugins.patch" +) + +src_configure() { + local mycmakeargs=( + -DENABLE_TESTS=$(usex test) + -DENABLE_VALGRIND_TESTS=OFF + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use doc && cmake_src_compile doc +} + +src_install() { + cmake_src_install + + use doc && dodoc -r doc/. +}
