.ModemManager.metadata

@@ -1 +1 @@
-a07ff3f71000b16e1a4f4ab4870f742520bd750c SOURCES/ModemManager-1.20.2.tar.bz2
+c55bb358cda73f50f936e4c479a04c4dfe3773d8 SOURCES/ModemManager-1.22.0.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/ModemManager-1.20.2.tar.bz2
+SOURCES/ModemManager-1.22.0.tar.bz2

SOURCES/0001-mmcli-fix-a-memory-leak.patch

@@ -0,0 +1,25 @@
+From 509acb647462c5bd5c4b782076cb46a60dff9f07 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Sun, 7 Jul 2024 22:48:51 +0200
+Subject: [PATCH] mmcli: fix a memory leak
+
+Poor modem_uid got left behind.
+---
+ cli/mmcli-common.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cli/mmcli-common.c b/cli/mmcli-common.c
+index 404749321..11a7af9c4 100644
+--- a/cli/mmcli-common.c
++++ b/cli/mmcli-common.c
+@@ -1045,6 +1045,7 @@ mmcli_get_sim_sync (GDBusConnection  *connection,
+     }
+ 
+     g_list_free_full (modems, g_object_unref);
++    g_free (modem_uid);
+     g_free (sim_path);
+ 
+     if (o_manager)
+-- 
+2.45.2
+

SOURCES/0001-shared-qmi-do-not-leak-a-string-in-error-path.patch

@@ -0,0 +1,29 @@
+From 4c28ea13d9b1e75d0bc0dfa4c588b478635c12c0 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Thu, 23 May 2024 14:43:15 +0200
+Subject: [PATCH 01/11] shared-qmi: do not leak a string in error path
+
+---
+ src/mm-shared-qmi.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/mm-shared-qmi.c b/src/mm-shared-qmi.c
+index 8da4ecc69..923c6b51a 100644
+--- a/src/mm-shared-qmi.c
++++ b/src/mm-shared-qmi.c
+@@ -4905,9 +4905,10 @@ loc_location_get_server_indication_cb (QmiClientLoc                    *client,
+         str = g_strdup ("");
+ 
+ out:
+-    if (error)
++    if (error) {
++        g_free (str);
+         g_task_return_error (task, error);
+-    else {
++    } else {
+         g_assert (str);
+         g_task_return_pointer (task, str, g_free);
+     }
+-- 
+2.45.2
+

SOURCES/0001-ublox-helpers-fix-propagation-of-URAT-response-parse.patch

@@ -0,0 +1,43 @@
+From 664d748a934bbb7ff295b4cf0dd3557b316d9c35 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Thu, 23 May 2024 14:45:22 +0200
+Subject: [PATCH] ublox/helpers: fix propagation of +URAT response parse error
+
+The fallback error handling branch happens much too late, just leaking the
+newly made GError instead of propagating.
+---
+ src/plugins/ublox/mm-modem-helpers-ublox.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/plugins/ublox/mm-modem-helpers-ublox.c b/src/plugins/ublox/mm-modem-helpers-ublox.c
+index 0fd1c5b0b..a494dd027 100644
+--- a/src/plugins/ublox/mm-modem-helpers-ublox.c
++++ b/src/plugins/ublox/mm-modem-helpers-ublox.c
+@@ -1812,18 +1812,18 @@ mm_ublox_parse_urat_read_response (const gchar  *response,
+         }
+     }
+ 
++    if (!inner_error && allowed == MM_MODEM_MODE_NONE) {
++        inner_error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
++                                   "Couldn't parse +URAT response: %s", response);
++        goto out;
++    }
++
+ out:
+     if (inner_error) {
+         g_propagate_error (error, inner_error);
+         return FALSE;
+     }
+ 
+-    if (allowed == MM_MODEM_MODE_NONE) {
+-        inner_error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
+-                                   "Couldn't parse +URAT response: %s", response);
+-        return FALSE;
+-    }
+-
+     *out_allowed = allowed;
+     *out_preferred = preferred;
+     return TRUE;
+-- 
+2.45.2
+

SOURCES/0003-broadband-modem-fix-a-potential-leak-in-cusd_process.patch

@@ -0,0 +1,31 @@
+From eebd31b92e4e60078911decd87a8c6e658d20cd1 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Thu, 23 May 2024 14:54:03 +0200
+Subject: [PATCH 03/11] broadband-modem: fix a potential leak in
+ cusd_process_string() error handling
+
+On error, *converted may already be allocated and we need to free it
+(but not in case we're returning it from the task).
+---
+ src/mm-broadband-modem.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
+index 41906c2e5..b924c3a96 100644
+--- a/src/mm-broadband-modem.c
++++ b/src/mm-broadband-modem.c
+@@ -6306,9 +6306,10 @@ out:
+         if (error)
+             g_task_return_error (task, error);
+         else if (converted)
+-            g_task_return_pointer (task, converted, g_free);
++            g_task_return_pointer (task, g_steal_pointer(&converted), g_free);
+         else
+             g_assert_not_reached ();
++        g_clear_pointer (&converted, g_free);
+         return;
+     }
+ 
+-- 
+2.45.2
+

SOURCES/0004-shared-qmi-fix-a-leak-in-error-handling-path.patch

@@ -0,0 +1,30 @@
+From 4a3542b2d00c4104e9735af9eea906c703faed20 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Thu, 23 May 2024 14:56:40 +0200
+Subject: [PATCH 04/11] shared-qmi: fix a leak in error handling path
+
+str needs to be freed in pds_get_agps_config_ready().
+---
+ src/mm-shared-qmi.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/mm-shared-qmi.c b/src/mm-shared-qmi.c
+index 923c6b51a..789b92a4d 100644
+--- a/src/mm-shared-qmi.c
++++ b/src/mm-shared-qmi.c
+@@ -4795,9 +4795,10 @@ pds_get_agps_config_ready (QmiClientPds *client,
+         str = g_strdup ("");
+ 
+ out:
+-    if (error)
++    if (error) {
++        g_free (str);
+         g_task_return_error (task, error);
+-    else {
++    } else {
+         g_assert (str);
+         g_task_return_pointer (task, str, g_free);
+     }
+-- 
+2.45.2
+

SOURCES/0005-quectel-shared-do-not-leak-name-string.patch

@@ -0,0 +1,34 @@
+From 84941606219fe440f59fbbc6057ab3782c09bba4 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Sun, 26 May 2024 23:42:41 +0200
+Subject: [PATCH] quectel/shared: do not leak name string
+
+---
+ src/plugins/quectel/mm-shared-quectel.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/quectel/mm-shared-quectel.c b/src/plugins/quectel/mm-shared-quectel.c
+index 816a570..acd7c3c 100644
+--- a/src/plugins/quectel/mm-shared-quectel.c
++++ b/src/plugins/quectel/mm-shared-quectel.c
+@@ -285,8 +285,8 @@ quectel_at_port_get_firmware_revision_ready (MMBaseModem  *self,
+     MMFirmwareUpdateSettings    *update_settings;
+     MMModemFirmwareUpdateMethod  update_methods;
+     const gchar                 *revision;
+-    const gchar                 *name;
+     const gchar                 *id;
++    gchar                       *name;
+     g_autoptr(GPtrArray)         ids = NULL;
+     GError                      *error = NULL;
+ 
+@@ -309,6 +309,7 @@ quectel_at_port_get_firmware_revision_ready (MMBaseModem  *self,
+         mm_obj_dbg (self, "revision %s converted to modem name %s", revision, name);
+         id = (const gchar *) g_ptr_array_index (ids, 0);
+         g_ptr_array_insert (ids, 0, g_strdup_printf ("%s&NAME_%s", id, name));
++        g_free (name);
+     }
+ 
+     mm_firmware_update_settings_set_device_ids (update_settings, (const gchar **)ids->pdata);
+-- 
+2.45.2
+

SOURCES/0006-port-qmi-fix-array-bound-check.patch

@@ -0,0 +1,26 @@
+From 02d893f8abaffa51ad61b0bb6ce67f55de5cd217 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Sun, 26 May 2024 23:54:50 +0200
+Subject: [PATCH 06/11] port-qmi: fix array bound check
+
+There's an off-by-one error.
+---
+ src/mm-port-qmi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mm-port-qmi.c b/src/mm-port-qmi.c
+index f3c64464a..38703bc20 100644
+--- a/src/mm-port-qmi.c
++++ b/src/mm-port-qmi.c
+@@ -1641,7 +1641,7 @@ check_data_format_combination (GTask *task)
+ 
+     /* go on to the next supported combination */
+     for (++ctx->data_format_combination_i;
+-         ctx->data_format_combination_i <= (gint)G_N_ELEMENTS (data_format_combinations);
++         ctx->data_format_combination_i < (gint)G_N_ELEMENTS (data_format_combinations);
+          ctx->data_format_combination_i++) {
+         const DataFormatCombination *combination;
+         g_autofree gchar            *kernel_data_mode_str = NULL;
+-- 
+2.45.2
+

SOURCES/0007-mmcli-sms-do-not-leak-message_reference.patch

@@ -0,0 +1,25 @@
+From 7658e4be92a26c5e0245a3169fb61922f0e96811 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Sun, 26 May 2024 23:58:41 +0200
+Subject: [PATCH 07/11] mmcli/sms: do not leak message_reference
+
+---
+ cli/mmcli-sms.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cli/mmcli-sms.c b/cli/mmcli-sms.c
+index 6586d0373..46bc95ef8 100644
+--- a/cli/mmcli-sms.c
++++ b/cli/mmcli-sms.c
+@@ -191,6 +191,8 @@ print_sms_info (MMSms *sms)
+     mmcli_output_string           (MMC_F_SMS_PROPERTIES_DELIVERY_STATE,   delivery_state);
+     mmcli_output_string           (MMC_F_SMS_PROPERTIES_DISCH_TIMESTAMP,  mm_sms_get_discharge_timestamp (sms));
+     mmcli_output_dump ();
++
++    g_free (message_reference);
+ }
+ 
+ static void
+-- 
+2.45.2
+

SOURCES/0008-bearer-qmi-fix-a-copy-n-paste-error.patch

@@ -0,0 +1,27 @@
+From f8f41b677a234f98085854253b2a1a42b0f09d6f Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Sun, 26 May 2024 23:59:47 +0200
+Subject: [PATCH 08/11] bearer/qmi: fix a copy'n'paste error
+
+Probably not a real issue, given if there's a password there's probably
+an user name too.
+---
+ src/mm-bearer-qmi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c
+index 504134759..4e64e220c 100644
+--- a/src/mm-bearer-qmi.c
++++ b/src/mm-bearer-qmi.c
+@@ -1330,7 +1330,7 @@ build_start_network_input (ConnectContext *ctx)
+         if (ctx->auth != QMI_WDS_AUTHENTICATION_NONE) {
+             if (ctx->user)
+                 qmi_message_wds_start_network_input_set_username (input, ctx->user, NULL);
+-            if (ctx->user)
++            if (ctx->password)
+                 qmi_message_wds_start_network_input_set_password (input, ctx->password, NULL);
+         }
+     }
+-- 
+2.45.2
+

SOURCES/0009-sim-qmi-do-not-leak-access-technology-name.patch

@@ -0,0 +1,33 @@
+From 6a11c906d0604748db9a81bf470c821db2b862fb Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Mon, 27 May 2024 00:03:23 +0200
+Subject: [PATCH 09/11] sim/qmi: do not leak access technology name
+
+---
+ src/mm-sim-qmi.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/mm-sim-qmi.c b/src/mm-sim-qmi.c
+index 03a442403..1d24c23b4 100644
+--- a/src/mm-sim-qmi.c
++++ b/src/mm-sim-qmi.c
+@@ -991,11 +991,13 @@ set_preferred_networks_reload_ready (MMBaseSim    *self,
+         }
+         /* Check if there are access technology bits requested but unset */
+         if ((loaded_act & set_act) != set_act) {
+-            MMModemAccessTechnology unset = set_act & ~loaded_act;
++            MMModemAccessTechnology  unset = set_act & ~loaded_act;
++            gchar                   *act;
+ 
++            act = mm_modem_access_technology_build_string_from_mask (unset);
+             mm_obj_warn (self, "access technologies '%s' not set for operator code '%s'",
+-                         mm_modem_access_technology_build_string_from_mask (unset),
+-                         set_op_code);
++                         act, set_op_code);
++            g_free (act);
+             error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED,
+                                  "Access technology unsupported by modem or SIM");
+             break;
+-- 
+2.45.2
+

SOURCES/0010-libmm-glib-signal-fix-a-copy-n-paste-error.patch

@@ -0,0 +1,25 @@
+From 91f7bbf85b1fccc0c3297acf4203f32b1f195397 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Mon, 27 May 2024 00:04:38 +0200
+Subject: [PATCH 10/11] libmm-glib/signal: fix a copy'n'paste error
+
+---
+ libmm-glib/mm-signal.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmm-glib/mm-signal.c b/libmm-glib/mm-signal.c
+index e71cd24ba..f8d8c4aa5 100644
+--- a/libmm-glib/mm-signal.c
++++ b/libmm-glib/mm-signal.c
+@@ -379,7 +379,7 @@ mm_signal_get_string (MMSignal *self)
+         g_string_append_printf (printable, "%serror rate: %f %%", printable->len ? ", " : "", self->priv->error_rate);
+     if (self->priv->rscp != MM_SIGNAL_UNKNOWN)
+         g_string_append_printf (printable, "%sRSCP: %f dBm", printable->len ? ", " : "", self->priv->rscp);
+-    if (self->priv->rscp != MM_SIGNAL_UNKNOWN)
++    if (self->priv->rsrp != MM_SIGNAL_UNKNOWN)
+         g_string_append_printf (printable, "%sRSRP: %f dBm", printable->len ? ", " : "", self->priv->rsrp);
+     if (self->priv->rsrq != MM_SIGNAL_UNKNOWN)
+         g_string_append_printf (printable, "%sRSRQ: %f dB", printable->len ? ", " : "", self->priv->rsrq);
+-- 
+2.45.2
+

SOURCES/0011-modem-helpers-do-not-leak-past-PDP-on-error.patch

@@ -0,0 +1,39 @@
+From a877ed8015a4fcfb05961b5bfe9d03f47cdc55a5 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Mon, 27 May 2024 00:06:45 +0200
+Subject: [PATCH 11/11] modem-helpers: do not leak past PDP on error
+
+If CID parsing from the +CGDCONT response fails, the very last PDP
+structure allocated is not put on the list yet and therefore
+mm_3gpp_pdp_context_list_free() wouldn't free it.
+
+Let's put it on the list first, as to not leak it on error.
+---
+ src/mm-modem-helpers.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c
+index 8dad5a398..9f0c8a8ce 100644
+--- a/src/mm-modem-helpers.c
++++ b/src/mm-modem-helpers.c
+@@ -1870,6 +1870,8 @@ mm_3gpp_parse_cgdcont_read_response (const gchar *reply,
+             MM3gppPdpContext *pdp;
+ 
+             pdp = g_slice_new0 (MM3gppPdpContext);
++            list = g_list_prepend (list, pdp);
++
+             if (!mm_get_uint_from_match_info (match_info, 1, &pdp->cid)) {
+                 inner_error = g_error_new (MM_CORE_ERROR,
+                                            MM_CORE_ERROR_FAILED,
+@@ -1879,8 +1881,6 @@ mm_3gpp_parse_cgdcont_read_response (const gchar *reply,
+             }
+             pdp->pdp_type = ip_family;
+             pdp->apn = mm_get_string_unquoted_from_match_info (match_info, 3);
+-
+-            list = g_list_prepend (list, pdp);
+         }
+ 
+         g_free (str);
+-- 
+2.45.2
+

SPECS/ModemManager.spec

@@ -1,15 +1,30 @@
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 %global qmi_version %(pkg-config --modversion qmi-glib 2>/dev/null || echo bad)
 %global mbim_version %(pkg-config --modversion mbim-glib 2>/dev/null || echo bad)
+%global qrtr_version %(pkg-config --modversion qrtr-glib 2>/dev/null || echo bad)
 
 Name: ModemManager
-Version: 1.20.2
-Release: 1%{?dist}
+Version: 1.22.0
+Release: 7%{?dist}
 Summary: Mobile broadband modem management service
-License: GPLv2+
+License: GPL-2.0-or-later
 URL: http://www.freedesktop.org/wiki/Software/ModemManager/
 Source: https://gitlab.com/linux-mobile-broadband/ModemManager/-/archive/%{version}/%{name}-%{version}.tar.bz2
 
+# All of these are applied upstream. Can frop on rebase to 1.24
+Patch0: 0001-shared-qmi-do-not-leak-a-string-in-error-path.patch
+Patch1: 0001-ublox-helpers-fix-propagation-of-URAT-response-parse.patch
+Patch2: 0003-broadband-modem-fix-a-potential-leak-in-cusd_process.patch
+Patch3: 0004-shared-qmi-fix-a-leak-in-error-handling-path.patch
+Patch4: 0005-quectel-shared-do-not-leak-name-string.patch
+Patch5: 0006-port-qmi-fix-array-bound-check.patch
+Patch6: 0007-mmcli-sms-do-not-leak-message_reference.patch
+Patch7: 0008-bearer-qmi-fix-a-copy-n-paste-error.patch
+Patch8: 0009-sim-qmi-do-not-leak-access-technology-name.patch
+Patch9: 0010-libmm-glib-signal-fix-a-copy-n-paste-error.patch
+Patch10: 0011-modem-helpers-do-not-leak-past-PDP-on-error.patch
+Patch11: 0001-mmcli-fix-a-memory-leak.patch
+
 # For mbim-proxy and qmi-proxy
 Requires: libmbim-utils
 Requires: libqmi-utils
@@ -20,6 +35,7 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 Conflicts: glib2%{?_isa} < %{glib2_version}
 Conflicts: libqmi%{?_isa} < %{qmi_version}
 Conflicts: libmbim%{?_isa} < %{mbim_version}
+Conflicts: libqrtr-glib%{?_isa} < %{qrtr_version}
 
 Requires(post): systemd
 Requires(postun): systemd
@@ -27,18 +43,17 @@ Requires(preun): systemd
 
 Requires: polkit
 
-BuildRequires: automake autoconf libtool autoconf-archive
-BuildRequires: dbus
+BuildRequires: meson >= 0.53
+BuildRequires: dbus-devel
 BuildRequires: dbus-daemon
 BuildRequires: gettext-devel >= 0.19.8
 BuildRequires: glib2-devel >= 2.56
 BuildRequires: gobject-introspection-devel >= 1.38
 BuildRequires: gtk-doc
 BuildRequires: libgudev1-devel >= 232
-BuildRequires: libmbim-devel >= 1.28.0
+BuildRequires: libmbim-devel >= 1.30.0
 BuildRequires: libqmi-devel >= 1.32.0
 BuildRequires: libqrtr-glib-devel >= 1.0.0
-BuildRequires: make
 BuildRequires: systemd
 BuildRequires: systemd-devel >= 209
 BuildRequires: vala
@@ -50,6 +65,7 @@ BuildRequires: polkit-devel
 The ModemManager service manages WWAN modems and provides a consistent API for
 interacting with these devices to client applications.
 
+
 %package devel
 Summary: Libraries and headers for adding ModemManager support to applications
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -59,16 +75,20 @@ Requires: pkgconfig
 This package contains various headers for accessing some ModemManager functionality
 from applications.
 
+
 %package glib
 Summary: Libraries for adding ModemManager support to applications that use glib.
+License: LGPL-2.1-or-later
 Requires: glib2 >= %{glib2_version}
 
 %description glib
 This package contains the libraries that make it easier to use some ModemManager
 functionality from applications that use glib.
 
+
 %package glib-devel
 Summary: Libraries and headers for adding ModemManager support to applications that use glib.
+License: LGPL-2.1-or-later
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
@@ -79,61 +99,63 @@ Requires: pkgconfig
 This package contains various headers for accessing some ModemManager functionality
 from glib applications.
 
+
 %package vala
 Summary: Vala bindings for ModemManager
+License: LGPL-2.1-or-later
 Requires: vala
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 
 %description vala
 Vala bindings for ModemManager
 
+
 %prep
 %autosetup -p1
 
+
 %build
-# Regenerate configure, because the one that is shipped
-# doesn't seem to obey --disable-rpath for reasons unknown.
-autoreconf -vif
-%configure \
-	--disable-rpath \
-	--disable-silent-rules \
-	--with-systemd-suspend-resume \
-	--with-systemd-journal \
-	--enable-more-warnings=no \
-	--with-udev-base-dir=%{_prefix}/lib/udev \
-	--enable-gtk-doc \
-	--with-qmi=yes \
-	--with-mbim=yes \
-%ifarch aarch64
-	--enable-plugin-qcom-soc \
-%endif
-	--disable-static \
-	--with-polkit=permissive \
-	--with-dist-version=%{version}-%{release}
-
-%make_build
+# Let's avoid BuildRequiring bash-completion because it changes behavior
+# of shell, at least until the .pc file gets into the -devel subpackage.
+# We'll just install the bash-completion file ourselves.
+%meson \
+	-Ddist_version='"%{version}-%{release}"' \
+	-Dudevdir=/usr/lib/udev \
+	-Dsystemdsystemunitdir=%{_unitdir} \
+	-Dvapi=true \
+	-Dgtk_doc=true \
+	-Dpolkit=permissive \
+	-Dbash_completion=false
+%meson_build
 
-%check
-# make check
 
 %install
-%make_install
+%meson_install
+find %{buildroot}%{_datadir}/gtk-doc |xargs touch --reference meson.build
+%find_lang %{name}
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
+cp -a cli/mmcli-completion %{buildroot}%{_datadir}/bash-completion/completions/mmcli
 
-find %{buildroot} -type f -name "*.la" -delete
 
-%find_lang %{name}
+%check
+# meson_test
+
 
 %ldconfig_scriptlets glib
 
+
 %post
 %systemd_post ModemManager.service
 
+
 %preun
 %systemd_preun ModemManager.service
 
+
 %postun
 %systemd_postun ModemManager.service
 
+
 %files -f %{name}.lang
 %license COPYING
 %doc README
@@ -152,6 +174,7 @@ find %{buildroot} -type f -name "*.la" -delete
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 
+
 %files devel
 %{_includedir}/ModemManager/
 %dir %{_datadir}/gtk-doc/html/%{name}
@@ -159,11 +182,13 @@ find %{buildroot} -type f -name "*.la" -delete
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/dbus-1/interfaces/*.xml
 
+
 %files glib
 %license COPYING
 %{_libdir}/libmm-glib.so.*
 %{_libdir}/girepository-1.0/*.typelib
 
+
 %files glib-devel
 %{_libdir}/libmm-glib.so
 %dir %{_includedir}/libmm-glib
@@ -173,37 +198,97 @@ find %{buildroot} -type f -name "*.la" -delete
 %{_datadir}/gtk-doc/html/libmm-glib/*
 %{_datadir}/gir-1.0/*.gir
 
+
 %files vala
 %{_datadir}/vala/vapi/libmm-glib.*
 
+
 %changelog
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.22.0-7
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Wed Jul 10 2024 Lubomir Rintel <lkundrak@v3.sk> - 1.22.0-6
+- Some more static analysis fixes (RHEL-38991)
+
+* Tue Jun 25 2024 Lubomir Rintel <lkundrak@v3.sk> - 1.22.0-5
+- Add patches for a couple of bugs that make static analysis unhappy (RHEL-38991)
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.22.0-4
+- Bump release for June 2024 mass rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jan 09 2024 Dennis Gilmore <dennis@ausil.us> - 1.22.0-1
+- update to 1.22.0
+
+* Sun Jul 30 2023 Tao Jin <tao-j@outlook.com> - 1.20.6-3
+- Rebuilt for RHBZ#2226577
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Mar 24 2023 Lubomir Rintel <lkundrak@v3.sk> - 1.20.6-1
+- Update to 1.20.6
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Jan 10 2023 Lubomir Rintel <lkundrak@v3.sk> - 1.20.2-3
+- Version the qrtr-glib dependency
+
+* Sun Jan 08 2023 Lubomir Rintel <lkundrak@v3.sk> - 1.20.2-2
+- Switch to build using meson
+
 * Tue Nov 22 2022 Lubomir Rintel <lkundrak@v3.sk> - 1.20.2-1
 - Update to 1.20.2
 
-* Wed Dec 15 2021 Ana Cabral <acabral@redhat.com> - 1.18.2-3
-- Rebuild to update libqmi's libqrtr support (rh #2032807)
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat May 14 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 1.18.8-1
+- Update to 1.18.8
 
-* Fri Dec 10 2021 Ana Cabral <acabral@redhat.com> - 1.18.2-2
-- Include libqrtr-glib build dependency (rh #1996716)
+* Sat Feb 12 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 1.18.6-1
+- Update to 1.18.6
 
-* Thu Oct 7 2021 Ana Cabral <acabral@redhat.com> - 1.18.2-1
-- Upgrade to 1.18.2
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Mon Sep 13 2021 Wen Liang <wenliang@redhat.com> - 1.18.0-1
+* Sun Sep 19 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.18.2-1
+- update to 1.18.2
+
+* Mon Sep 13 2021 Thomas Haller <thaller@redhat.com> - 1.18.0-2
+- depend ModemManager on polkit package
+
+* Sun Sep 12 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.18.0-1
 - Update to 1.18.0
 
-* Fri Aug 20 2021 Thomas Haller <thaller@redhat.com> - 1.14.10-6
-- depend ModemManager on polkit package (rh #1995186)
+* Sat Aug 14 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.17.900-1
+- Update to 1.18.0 RC1
+
+* Wed Aug 04 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.16.8-4
+- Rebuild for new libmbim/libqmi
+
+* Thu Jul 29 2021 Bastien Nocera <bnocera@redhat.com> - 1.16.8-3
++ ModemManager-1.16.8-3
+- Add polkit support as used upstream
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Thu Aug 19 2021 Thomas Haller <thaller@redhat.com> - 1.14.10-5
-- enable polkit support to allow normal users to access modems (rh #1995186)
+* Sat Jul 17 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.16.8-1
+- Update to 1.16.8
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.10-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Jun 07 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.16.6-1
+- Update to 1.16.6
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.10-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Apr 30 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.16.4-1
+- Update to 1.16.4
 
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild