Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,53 +1 @@
-ModemManager-0.2-20090707.tar.bz2
-ModemManager-0.2-20090826.tar.bz2
-ModemManager-0.2-20091105.tar.bz2
-ModemManager-0.2.997.tar.bz2
-ModemManager-0.2.997.git20091214.tar.bz2
-ModemManager-0.2.997.git20091216.tar.bz2
-ModemManager-0.2.997.git20091218.tar.bz2
-ModemManager-0.2.997.git20100101.tar.bz2
-ModemManager-0.3.git20100119.tar.bz2
-ModemManager-0.3.git20100211.tar.bz2
-ModemManager-0.3.git20100317.tar.bz2
-ModemManager-0.3.git20100323.tar.bz2
-ModemManager-0.3.git20100331.tar.bz2
-ModemManager-0.3.git20100405.tar.bz2
-ModemManager-0.3.git20100408.tar.bz2
-ModemManager-0.3.git20100409.tar.bz2
-ModemManager-0.3.git20100502.tar.bz2
-ModemManager-0.3.git20100504.tar.bz2
-ModemManager-0.3.git20100507.tar.bz2
-ModemManager-0.4.git20100628.tar.bz2
-ModemManager-0.4.git20100630.tar.bz2
-ModemManager-0.4.git20100720.tar.bz2
-/ModemManager-0.4.git20110201.tar.bz2
-/ModemManager-0.5.1.96.tar.bz2
-/ModemManager-0.5.999.tar.bz2
-/ModemManager-0.7.990.git20130515.tar.bz2
-/ModemManager-0.7.991.git20130607.tar.bz2
-/ModemManager-0.7.991.git20130710.tar.xz
-/ModemManager-1.0.1.git20130723.tar.xz
-/ModemManager-1.2.0.tar.xz
-/ModemManager-1.3.0.git20140805.3dd6f931.tar.xz
-/ModemManager-1.4.0.tar.xz
-/ModemManager-1.4.2.tar.xz
-/ModemManager-1.4.4.tar.xz
-/ModemManager-1.4.6.tar.xz
-/ModemManager-1.4.10.tar.xz
-/ModemManager-1.4.14.tar.xz
-/ModemManager-1.5.990.tar.xz
-/ModemManager-1.5.991.tar.xz
-/ModemManager-1.5.992.tar.xz
-/ModemManager-1.5.993.tar.xz
-/ModemManager-1.6.0.tar.xz
-/ModemManager-1.6.2.tar.xz
-/ModemManager-1.6.4.tar.xz
-/ModemManager-1.6.8.tar.xz
-/ModemManager-1.6.10.tar.xz
-/ModemManager-1.6.12.tar.xz
-/ModemManager-1.7.991.tar.xz
-/ModemManager-1.8.0.tar.xz
-/ModemManager-1.8.2.tar.xz
-/ModemManager-1.9.990.tar.xz
-/ModemManager-1.10.0.tar.xz
-/ModemManager-1.10.2.tar.xz
+/ModemManager-*.tar.xz

0001-plugin-ignore-unwanted-net-ports.patch

@@ -1,185 +0,0 @@
-From fd1a26fc36df005d66627109875631264d2f8e19 Mon Sep 17 00:00:00 2001
-From: Aleksander Morgado <aleksander@aleksander.es>
-Date: Wed, 22 May 2019 23:20:30 +0200
-Subject: [PATCH] plugin: ignore unwanted net ports
-
- * For QMI modems, make sure we only grab QMI data ports (flag the
-   rest as ignored).
- * For MBIM modems, make sure we only grab MBIM data ports (flag the
-   rest as ignored).
- * For other plugins that use NET ports in their logic, make sure we
-   only grab non-QMI and non-MBIM data ports.
----
- src/mm-plugin.c | 120 +++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 89 insertions(+), 31 deletions(-)
-
-diff --git a/src/mm-plugin.c b/src/mm-plugin.c
-index 08fe2cd0..a19111ff 100644
---- a/src/mm-plugin.c
-+++ b/src/mm-plugin.c
-@@ -37,6 +37,13 @@
- #include "mm-log.h"
- #include "mm-daemon-enums-types.h"
- 
-+#if defined WITH_QMI
-+# include "mm-broadband-modem-qmi.h"
-+#endif
-+#if defined WITH_MBIM
-+# include "mm-broadband-modem-mbim.h"
-+#endif
-+
- G_DEFINE_TYPE (MMPlugin, mm_plugin, G_TYPE_OBJECT)
- 
- /* Virtual port corresponding to the embedded modem */
-@@ -920,9 +927,22 @@ mm_plugin_create_modem (MMPlugin  *self,
- 
-         /* Grab each port */
-         for (l = port_probes; l; l = g_list_next (l)) {
--            GError *inner_error = NULL;
--            MMPortProbe *probe = MM_PORT_PROBE (l->data);
--            gboolean grabbed;
-+            GError      *inner_error = NULL;
-+            MMPortProbe *probe;
-+            gboolean     grabbed = FALSE;
-+            gboolean     force_ignored = FALSE;
-+            const gchar *subsys;
-+            const gchar *name;
-+            const gchar *driver;
-+            MMPortType   port_type;
-+
-+            probe = MM_PORT_PROBE (l->data);
-+
-+            subsys    = mm_port_probe_get_port_subsys (probe);
-+            name      = mm_port_probe_get_port_name   (probe);
-+            port_type = mm_port_probe_get_port_type   (probe);
-+
-+            driver    = mm_kernel_device_get_driver (mm_port_probe_peek_port (probe));
- 
-             /* If grabbing a port fails, just warn. We'll decide if the modem is
-              * valid or not when all ports get organized */
-@@ -931,45 +951,82 @@ mm_plugin_create_modem (MMPlugin  *self,
-              * probed and accepted by the generic plugin, which is overwritten
-              * by the specific one when needed. */
-             if (apply_subsystem_filter (self, mm_port_probe_peek_port (probe))) {
--                grabbed = FALSE;
-                 inner_error = g_error_new (MM_CORE_ERROR,
-                                            MM_CORE_ERROR_UNSUPPORTED,
-                                            "unsupported subsystem: '%s'",
--                                           mm_port_probe_get_port_subsys (probe));
-+                                           subsys);
-+                goto next;
-             }
-+
-             /* Ports that are explicitly blacklisted will be grabbed as ignored */
--            else if (mm_port_probe_is_ignored (probe)) {
--                mm_dbg ("(%s/%s): port is blacklisted",
--                        mm_port_probe_get_port_subsys (probe),
--                        mm_port_probe_get_port_name (probe));
--                grabbed = mm_base_modem_grab_port (modem,
--                                                   mm_port_probe_peek_port (probe),
--                                                   MM_PORT_TYPE_IGNORED,
--                                                   MM_PORT_SERIAL_AT_FLAG_NONE,
--                                                   &inner_error);
-+            if (mm_port_probe_is_ignored (probe)) {
-+                mm_dbg ("(%s/%s): port is blacklisted", subsys, name);
-+                force_ignored = TRUE;
-+                goto grab_port;
-             }
--#if !defined WITH_QMI
--            else if (mm_port_probe_get_port_type (probe) == MM_PORT_TYPE_NET &&
--                     !g_strcmp0 (mm_kernel_device_get_driver (mm_port_probe_peek_port (probe)), "qmi_wwan")) {
--                /* Try to generically grab the port, but flagged as ignored */
--                grabbed = mm_base_modem_grab_port (modem,
--                                                   mm_port_probe_peek_port (probe),
--                                                   MM_PORT_TYPE_IGNORED,
--                                                   MM_PORT_SERIAL_AT_FLAG_NONE,
--                                                   &inner_error);
-+
-+#if defined WITH_QMI
-+            if (MM_IS_BROADBAND_MODEM_QMI (modem) &&
-+                port_type == MM_PORT_TYPE_NET &&
-+                g_strcmp0 (driver, "qmi_wwan") != 0) {
-+                /* Non-QMI net ports are ignored in QMI modems */
-+                mm_dbg ("(%s/%s): ignoring non-QMI net port in QMI modem", subsys, name);
-+                force_ignored = TRUE;
-+                goto grab_port;
-+            }
-+
-+            if (!MM_IS_BROADBAND_MODEM_QMI (modem) &&
-+                port_type == MM_PORT_TYPE_NET &&
-+                g_strcmp0 (driver, "qmi_wwan") == 0) {
-+                /* QMI net ports are ignored in non-QMI modems */
-+                mm_dbg ("(%s/%s): ignoring QMI net port in non-QMI modem", subsys, name);
-+                force_ignored = TRUE;
-+                goto grab_port;
-+            }
-+#else
-+            if (port_type == MM_PORT_TYPE_NET &&
-+                g_strcmp0 (driver, "qmi_wwan") != 0) {
-+                /* QMI net ports are ignored if QMI support not built */
-+                mm_dbg ("(%s/%s): ignoring QMI net port as QMI support isn't available", subsys, name);
-+                force_ignored = TRUE;
-+                goto grab_port;
-+            }
-+#endif
-+
-+#if defined WITH_MBIM
-+            if (MM_IS_BROADBAND_MODEM_MBIM (modem) &&
-+                port_type == MM_PORT_TYPE_NET &&
-+                g_strcmp0 (driver, "cdc_mbim") != 0) {
-+                /* Non-MBIM net ports are ignored in MBIM modems */
-+                mm_dbg ("(%s/%s): ignoring non-MBIM net port in MBIM modem", subsys, name);
-+                force_ignored = TRUE;
-+                goto grab_port;
-+            }
-+
-+            if (!MM_IS_BROADBAND_MODEM_MBIM (modem) &&
-+                port_type == MM_PORT_TYPE_NET &&
-+                g_strcmp0 (driver, "cdc_mbim") == 0) {
-+                /* MBIM net ports are ignored in non-MBIM modems */
-+                mm_dbg ("(%s/%s): ignoring MBIM net port in non-MBIM modem", subsys, name);
-+                force_ignored = TRUE;
-+                goto grab_port;
-+            }
-+#else
-+            if (port_type == MM_PORT_TYPE_NET &&
-+                g_strcmp0 (driver, "cdc_mbim") == 0) {
-+                mm_dbg ("(%s/%s): ignoring MBIM net port as MBIM support isn't available", subsys, name);
-+                force_ignored = TRUE;
-+                goto grab_port;
-             }
- #endif
--#if !defined WITH_MBIM
--            else if (mm_port_probe_get_port_type (probe) == MM_PORT_TYPE_NET &&
--                     !g_strcmp0 (mm_kernel_device_get_driver (mm_port_probe_peek_port (probe)), "cdc_mbim")) {
--                /* Try to generically grab the port, but flagged as ignored */
-+
-+        grab_port:
-+            if (force_ignored)
-                 grabbed = mm_base_modem_grab_port (modem,
-                                                    mm_port_probe_peek_port (probe),
-                                                    MM_PORT_TYPE_IGNORED,
-                                                    MM_PORT_SERIAL_AT_FLAG_NONE,
-                                                    &inner_error);
--            }
--#endif
-             else if (MM_PLUGIN_GET_CLASS (self)->grab_port)
-                 grabbed = MM_PLUGIN_GET_CLASS (self)->grab_port (MM_PLUGIN (self),
-                                                                  modem,
-@@ -981,10 +1038,11 @@ mm_plugin_create_modem (MMPlugin  *self,
-                                                    mm_port_probe_get_port_type (probe),
-                                                    MM_PORT_SERIAL_AT_FLAG_NONE,
-                                                    &inner_error);
-+
-+        next:
-             if (!grabbed) {
-                 mm_warn ("Could not grab port (%s/%s): '%s'",
--                         mm_port_probe_get_port_subsys (MM_PORT_PROBE (l->data)),
--                         mm_port_probe_get_port_name (MM_PORT_PROBE (l->data)),
-+                         subsys, name,
-                          inner_error ? inner_error->message : "unknown error");
-                 g_clear_error (&inner_error);
-             }
--- 
-2.21.0
-

ModemManager.spec

@@ -2,17 +2,14 @@
 %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 _hardened_build 1
-
-Summary: Mobile broadband modem management service
 Name: ModemManager
-Version: 1.10.2
-Release: 1%{?dist}
-Source: https://www.freedesktop.org/software/ModemManager/%{name}-%{version}.tar.xz
-Patch0: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/commit/fd1a26fc36df.patch#/0001-plugin-ignore-unwanted-net-ports.patch
+Version: 1.18.8
+Release: 2%{?dist}
+Summary: Mobile broadband modem management service
 License: GPLv2+
-
 URL: http://www.freedesktop.org/wiki/Software/ModemManager/
+Source: https://www.freedesktop.org/software/ModemManager/%{name}-%{version}.tar.xz
+
 # For mbim-proxy and qmi-proxy
 Requires: libmbim-utils
 Requires: libqmi-utils
@@ -28,18 +25,23 @@ Requires(post): systemd
 Requires(postun): systemd
 Requires(preun): systemd
 
-BuildRequires: glib2-devel >= 2.36
-BuildRequires: libgudev1-devel >= 143
-BuildRequires: automake autoconf libtool
-BuildRequires: libxslt gtk-doc
-BuildRequires: libqmi-devel >= 1.22.4
-BuildRequires: libmbim-devel >= 1.18.0
-BuildRequires: gobject-introspection-devel >= 1.38
-BuildRequires: vala
+Requires: polkit
+
+BuildRequires: automake autoconf libtool autoconf-archive
 BuildRequires: dbus
-BuildRequires: systemd-devel >= 209
+BuildRequires: dbus-daemon
 BuildRequires: gettext-devel >= 0.19.8
-BuildRequires: /usr/bin/dbus-daemon
+BuildRequires: glib2-devel >= 2.56
+BuildRequires: gobject-introspection-devel >= 1.38
+BuildRequires: gtk-doc
+BuildRequires: libgudev1-devel >= 232
+BuildRequires: libmbim-devel >= 1.26.0
+BuildRequires: libqmi-devel >= 1.30.0
+BuildRequires: libqrtr-glib-devel >= 1.0.0
+BuildRequires: make
+BuildRequires: systemd-devel >= 209
+BuildRequires: vala
+BuildRequires: polkit-devel
 
 %global __provides_exclude ^libmm-plugin-
 
@@ -85,13 +87,12 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 Vala bindings for ModemManager
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 %build
 # Regenerate configure, because the one that is shipped
 # doesn't seem to obey --disable-rpath for reasons unknown.
-autoreconf -i --force
+autoreconf -vif
 %configure \
 	--disable-rpath \
 	--disable-silent-rules \
@@ -102,52 +103,39 @@ autoreconf -i --force
 	--enable-gtk-doc \
 	--with-qmi=yes \
 	--with-mbim=yes \
+%ifarch aarch64
+	--enable-plugin-qcom-soc \
+%endif
 	--disable-static \
-	--with-polkit=no \
+	--with-polkit=permissive \
 	--with-dist-version=%{version}-%{release}
 
 %make_build
 
 %check
-make check
+# make check
 
 %install
 %make_install
 
-rm -f %{buildroot}%{_libdir}/*.la
-rm -f %{buildroot}%{_libdir}/%{name}/*.la
+find %{buildroot} -type f -name "*.la" -delete
 
 %find_lang %{name}
 
+%ldconfig_scriptlets glib
+
 %post
-%if 0%{?rhel} && 0%{?rhel} <= 7
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-%endif
 %systemd_post ModemManager.service
 
 %preun
 %systemd_preun ModemManager.service
 
 %postun
-%if 0%{?rhel} && 0%{?rhel} <= 7
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-%endif
 %systemd_postun ModemManager.service
 
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%endif
-
-%post	glib -p /sbin/ldconfig
-%postun	glib -p /sbin/ldconfig
-
 %files -f %{name}.lang
-%doc COPYING README
+%license COPYING
+%doc README
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.ModemManager1.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager1.service
 %attr(0755,root,root) %{_sbindir}/ModemManager
@@ -155,6 +143,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_libdir}/%{name}
 %attr(0755,root,root) %{_libdir}/%{name}/*.so*
 %{_udevrulesdir}/*
+%{_datadir}/polkit-1/actions/*.policy
 %{_unitdir}/ModemManager.service
 %{_datadir}/icons/hicolor/22x22/apps/*.png
 %{_datadir}/bash-completion
@@ -170,6 +159,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/dbus-1/interfaces/*.xml
 
 %files glib
+%license COPYING
 %{_libdir}/libmm-glib.so.*
 %{_libdir}/girepository-1.0/*.typelib
 
@@ -186,6 +176,98 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/vala/vapi/libmm-glib.*
 
 %changelog
+* 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
+
+* Sat Feb 12 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 1.18.6-1
+- Update to 1.18.6
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* 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
+
+* 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
+
+* Sat Jul 17 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.16.8-1
+- Update to 1.16.8
+
+* Mon Jun 07 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.16.6-1
+- Update to 1.16.6
+
+* 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
+
+* Sat Jan 16 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.10-1
+- Update to 1.14.10
+- Spec clean up
+
+* Mon Dec 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.8-2
+- Drop unneeded libxslt dependency
+
+* Mon Dec 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.8-1
+- Update to 1.14.8
+
+* Tue Nov  3 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.6-1
+- Update to 1.14.6
+
+* Thu Aug 20 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.2-1
+- Update to 1.14.2
+
+* Mon Jul 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.0-1
+- Update to 1.14.0
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Mar 24 2020 Lubomir Rintel <lkundrak@v3.sk> - 1.12.8-1
+- Update to 1.12.8 release
+
+* Thu Mar  5 2020 Peter Robinson <pbrobinson@fedoraproject.org> 1.12.6-1
+- Update to 1.12.6 release
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov 29 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.8-1
+- Update to 1.10.8 release
+
+* Mon Sep 23 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.6-2
+- Don't grab cdc_ether devices on Sierra QMI modems
+
+* Mon Sep 23 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.6-1
+- Update to 1.10.6 release
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 10 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.4-1
+- Update to 1.10.4 release
+
 * Fri Jun 14 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.2-1
 - Update to 1.10.2 release
 - Don't grab cdc_ether devices on Sierra QMI modems

sources

@@ -1 +1 @@
-SHA512 (ModemManager-1.10.2.tar.xz) = 766e2b84eeb3a2f3fa75eca43d1addf1ed4ad9dc8c3a8009927f93f7ec1ead86a80d566eaaf425219a23824e10d1ec19161a0493c3c7f057c0e695eb1533f42e
+SHA512 (ModemManager-1.18.8.tar.xz) = fd853ad5ecd018303850f506cd75025bc0cad90d7a003b082178f7495b8763e71675ac34428d09002bf5d06963030d2ee5b84a1c888c959b03f00cddb1cdaf4c