diff options
Diffstat (limited to 'sysutils/libdnf/files')
5 files changed, 45 insertions, 8 deletions
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 |