From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 29 Jun 2021 07:13:16 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly63g-0007Hf-N1 for lore@lore.pengutronix.de; Tue, 29 Jun 2021 07:13:16 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly63g-0001jK-Fb; Tue, 29 Jun 2021 07:13:16 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ly604-0005kh-UF; Tue, 29 Jun 2021 07:09:32 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly604-0005dS-EV; Tue, 29 Jun 2021 07:09:32 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ly604-00AapH-Dj; Tue, 29 Jun 2021 07:09:32 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 29 Jun 2021 07:09:32 +0200 Message-Id: <20210629050932.2524796-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210623073309.23058-3-ada@thorsis.com> References: <20210623073309.23058-3-ada@thorsis.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] modemmanager: version bump 1.16.2 -> 1.16.6 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as b097d0c7211d8e1d7186b903c60ba3f63f9e9be5. Michael [sent from post-receive hook] On Tue, 29 Jun 2021 07:09:32 +0200, Alexander Dahl wrote: > Patch gone upstream. > > Signed-off-by: Alexander Dahl > Message-Id: <20210623073309.23058-3-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch b/patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch > deleted file mode 100644 > index 511b1693f7bb..000000000000 > --- a/patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch > +++ /dev/null > @@ -1,127 +0,0 @@ > -From: Aleksander Morgado > -Date: Tue, 23 Mar 2021 15:36:58 +0100 > -Subject: [PATCH] kerneldevice,udev: don't use autoptr in GUdev types > - > -The autoptr support in all GUdev types was introduced in > -commit 272533131c6ed38479a88805, included in libgudev 232. > - > -In the MM 1.16 branch we depend on libgudev 147, so avoid > -implicitly bumping the required version. > - > -Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/349 > ---- > - src/kerneldevice/mm-kernel-device-udev.c | 30 +++++++++++++++++++++--------- > - 1 file changed, 21 insertions(+), 9 deletions(-) > - > -diff --git a/src/kerneldevice/mm-kernel-device-udev.c b/src/kerneldevice/mm-kernel-device-udev.c > -index f75104bd6b1c..a6bf1a71df88 100644 > ---- a/src/kerneldevice/mm-kernel-device-udev.c > -+++ b/src/kerneldevice/mm-kernel-device-udev.c > -@@ -81,7 +81,7 @@ static void > - preload_contents_platform (MMKernelDeviceUdev *self, > - const gchar *platform) > - { > -- g_autoptr(GUdevDevice) iter = NULL; > -+ GUdevDevice *iter; > - > - iter = g_object_ref (self->priv->device); > - while (iter) { > -@@ -102,17 +102,19 @@ preload_contents_platform (MMKernelDeviceUdev *self, > - g_clear_object (&iter); > - iter = parent; > - } > -+ > -+ g_clear_object (&iter); > - } > - > - static void > - preload_contents_pcmcia (MMKernelDeviceUdev *self) > - { > -- g_autoptr(GUdevDevice) iter = NULL; > -- gboolean pcmcia_subsystem_found = FALSE; > -+ GUdevDevice *iter; > -+ gboolean pcmcia_subsystem_found = FALSE; > - > - iter = g_object_ref (self->priv->device); > - while (iter) { > -- g_autoptr(GUdevDevice) parent = NULL; > -+ GUdevDevice *parent; > - > - /* Store the first driver found */ > - if (!self->priv->driver) > -@@ -133,18 +135,21 @@ preload_contents_pcmcia (MMKernelDeviceUdev *self) > - self->priv->product = udev_device_get_sysfs_attr_as_hex (iter, "card_id"); > - self->priv->physdev = g_object_ref (iter); > - /* stop traversing as soon as the physical device is found */ > -+ g_clear_object (&parent); > - break; > - } > - > - g_clear_object (&iter); > -- iter = g_steal_pointer (&parent); > -+ iter = parent; > - } > -+ > -+ g_clear_object (&iter); > - } > - > - static void > - preload_contents_pci (MMKernelDeviceUdev *self) > - { > -- g_autoptr(GUdevDevice) iter = NULL; > -+ GUdevDevice *iter; > - > - iter = g_object_ref (self->priv->device); > - while (iter) { > -@@ -170,12 +175,14 @@ preload_contents_pci (MMKernelDeviceUdev *self) > - g_clear_object (&iter); > - iter = parent; > - } > -+ > -+ g_clear_object (&iter); > - } > - > - static void > - preload_contents_usb (MMKernelDeviceUdev *self) > - { > -- g_autoptr(GUdevDevice) iter = NULL; > -+ GUdevDevice *iter; > - > - iter = g_object_ref (self->priv->device); > - while (iter) { > -@@ -204,12 +211,14 @@ preload_contents_usb (MMKernelDeviceUdev *self) > - g_clear_object (&iter); > - iter = parent; > - } > -+ > -+ g_clear_object (&iter); > - } > - > - static gchar * > - find_device_bus_subsystem (MMKernelDeviceUdev *self) > - { > -- g_autoptr(GUdevDevice) iter = NULL; > -+ GUdevDevice *iter; > - > - iter = g_object_ref (self->priv->device); > - while (iter) { > -@@ -224,8 +233,10 @@ find_device_bus_subsystem (MMKernelDeviceUdev *self) > - (g_strcmp0 (subsys, "pci") == 0) || > - (g_strcmp0 (subsys, "platform") == 0) || > - (g_strcmp0 (subsys, "pnp") == 0) || > -- (g_strcmp0 (subsys, "sdio") == 0)) > -+ (g_strcmp0 (subsys, "sdio") == 0)) { > -+ g_clear_object (&iter); > - return g_strdup (subsys); > -+ } > - > - parent = g_udev_device_get_parent (iter); > - g_clear_object (&iter); > -@@ -233,6 +244,7 @@ find_device_bus_subsystem (MMKernelDeviceUdev *self) > - } > - > - /* no more parents to check */ > -+ g_clear_object (&iter); > - return NULL; > - } > - > diff --git a/patches/ModemManager-1.16.2/series b/patches/ModemManager-1.16.2/series > deleted file mode 100644 > index 073ee95c575b..000000000000 > --- a/patches/ModemManager-1.16.2/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch > -# 7ee4df7afdcd7083fe59386d7e47c795 - git-ptx-patches magic > diff --git a/rules/modemmanager.make b/rules/modemmanager.make > index 18191583cc99..43d8e607e910 100644 > --- a/rules/modemmanager.make > +++ b/rules/modemmanager.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager > # > # Paths and names > # > -MODEMMANAGER_VERSION := 1.16.2 > -MODEMMANAGER_MD5 := 83c5fc0bf65b8f321532b61b5f2b0b51 > +MODEMMANAGER_VERSION := 1.16.6 > +MODEMMANAGER_MD5 := bde995400758db3a98c886608c2d5d9d > MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION) > MODEMMANAGER_SUFFIX := tar.xz > MODEMMANAGER_URL := https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de