Skip to content

Bumped libntech to master (3.27.x) #6082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larsewi merged 3 commits into from
Apr 24, 2026
Merged

Bumped libntech to master (3.27.x) #6082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec15e39
Bumped libntech to master
larsewi Apr 22, 2026
07f461a
Added trailing sep in acceptance tests
victormlg Mar 25, 2026
0b05578
Fix MinGW cross-compilation: ws2_32 linkage and snprintf C99 detection
larsewi Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ dnl
dnl Various functions
dnl

AC_SEARCH_LIBS(setsockopt, socket)
AC_SEARCH_LIBS(setsockopt, [socket ws2_32])
AC_SEARCH_LIBS(gethostent, nsl)

AC_CHECK_FUNCS(socket)
Expand Down
2 changes: 1 addition & 1 deletion examples/findfiles.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ bundle agent run
###############################################################################
#+begin_src example_output
#@ ```
#@ R: All files that match '/[tT][mM][pP]' = /tmp
#@ R: All files that match '/[tT][mM][pP]' = /tmp/
#@ ```
#+end_src
2 changes: 1 addition & 1 deletion libntech
Open in desktop
Submodule libntech updated 7 files
+11 −2 configure.ac
+3 −0 libutils/file_lib.c
+9 −2 libutils/glob_lib.c
+4 −0 libutils/logging.c
+1 −0 libutils/logging.h
+6 −2 m4/snprintf.m4
+11 −11 tests/unit/glob_lib_test.c
8 changes: 6 additions & 2 deletions m4/snprintf.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ AC_DEFUN([HW_FUNC_VSNPRINTF],
return 1;]])],
[hw_cv_func_vsnprintf_c99=yes],
[hw_cv_func_vsnprintf_c99=no],
[hw_cv_func_vsnprintf_c99=no])])],
[AS_CASE([$host_os],
[mingw*], [hw_cv_func_vsnprintf_c99=yes],
[hw_cv_func_vsnprintf_c99=no])])])],
[hw_cv_func_snprintf_c99=no])
AS_IF(
[test "$hw_cv_func_vsnprintf_c99" = yes],
Expand Down Expand Up @@ -178,7 +180,9 @@ AC_DEFUN([HW_FUNC_SNPRINTF],
return 1;]])],
[hw_cv_func_snprintf_c99=yes],
[hw_cv_func_snprintf_c99=no],
[hw_cv_func_snprintf_c99=no])])],
[AS_CASE([$host_os],
[mingw*], [hw_cv_func_snprintf_c99=yes],
[hw_cv_func_snprintf_c99=no])])])],
[hw_cv_func_snprintf_c99=no])
AS_IF(
[test "$hw_cv_func_snprintf_c99" = yes],
Expand Down
8 changes: 4 additions & 4 deletions tests/acceptance/01_vars/02_functions/findfiles.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ bundle agent check
{
vars:
!windows::
"expected[a]" string => "$(G.testdir)/a,$(G.testdir)/d,$(G.testdir)/g";
"expected[b]" string => "$(G.testdir)/a,$(G.testdir)/bc,$(G.testdir)/d,$(G.testdir)/g,$(G.testdir)/klm,$(G.testdir)/tu";
"expected[a]" string => "$(G.testdir)/a,$(G.testdir)/d/,$(G.testdir)/g/";
"expected[b]" string => "$(G.testdir)/a,$(G.testdir)/bc,$(G.testdir)/d/,$(G.testdir)/g/,$(G.testdir)/klm/,$(G.testdir)/tu/";

"expected[c]" string => "$(G.testdir)/d/e,$(G.testdir)/g/h";
"expected[c]" string => "$(G.testdir)/d/e/,$(G.testdir)/g/h/";
"expected[d]" string => "$(G.testdir)/a,$(G.testdir)/bc";
"expected[e]" string => "";

"expected[f]" string => "$(G.testdir)/tu/*";
"expected[g]" string => "$(G.testdir)/a,$(G.testdir)/bc,$(G.testdir)/d,$(G.testdir)/g,$(G.testdir)/klm,$(G.testdir)/tu,$(G.testdir)/d/e,$(G.testdir)/g/h,$(G.testdir)/klm/nop,$(G.testdir)/tu/*,$(G.testdir)/d/e/f,$(G.testdir)/g/h/i,$(G.testdir)/klm/nop/qrs,$(G.testdir)/g/h/i/j";
"expected[g]" string => "$(G.testdir)/a,$(G.testdir)/bc,$(G.testdir)/d/,$(G.testdir)/g/,$(G.testdir)/klm/,$(G.testdir)/tu/,$(G.testdir)/d/e/,$(G.testdir)/g/h/,$(G.testdir)/klm/nop/,$(G.testdir)/tu/*,$(G.testdir)/d/e/f,$(G.testdir)/g/h/i/,$(G.testdir)/klm/nop/qrs,$(G.testdir)/g/h/i/j";
"expected[h]" string => "$(G.testdir)/g/h/i/j";
windows::
"expected[a]" string => "$(G.testdir)\\a,$(G.testdir)\\d,$(G.testdir)\\g";
Expand Down
12 changes: 6 additions & 6 deletions tests/acceptance/01_vars/02_functions/findfiles_up.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ bundle agent check
);
"c3"
expression => and(
strcmp("$(G.testdir)\\core\\libntech\\.git", "$(test.t3[0])"),
strcmp("$(G.testdir)\\core\\.git", "$(test.t3[1])")
strcmp("$(G.testdir)\\core\\libntech\\.git\\", "$(test.t3[0])"),
strcmp("$(G.testdir)\\core\\.git\\", "$(test.t3[1])")
);
"c4"
expression => and(
strcmp("$(G.testdir)\\core\\libntech\\.git", "$(test.t4[0])"),
strcmp("$(G.testdir)\\core\\libntech\\.git\\", "$(test.t4[0])"),
not(isvariable("test.t4[1]"))
);
"c5"
Expand All @@ -106,12 +106,12 @@ bundle agent check
);
"c3"
expression => and(
strcmp("$(G.testdir)/core/libntech/.git", "$(test.t3[0])"),
strcmp("$(G.testdir)/core/.git", "$(test.t3[1])")
strcmp("$(G.testdir)/core/libntech/.git/", "$(test.t3[0])"),
strcmp("$(G.testdir)/core/.git/", "$(test.t3[1])")
);
"c4"
expression => and(
strcmp("$(G.testdir)/core/libntech/.git", "$(test.t4[0])"),
strcmp("$(G.testdir)/core/libntech/.git/", "$(test.t4[0])"),
not(isvariable("test.t4[1]"))
);
"c5"
Expand Down
Loading