aboutsummaryrefslogtreecommitdiff
path: root/sysutils/libdnf
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/libdnf')
-rw-r--r--sysutils/libdnf/Makefile4
-rw-r--r--sysutils/libdnf/distinfo6
-rw-r--r--sysutils/libdnf/files/patch-libdnf_dnf-repo.cpp11
-rw-r--r--sysutils/libdnf/files/patch-libdnf_hy-util.cpp4
-rw-r--r--sysutils/libdnf/files/patch-libdnf_utils_utils.cpp24
-rw-r--r--sysutils/libdnf/files/patch-python_hawkey_CMakeLists.txt8
-rw-r--r--sysutils/libdnf/files/patch-tests_CMakeLists.txt6
-rw-r--r--sysutils/libdnf/pkg-plist2
8 files changed, 51 insertions, 14 deletions
diff --git a/sysutils/libdnf/Makefile b/sysutils/libdnf/Makefile
index fe284a85bf85..e06422cf976b 100644
--- a/sysutils/libdnf/Makefile
+++ b/sysutils/libdnf/Makefile
@@ -1,5 +1,5 @@
PORTNAME= libdnf
-DISTVERSION= 0.73.4
+DISTVERSION= 0.75.0
CATEGORIES= sysutils
MAINTAINER= yuri@FreeBSD.org
@@ -51,6 +51,6 @@ ZCHUNK_DESC= With zchunk support
ZCHUNK_CMAKE_BOOL= WITH_ZCHUNK
ZCHUNK_BROKEN= Links with zchunk when WITH_ZCHUNK=OFF https://github.com/rpm-software-management/libdnf/issues/1515
-# Tests fail to compile: ld: error: unable to find library -ltestshared, see https://github.com/rpm-software-management/libdnf/issues/1574
+# tests as of 0.75.0: 100% tests passed, 0 tests failed out of 2
.include <bsd.port.mk>
diff --git a/sysutils/libdnf/distinfo b/sysutils/libdnf/distinfo
index 78460da75e18..533c59b19b8c 100644
--- a/sysutils/libdnf/distinfo
+++ b/sysutils/libdnf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737971787
-SHA256 (rpm-software-management-libdnf-0.73.4_GH0.tar.gz) = bce14012d29d58867669fc606938f6fa84f037efcd9c802150fba6506356814c
-SIZE (rpm-software-management-libdnf-0.73.4_GH0.tar.gz) = 1208308
+TIMESTAMP = 1764046596
+SHA256 (rpm-software-management-libdnf-0.75.0_GH0.tar.gz) = 0a06cc9656b10518c50f230ec8f7cf0218530823f6b2f28bf164899f8d569622
+SIZE (rpm-software-management-libdnf-0.75.0_GH0.tar.gz) = 1215141
diff --git a/sysutils/libdnf/files/patch-libdnf_dnf-repo.cpp b/sysutils/libdnf/files/patch-libdnf_dnf-repo.cpp
new file mode 100644
index 000000000000..f4237e94b3bd
--- /dev/null
+++ b/sysutils/libdnf/files/patch-libdnf_dnf-repo.cpp
@@ -0,0 +1,11 @@
+--- libdnf/dnf-repo.cpp.orig 2025-11-25 05:00:01 UTC
++++ libdnf/dnf-repo.cpp
+@@ -968,7 +968,7 @@ dnf_repo_conf_load_overrides(DnfRepo *repo, const char
+ const auto & section = cfg_parser_data_iter.first;
+ g_autofree gchar * repo_id_pattern = dnf_repo_substitute(repo, section.c_str());
+
+- if (fnmatch(repo_id_pattern, repoId, FNM_EXTMATCH) != 0) {
++ if (fnmatch(repo_id_pattern, repoId, 0/*FNM_EXTMATCH*/) != 0) {
+ continue;
+ }
+
diff --git a/sysutils/libdnf/files/patch-libdnf_hy-util.cpp b/sysutils/libdnf/files/patch-libdnf_hy-util.cpp
index 9d6558f93291..5a6b3a0d6887 100644
--- a/sysutils/libdnf/files/patch-libdnf_hy-util.cpp
+++ b/sysutils/libdnf/files/patch-libdnf_hy-util.cpp
@@ -1,6 +1,6 @@
---- libdnf/hy-util.cpp.orig 2020-09-20 22:48:40 UTC
+--- libdnf/hy-util.cpp.orig 2025-10-20 13:41:49 UTC
+++ libdnf/hy-util.cpp
-@@ -111,10 +111,12 @@ hy_detect_arch(char **arch)
+@@ -127,10 +127,12 @@ hy_detect_arch(char **arch)
char *modifier = un.machine + 5;
while(isdigit(*modifier)) /* keep armv7, armv8, armv9, armv10, armv100, ... */
modifier++;
diff --git a/sysutils/libdnf/files/patch-libdnf_utils_utils.cpp b/sysutils/libdnf/files/patch-libdnf_utils_utils.cpp
new file mode 100644
index 000000000000..6ec69f656c5b
--- /dev/null
+++ b/sysutils/libdnf/files/patch-libdnf_utils_utils.cpp
@@ -0,0 +1,24 @@
+--- libdnf/utils/utils.cpp.orig 2025-11-25 05:02:56 UTC
++++ libdnf/utils/utils.cpp
+@@ -308,10 +308,10 @@ std::vector<std::string> createSortedFileList(
+ if (path[strlen(path)-1] == '/') {
+ continue;
+ }
+- auto * path_fname = basename(path);
++ auto * path_fname = g_basename(path);
+ bool found{false};
+ for (const auto & path_in_list : paths) {
+- if (strcmp(path_fname, basename(path_in_list.c_str())) == 0) {
++ if (strcmp(path_fname, g_basename(path_in_list.c_str())) == 0) {
+ found = true;
+ break;
+ }
+@@ -325,7 +325,7 @@ std::vector<std::string> createSortedFileList(
+
+ // sort all drop-in configuration files alphabetically by their names
+ std::sort(paths.begin(), paths.end(), [](const std::string & p1, const std::string & p2) {
+- return strcmp(basename(p1.c_str()), basename(p2.c_str())) < 0;
++ return strcmp(g_basename(p1.c_str()), g_basename(p2.c_str())) < 0;
+ });
+
+ return paths;
diff --git a/sysutils/libdnf/files/patch-python_hawkey_CMakeLists.txt b/sysutils/libdnf/files/patch-python_hawkey_CMakeLists.txt
index 7480ad2fb387..5ee8a2cf71b2 100644
--- a/sysutils/libdnf/files/patch-python_hawkey_CMakeLists.txt
+++ b/sysutils/libdnf/files/patch-python_hawkey_CMakeLists.txt
@@ -1,9 +1,11 @@
---- python/hawkey/CMakeLists.txt.orig 2020-09-26 05:11:04 UTC
+--- python/hawkey/CMakeLists.txt.orig 2025-10-20 13:41:49 UTC
+++ python/hawkey/CMakeLists.txt
-@@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY})
+@@ -50,6 +50,8 @@ install(TARGETS _hawkeymodule LIBRARY DESTINATION ${PY
install(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
install(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
+if (BUILD_TESTING)
- add_subdirectory(tests)
+ IF (WITH_TESTS)
+endif()
+ add_subdirectory(tests)
+ ENDIF()
diff --git a/sysutils/libdnf/files/patch-tests_CMakeLists.txt b/sysutils/libdnf/files/patch-tests_CMakeLists.txt
index 6c12e3340ffa..cb7af9932078 100644
--- a/sysutils/libdnf/files/patch-tests_CMakeLists.txt
+++ b/sysutils/libdnf/files/patch-tests_CMakeLists.txt
@@ -1,6 +1,6 @@
---- tests/CMakeLists.txt.orig 2021-03-01 17:31:02 UTC
+--- tests/CMakeLists.txt.orig 2025-10-20 13:41:49 UTC
+++ tests/CMakeLists.txt
-@@ -3,7 +3,9 @@ add_subdirectory(libdnf/module)
+@@ -7,7 +7,9 @@ add_subdirectory(libdnf/sack)
add_subdirectory(libdnf/repo)
add_subdirectory(libdnf/transaction)
add_subdirectory(libdnf/sack)
@@ -9,4 +9,4 @@
+endif()
add_subdirectory(libdnf)
-
+ set(LIBDNF_TEST_SOURCES
diff --git a/sysutils/libdnf/pkg-plist b/sysutils/libdnf/pkg-plist
index 68641bfce8ff..9e75b04bbca8 100644
--- a/sysutils/libdnf/pkg-plist
+++ b/sysutils/libdnf/pkg-plist
@@ -58,7 +58,7 @@ lib/libdnf.so.2
lib/libdnf/plugins/README
%%PYTHON%%%%PYTHON_SITELIBDIR%%/hawkey/__init__.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/hawkey/_hawkey.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf-0.73.4.dist-info/METADATA
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf-0.75.0.dist-info/METADATA
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/__init__.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_common_types.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_conf.so
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-01 08:34:49 +0000