Merging upstream version 2.40.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 60 insertions, 3 deletions

diff --git a/libsmartcols/docs/Makefile.in b/libsmartcols/docs/Makefile.in
index de740f1..df70f76 100644
--- a/libsmartcols/docs/Makefile.in
+++ b/libsmartcols/docs/Makefile.in
@@ -117,7 +117,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_vscript.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
 	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tls.m4 \
-	$(top_srcdir)/m4/ul.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/ul.m4 $(top_srcdir)/m4/year2038.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -159,10 +160,12 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BISON = @BISON@
 BSD_WARN_CFLAGS = @BSD_WARN_CFLAGS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTSETUP_CFLAGS = @CRYPTSETUP_CFLAGS@
@@ -192,6 +195,7 @@ ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FILECMD = @FILECMD@
+FLEX = @FLEX@
 FUZZING_ENGINE_LDFLAGS = @FUZZING_ENGINE_LDFLAGS@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
@@ -219,6 +223,8 @@ LIBFDISK_VERSION = @LIBFDISK_VERSION@
 LIBFDISK_VERSION_INFO = @LIBFDISK_VERSION_INFO@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBLASTLOG2_VERSION = @LIBLASTLOG2_VERSION@
+LIBLASTLOG2_VERSION_INFO = @LIBLASTLOG2_VERSION_INFO@
 LIBMOUNT_MAJOR_VERSION = @LIBMOUNT_MAJOR_VERSION@
 LIBMOUNT_MINOR_VERSION = @LIBMOUNT_MINOR_VERSION@
 LIBMOUNT_PATCH_VERSION = @LIBMOUNT_PATCH_VERSION@
@@ -244,6 +250,7 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIBS = @MATH_LIBS@
 MKDIR_P = @MKDIR_P@
+MQ_LIBS = @MQ_LIBS@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -257,7 +264,6 @@ NCURSES_CFLAGS = @NCURSES_CFLAGS@
 NCURSES_LIBS = @NCURSES_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NO_UNUSED_WARN_CFLAGS = @NO_UNUSED_WARN_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -297,6 +303,8 @@ SHELL = @SHELL@
 SOCKET_LIBS = @SOCKET_LIBS@
 SOLIB_CFLAGS = @SOLIB_CFLAGS@
 SOLIB_LDFLAGS = @SOLIB_LDFLAGS@
+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
+SQLITE3_LIBS = @SQLITE3_LIBS@
 STRIP = @STRIP@
 SUID_CFLAGS = @SUID_CFLAGS@
 SUID_LDFLAGS = @SUID_LDFLAGS@
@@ -382,6 +390,7 @@ sysconfdir = @sysconfdir@
 sysconfstaticdir = @sysconfstaticdir@
 systemdsystemunitdir = @systemdsystemunitdir@
 target_alias = @target_alias@
+tmpfilesdir = @tmpfilesdir@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -391,6 +400,7 @@ usrsbin_execdir = @usrsbin_execdir@
 vendordir = @vendordir@
 with_bashcompletiondir = @with_bashcompletiondir@
 with_systemdsystemunitdir = @with_systemdsystemunitdir@
+with_tmpfilesdir = @with_tmpfilesdir@
 
 # We require automake 1.10 at least.
 AUTOMAKE_OPTIONS = 1.10
diff --git a/libsmartcols/docs/libsmartcols-docs.xml b/libsmartcols/docs/libsmartcols-docs.xml
index 9ded584..bd55182 100644
--- a/libsmartcols/docs/libsmartcols-docs.xml
+++ b/libsmartcols/docs/libsmartcols-docs.xml
@@ -35,6 +35,7 @@ available from https://www.kernel.org/pub/linux/utils/util-linux/.
     <xi:include href="xml/cell.xml"/>
     <xi:include href="xml/symbols.xml"/>
     <xi:include href="xml/grouping.xml"/>
+    <xi:include href="xml/filter.xml"/>
   </part>
   <part>
     <title>Printing</title>
@@ -82,4 +83,16 @@ available from https://www.kernel.org/pub/linux/utils/util-linux/.
     <title>Index of new symbols in 2.35</title>
     <xi:include href="xml/api-index-2.35.xml"><xi:fallback /></xi:include>
   </index>
+  <index role="2.38">
+    <title>Index of new symbols in 2.38</title>
+    <xi:include href="xml/api-index-2.38.xml"><xi:fallback /></xi:include>
+  </index>
+  <index role="2.39">
+    <title>Index of new symbols in 2.39</title>
+    <xi:include href="xml/api-index-2.39.xml"><xi:fallback /></xi:include>
+  </index>
+  <index role="2.40">
+    <title>Index of new symbols in 2.40</title>
+    <xi:include href="xml/api-index-2.40.xml"><xi:fallback /></xi:include>
+  </index>
 </book>
diff --git a/libsmartcols/docs/libsmartcols-sections.txt b/libsmartcols/docs/libsmartcols-sections.txt
index fd6f2ba..5b343d0 100644
--- a/libsmartcols/docs/libsmartcols-sections.txt
+++ b/libsmartcols/docs/libsmartcols-sections.txt
@@ -5,9 +5,11 @@ scols_cell_copy_content
 scols_cell_get_alignment
 scols_cell_get_color
 scols_cell_get_data
+scols_cell_get_datasiz
 scols_cell_get_flags
 scols_cell_get_userdata
 scols_cell_refer_data
+scols_cell_refer_memory
 scols_cell_set_color
 scols_cell_set_data
 scols_cell_set_flags
@@ -20,6 +22,7 @@ scols_reset_cell
 <FILE>column</FILE>
 libscols_column
 scols_column_get_color
+scols_column_get_data_type
 scols_column_get_flags
 scols_column_get_header
 scols_column_get_json_type
@@ -29,6 +32,8 @@ scols_column_get_safechars
 scols_column_get_table
 scols_column_get_whint
 scols_column_get_width
+scols_column_get_wrap_data
+scols_column_has_data_func
 scols_column_is_customwrap
 scols_column_is_hidden
 scols_column_is_noextremes
@@ -39,6 +44,8 @@ scols_column_is_trunc
 scols_column_is_wrap
 scols_column_set_cmpfunc
 scols_column_set_color
+scols_column_set_data_func
+scols_column_set_data_type
 scols_column_set_flags
 scols_column_set_json_type
 scols_column_set_name
@@ -50,8 +57,10 @@ scols_copy_column
 scols_new_column
 scols_ref_column
 scols_unref_column
+scols_shellvar_name
 scols_wrapnl_chunksize
 scols_wrapnl_nextchunk
+scols_wrapzero_nextchunk
 </SECTION>
 
 <SECTION>
@@ -64,6 +73,30 @@ scols_reset_iter
 </SECTION>
 
 <SECTION>
+<FILE>filter</FILE>
+libscols_filter
+libscols_counter
+scols_counter_get_name
+scols_counter_get_result
+scols_counter_set_func
+scols_counter_set_name
+scols_counter_set_param
+scols_dump_filter
+scols_filter_assign_column
+scols_filter_get_errmsg
+scols_filter_new_counter
+scols_filter_next_counter
+scols_filter_next_holder
+scols_filter_parse_string
+scols_filter_set_filler_cb
+scols_line_apply_filter
+scols_line_is_filled
+scols_new_filter
+scols_ref_filter
+scols_unref_filter
+</SECTION>
+
+<SECTION>
 <FILE>line</FILE>
 libscols_line
 scols_copy_line
@@ -146,6 +179,7 @@ scols_table_enable_shellvar
 scols_table_get_column
 scols_table_get_column_by_name
 scols_table_get_column_separator
+scols_table_get_cursor
 scols_table_get_line
 scols_table_get_line_separator
 scols_table_get_name
diff --git a/libsmartcols/docs/version.xml b/libsmartcols/docs/version.xml
index a69af57..4bdd32f 100644
--- a/libsmartcols/docs/version.xml
+++ b/libsmartcols/docs/version.xml
@@ -1 +1 @@
-2.39.3
+2.40