Merge remote-tracking branch 'cros/upstream' into 'cros/master'
Change-Id: I3b87fb0a7e378237773321bb7f0385c4aeaf57c9
diff --git a/NEWS b/NEWS
index 2c3663e..5d3f821 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,45 @@
+Overview of changes in libmbim 1.18
+----------------------------------------
+
+ * Build now looks for the correct python provider in the system during
+ configure.
+
+ * New Microsoft Basic Connect Extensions service, that includes new commands to
+ manage Protocol Configuration Operations (PCO) as well as LTE attach status
+ and settings.
+
+ * libmbim-glib:
+ ** Added support to fully print all message contents, including all fields,
+ when traces are enabled.
+ ** Added support for QMI indications over MBIM.
+ ** Added additional cause codes to MbimNwError.
+ ** Fixed signal emission in device, so that it's done before completing
+ transaction task.
+
+ * mbim-proxy:
+ ** Fixed the management of subscribed events, so that the lists are
+ maintained per-device.
+
+ * mbimcli:
+ ** New '--ms-query-pco' action.
+ ** New '--ms-query-lte-attach-configuration' action.
+ ** New '--ms-query-lte-attach-status' action.
+
+ * Several other minor improvements and fixes.
+
+The following features which were backported to 1.16.x releases are also present
+in libmbim 1.18.0:
+
+ * mbimcli:
+ ** Fix SNR reporting in --atds-query-signal output.
+ ** Longer timeout (60s) in --disconnect.
+ ** Add "ip-type" property to --connect
+
+ * libmbim-glib:
+ ** Fix printing message in Intel Firmware Update service.
+ ** Fix error reporting when unknown status.
+
Overview of changes in libmbim 1.16
----------------------------------------
diff --git a/configure.ac b/configure.ac
index 39396ff..26898ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
dnl The libmbim version number
m4_define([mbim_major_version], [1])
-m4_define([mbim_minor_version], [17])
-m4_define([mbim_micro_version], [5])
+m4_define([mbim_minor_version], [19])
+m4_define([mbim_micro_version], [0])
m4_define([mbim_version],
[mbim_major_version.mbim_minor_version.mbim_micro_version])
@@ -16,9 +16,9 @@
dnl with old code), increment a.
dnl If the interface has changed in an incompatible way (that is,
dnl functions have changed or been removed), then zero a.
-m4_define([mbim_glib_lt_current], [7])
+m4_define([mbim_glib_lt_current], [8])
m4_define([mbim_glib_lt_revision], [0])
-m4_define([mbim_glib_lt_age], [3])
+m4_define([mbim_glib_lt_age], [4])
AC_INIT([libmbim], [mbim_version], [libmbim-devel@lists.freedesktop.org])
diff --git a/docs/reference/libmbim-glib/libmbim-glib-docs.xml b/docs/reference/libmbim-glib/libmbim-glib-docs.xml
index a13b68a..478d89e 100644
--- a/docs/reference/libmbim-glib/libmbim-glib-docs.xml
+++ b/docs/reference/libmbim-glib/libmbim-glib-docs.xml
@@ -17,6 +17,7 @@
<year>2016</year>
<year>2017</year>
<year>2018</year>
+ <year>2019</year>
<holder>The libmbim-glib authors</holder>
</copyright>
diff --git a/m4/compiler-warnings.m4 b/m4/compiler-warnings.m4
index eb78503..77b79c5 100644
--- a/m4/compiler-warnings.m4
+++ b/m4/compiler-warnings.m4
@@ -15,7 +15,7 @@
-Wundef -Wimplicit-function-declaration \
-Wpointer-arith -Winit-self -Wshadow \
-Wmissing-include-dirs -Waggregate-return \
- -Wformat-security; do
+ -Wformat-security -Wtype-limits; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
AC_MSG_CHECKING([whether gcc understands $option])
diff --git a/src/mbim-proxy/mbim-proxy.c b/src/mbim-proxy/mbim-proxy.c
index d2cd77f..95585ae 100644
--- a/src/mbim-proxy/mbim-proxy.c
+++ b/src/mbim-proxy/mbim-proxy.c
@@ -125,7 +125,7 @@
{
g_print ("\n"
PROGRAM_NAME " " PROGRAM_VERSION "\n"
- "Copyright (C) 2013-2018 Aleksander Morgado\n"
+ "Copyright (C) 2013-2019 Aleksander Morgado\n"
"Copyright (C) 2014-2018 Greg Suarez\n"
"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl-2.0.html>\n"
"This is free software: you are free to change and redistribute it.\n"
diff --git a/src/mbimcli/mbimcli.c b/src/mbimcli/mbimcli.c
index 5ee03b7..5703f4f 100644
--- a/src/mbimcli/mbimcli.c
+++ b/src/mbimcli/mbimcli.c
@@ -172,7 +172,7 @@
{
g_print ("\n"
PROGRAM_NAME " " PROGRAM_VERSION "\n"
- "Copyright (C) 2013-2018 Aleksander Morgado\n"
+ "Copyright (C) 2013-2019 Aleksander Morgado\n"
"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl-2.0.html>\n"
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
