summaryrefslogtreecommitdiff
path: root/net-misc/sysrepo
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/sysrepo')
-rw-r--r--net-misc/sysrepo/Manifest8
-rw-r--r--net-misc/sysrepo/files/sysrepo-3.3.10-disable-automagic-plugins.patch37
-rw-r--r--net-misc/sysrepo/files/sysrepo-3.3.10-respect-cflags.patch41
-rw-r--r--net-misc/sysrepo/sysrepo-2.2.150-r1.ebuild (renamed from net-misc/sysrepo/sysrepo-2.2.150.ebuild)7
-rw-r--r--net-misc/sysrepo/sysrepo-3.3.10.ebuild (renamed from net-misc/sysrepo/sysrepo-2.2.60.ebuild)21
5 files changed, 104 insertions, 10 deletions
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index 6b155548784f..e9e57f1df44e 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,5 +1,7 @@
+AUX sysrepo-3.3.10-disable-automagic-plugins.patch 1294 BLAKE2B d8ca3942de3659d194a0daf7371411445cf8fa417ad76c0fe199635b45e3e66f4e9a3f2a2042f66e187e788f3e36fb395a2ef40fcd2632b024ee0e7dbc46e5f5 SHA512 8524f280036222135f553b55c78011a8416b4eb94d9d36c93c2bbb5e3dbf250bf7b87507da3b9c686a6667d8f3c27f2139ac46caa5d99c9d5847f7de26d0f642
+AUX sysrepo-3.3.10-respect-cflags.patch 1650 BLAKE2B c5e47ae7412d31fc5b1ff05b21271fc6f3d393b6c49459dc91cb4118e40cf406c3ef078021e133dd7786805916aa25a85e06401d424364db99ce68708890ebb8 SHA512 20e319fc80438c7a2f4ae217f8f6ce8eb0d5349052d5075115dccff42cf22f1de32601757326da9d7883edbdf544bf8a5a134f18eb15478a8023b2f0a0d452c9
DIST sysrepo-2.2.150.tar.gz 873758 BLAKE2B 55a9d22fede4f226f24b87829c88b72096ea8a18aa9aa44e168cd3f9817f49080a4757c99d5a179cadf0352c3cbbe09d92006195140a9973d39bc0db6ed103d8 SHA512 b9ee7db9ca32c68576fdb300c3c5605c130b6639d942d5e39bd9ce48039fe90e0e69756e7914071f49c2db3083ba36f1f431f3f9bdaf02e3d040646e051e4cef
-DIST sysrepo-2.2.60.tar.gz 782781 BLAKE2B afaef4e0a3d21a636f84d76ee0de55b1365e0e66cb9335ca748752747af99eb58c368eafd7c087a1df050ff4d1c2800601d125915f2debaad8ccc77278d30b84 SHA512 720299b57a0615ba99e01e7d42bc85d5ba5482d82680c47961f6876400009850e8fdf5c0753c39600ef0947a318394eb6108772ac1a575584f26bdc6e2305a57
-EBUILD sysrepo-2.2.150.ebuild 777 BLAKE2B baefc0c44a63d65fb88e0a6bf1fc805b0c675fa7d240812040d6b031954f5e26620dc1f015874459e041210cfda6d0122f531c906306fd8f3910a3ed1d9190e7 SHA512 8c0fc64ac72ae0685a19480ee91b38be4c153aca5c84c5ab11915ac91d392fcbfc8417e999e153b2c53d8b50e597c6e7d1f6c965c9706e500c278a3e1e3ac12c
-EBUILD sysrepo-2.2.60.ebuild 776 BLAKE2B efb2b62516a1585a93211b4b43de79deae720bafa58763282917e2411a9747972afb44eecdf57d9aa03e191a221a10029575bbcba666a44949496dbf552f2c9a SHA512 1c9b851991810df6c76aded9a957c7638be26ee082e6f1ea4578fe7acdc36a404a2ffe578e9c9dfd5ecd9a6ae04f0cbf9006fca392c707cb490d79aa5e16e2cc
+DIST sysrepo-3.3.10.tar.gz 957832 BLAKE2B 0c4377b9af73361aeeee9a69aea5369ebbedc4cee789f83a69c266f5a51ce51fa81bf9eb673d9618942457fa8c42bd4f67f47b113c21ff5765e7042882438d78 SHA512 d6d2bb0f2b8743a13947395369716f9d60342d2842eddbf199b72acdc14fc6adde21a9bc94f7edcd061ce53fbd936ab13be89f4c52ca3637c290eb3ca25ceda7
+EBUILD sysrepo-2.2.150-r1.ebuild 803 BLAKE2B 70a8ab478453e7e6a6ced380ab9c37ebe31fc7851966dae8205f63fdf02b0ceecae0178fff8a65e2848db924337efe5688dea936bf50839d960a41c45640c853 SHA512 a3f6f2144aba107b84f042d7b40617f99c9c3317371a3c981d68707832b0cbcd917bf546e9eebdaa0e517765f03f78f3e55eac890917ec2096af5930be2e9f42
+EBUILD sysrepo-3.3.10.ebuild 919 BLAKE2B 0517058c8a9405d44f8d0b4ebb0143a71a56c3590147bc335027826a7d3b794fc787263366352860775cf04d23fad03ea23fe5fe0a1048db550775647d4fe450 SHA512 d04a8478d2384a518e9e89e1efa0fc821192128e6246f3c0a6a78d5c19debeedad8455158c602d626848b7798b8bba4f28d48883db8c13032d39f699aa45e255
MISC metadata.xml 248 BLAKE2B cb7495b0d0bbbef4015da582c5d0e26e46379b57d7a8efa353c9e2c907e4b0c2d3bf184b306fae3c424899e02ca80efdfef208e9d7927cd57c1025d680669d43 SHA512 2af7aa773cda91fc77b579ad8294e8a5341299153540ef4e23cf33d595d09d82e9deca988638559999d6892708f1266370a7145dc7321a395554e574d1ea17d5
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?= <arkamar@gentoo.org>
+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?= <arkamar@gentoo.org>
+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-2.2.150.ebuild b/net-misc/sysrepo/sysrepo-2.2.150-r1.ebuild
index a72726f44f8d..5920d7e1e4b4 100644
--- a/net-misc/sysrepo/sysrepo-2.2.150.ebuild
+++ b/net-misc/sysrepo/sysrepo-2.2.150-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,10 @@ KEYWORDS="amd64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
-RDEPEND=">=net-libs/libyang-2.1.148"
+RDEPEND="
+ >=net-libs/libyang-2.1.148
+ <net-libs/libyang-2.2
+"
DEPEND="${RDEPEND}"
BDEPEND="doc? ( app-text/doxygen[dot] )"
diff --git a/net-misc/sysrepo/sysrepo-2.2.60.ebuild b/net-misc/sysrepo/sysrepo-3.3.10.ebuild
index 449c9eed931d..a54ce088c685 100644
--- a/net-misc/sysrepo/sysrepo-2.2.60.ebuild
+++ b/net-misc/sysrepo/sysrepo-3.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,18 +7,29 @@ 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"
+SRC_URI="
+ https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz
+"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
-RDEPEND=">=net-libs/libyang-2.1.55"
-DEPEND="${RDEPEND}"
+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)