[ptxdist] [PATCH v2 0/5] ModemManager: version bump

[ptxdist] [PATCH v2 0/5] ModemManager: version bump

[Alexander Dahl]

Hei hei,

in this v2 series I removed the libgudev version bump, until that
license issue is clarified. (I suggested to set 'LGPL-2.0-or-later AND
LGPL-2.1-or-later' in IRC, but don't know if that's possible?)

changes from v1 to v2:

- removed libgudev related patches
- added another patch sorting out the license issue for ModemManager itself
- kept libqmi as is, I addressed my thoughts on this in the thread on v1

Greets
Alex

Alexander Dahl (5):
  libqmi: Add license file hashes
  libqmi: version bump 1.26.2 -> 1.28.2
  modemmanager: Revise applicable licenses
  modemmanager: Add license file hashes
  modemmanager: version bump 1.14.8 -> 1.16.2

 ...dev-don-t-use-autoptr-in-GUdev-types.patch | 127 ++++++++++++++++++
 patches/ModemManager-1.16.2/series            |   4 +
 rules/libqmi.make                             |   7 +-
 rules/modemmanager.make                       |  12 +-
 4 files changed, 145 insertions(+), 5 deletions(-)
 create mode 100644 patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch
 create mode 100644 patches/ModemManager-1.16.2/series


Cc: Alexander Dahl <ada@thorsis.com>
Cc: Roland Hieber <rhi@pengutronix.de>
base-commit: c33f9942dcd16d9f394aab8ac446ba12fbb2fbea
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 1/5] libqmi: Add license file hashes

[Alexander Dahl]

From: Alexander Dahl <ada@thorsis.com>

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libqmi.make | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rules/libqmi.make b/rules/libqmi.make
index 2b3e40140..3342eed20 100644
--- a/rules/libqmi.make
+++ b/rules/libqmi.make
@@ -22,6 +22,9 @@ LIBQMI_URL	:= http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFF
 LIBQMI_SOURCE	:= $(SRCDIR)/$(LIBQMI).$(LIBQMI_SUFFIX)
 LIBQMI_DIR	:= $(BUILDDIR)/$(LIBQMI)
 LIBQMI_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
+LIBQMI_LICENSE_FILES := \
+	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] libqmi: Add license file hashes

[Michael Olbrich]

Thanks, applied as 6e513572c676357b867181903678ebf725ca8673.

Michael

[sent from post-receive hook]

On Tue, 30 Mar 2021 20:08:00 +0200, Alexander Dahl <post@lespocky.de> wrote:
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20210329054904.24342-2-post@lespocky.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libqmi.make b/rules/libqmi.make
> index 2b3e40140b88..3342eed20d8f 100644
> --- a/rules/libqmi.make
> +++ b/rules/libqmi.make
> @@ -22,6 +22,9 @@ LIBQMI_URL	:= http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFF
>  LIBQMI_SOURCE	:= $(SRCDIR)/$(LIBQMI).$(LIBQMI_SUFFIX)
>  LIBQMI_DIR	:= $(BUILDDIR)/$(LIBQMI)
>  LIBQMI_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
> +LIBQMI_LICENSE_FILES := \
> +	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 2/5] libqmi: version bump 1.26.2 -> 1.28.2

[Alexander Dahl]

From: Alexander Dahl <ada@thorsis.com>

Requirement for upcoming ModemManager version bump.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libqmi.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/libqmi.make b/rules/libqmi.make
index 3342eed20..d2d31ce18 100644
--- a/rules/libqmi.make
+++ b/rules/libqmi.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi
 #
 # Paths and names
 #
-LIBQMI_VERSION	:= 1.26.2
-LIBQMI_MD5	:= ce7166668c9f1ccd496fc6af882ee00e
+LIBQMI_VERSION	:= 1.28.2
+LIBQMI_MD5	:= 825d7226e001cb2616e85d8a1e2a410f
 LIBQMI		:= libqmi-$(LIBQMI_VERSION)
 LIBQMI_SUFFIX	:= tar.xz
 LIBQMI_URL	:= http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] libqmi: version bump 1.26.2 -> 1.28.2

[Michael Olbrich]

Thanks, applied as 1dc37016b2b3bd041ba35ec33c969827919ae6f4.

Michael

[sent from post-receive hook]

On Tue, 30 Mar 2021 20:08:02 +0200, Alexander Dahl <post@lespocky.de> wrote:
> Requirement for upcoming ModemManager version bump.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20210329054904.24342-3-post@lespocky.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libqmi.make b/rules/libqmi.make
> index 3342eed20d8f..d2d31ce187bb 100644
> --- a/rules/libqmi.make
> +++ b/rules/libqmi.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi
>  #
>  # Paths and names
>  #
> -LIBQMI_VERSION	:= 1.26.2
> -LIBQMI_MD5	:= ce7166668c9f1ccd496fc6af882ee00e
> +LIBQMI_VERSION	:= 1.28.2
> +LIBQMI_MD5	:= 825d7226e001cb2616e85d8a1e2a410f
>  LIBQMI		:= libqmi-$(LIBQMI_VERSION)
>  LIBQMI_SUFFIX	:= tar.xz
>  LIBQMI_URL	:= http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 3/5] modemmanager: Revise applicable licenses

[Alexander Dahl]

From: Alexander Dahl <ada@thorsis.com>

No source files under GPLv3+ could be found in mm source tree. mmcli was
falsely attributed by upstream as GPLv3+ up to 1.4, that was corrected
with 1.6.

Fixes: 9e22636e4ffd ("ModemManager: version bump 1.4.14 -> 1.6.0")
Suggested-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/modemmanager.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index 09b3bc422..30589bd66 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -21,7 +21,7 @@ MODEMMANAGER_SUFFIX	:= tar.xz
 MODEMMANAGER_URL	:= https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
 MODEMMANAGER_SOURCE	:= $(SRCDIR)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
 MODEMMANAGER_DIR	:= $(BUILDDIR)/$(MODEMMANAGER)
-MODEMMANAGER_LICENSE	:= GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later
+MODEMMANAGER_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] modemmanager: Revise applicable licenses

[Michael Olbrich]

Thanks, applied as 7146341f77878da02f4500e9768d0c0b0198fe0c.

Michael

[sent from post-receive hook]

On Tue, 30 Mar 2021 20:08:03 +0200, Alexander Dahl <post@lespocky.de> wrote:
> No source files under GPLv3+ could be found in mm source tree. mmcli was
> falsely attributed by upstream as GPLv3+ up to 1.4, that was corrected
> with 1.6.
> 
> Fixes: 9e22636e4ffd ("ModemManager: version bump 1.4.14 -> 1.6.0")
> Suggested-by: Roland Hieber <rhi@pengutronix.de>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20210329054904.24342-4-post@lespocky.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/modemmanager.make b/rules/modemmanager.make
> index 09b3bc422306..30589bd665df 100644
> --- a/rules/modemmanager.make
> +++ b/rules/modemmanager.make
> @@ -21,7 +21,7 @@ MODEMMANAGER_SUFFIX	:= tar.xz
>  MODEMMANAGER_URL	:= https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
>  MODEMMANAGER_SOURCE	:= $(SRCDIR)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
>  MODEMMANAGER_DIR	:= $(BUILDDIR)/$(MODEMMANAGER)
> -MODEMMANAGER_LICENSE	:= GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later
> +MODEMMANAGER_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 4/5] modemmanager: Add license file hashes

[Alexander Dahl]

From: Alexander Dahl <ada@thorsis.com>

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/modemmanager.make | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index 30589bd66..ee0f78515 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -22,6 +22,9 @@ MODEMMANAGER_URL	:= https://www.freedesktop.org/software/ModemManager/$(MODEMMAN
 MODEMMANAGER_SOURCE	:= $(SRCDIR)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
 MODEMMANAGER_DIR	:= $(BUILDDIR)/$(MODEMMANAGER)
 MODEMMANAGER_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
+MODEMMANAGER_LICENSE_FILES := \
+	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] modemmanager: Add license file hashes

[Michael Olbrich]

Thanks, applied as 2ce154abb68c0c04210a8a568c0355f202ae663d.

Michael

[sent from post-receive hook]

On Tue, 30 Mar 2021 20:08:04 +0200, Alexander Dahl <post@lespocky.de> wrote:
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20210329054904.24342-5-post@lespocky.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/modemmanager.make b/rules/modemmanager.make
> index 30589bd665df..ee0f78515af3 100644
> --- a/rules/modemmanager.make
> +++ b/rules/modemmanager.make
> @@ -22,6 +22,9 @@ MODEMMANAGER_URL	:= https://www.freedesktop.org/software/ModemManager/$(MODEMMAN
>  MODEMMANAGER_SOURCE	:= $(SRCDIR)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
>  MODEMMANAGER_DIR	:= $(BUILDDIR)/$(MODEMMANAGER)
>  MODEMMANAGER_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-or-later
> +MODEMMANAGER_LICENSE_FILES := \
> +	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 5/5] modemmanager: version bump 1.14.8 -> 1.16.2

[Alexander Dahl]

From: Alexander Dahl <ada@thorsis.com>

The patch allows build against libgudev older than version 232.

Link: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/349
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 ...dev-don-t-use-autoptr-in-GUdev-types.patch | 127 ++++++++++++++++++
 patches/ModemManager-1.16.2/series            |   4 +
 rules/modemmanager.make                       |   7 +-
 3 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100644 patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch
 create mode 100644 patches/ModemManager-1.16.2/series

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
new file mode 100644
index 000000000..511b1693f
--- /dev/null
+++ b/patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch
@@ -0,0 +1,127 @@
+From: Aleksander Morgado <aleksander@aleksander.es>
+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
new file mode 100644
index 000000000..073ee95c5
--- /dev/null
+++ b/patches/ModemManager-1.16.2/series
@@ -0,0 +1,4 @@
+# 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 ee0f78515..18191583c 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
 #
 # Paths and names
 #
-MODEMMANAGER_VERSION	:= 1.14.8
-MODEMMANAGER_MD5	:= 138762a976a654d244744963d2250372
+MODEMMANAGER_VERSION	:= 1.16.2
+MODEMMANAGER_MD5	:= 83c5fc0bf65b8f321532b61b5f2b0b51
 MODEMMANAGER		:= ModemManager-$(MODEMMANAGER_VERSION)
 MODEMMANAGER_SUFFIX	:= tar.xz
 MODEMMANAGER_URL	:= https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
@@ -45,13 +45,16 @@ MODEMMANAGER_CONF_OPT	:= \
 	--disable-gtk-doc-pdf \
 	--disable-nls \
 	--disable-rpath \
+	--disable-code-coverage \
 	--disable-introspection \
 	--disable-vala \
 	--enable-all-plugins \
 	--with-gnu-ld \
+	--without-gcov \
 	--with-dbus-sys-dir=/usr/share/dbus-1/system.d \
 	--with-udev-base-dir=/usr/lib/udev \
 	--with-systemdsystemunitdir=/usr/lib/systemd/system \
+	--with-udev \
 	--$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-suspend-resume \
 	--$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-journal \
 	--without-polkit \
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH v2 5/5] modemmanager: version bump 1.14.8 -> 1.16.2

[Michael Olbrich]

On Mon, Mar 29, 2021 at 07:49:04AM +0200, Alexander Dahl wrote:
> From: Alexander Dahl <ada@thorsis.com>
> 
> The patch allows build against libgudev older than version 232.
> 
> Link: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/349
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  ...dev-don-t-use-autoptr-in-GUdev-types.patch | 127 ++++++++++++++++++
>  patches/ModemManager-1.16.2/series            |   4 +
>  rules/modemmanager.make                       |   7 +-
>  3 files changed, 136 insertions(+), 2 deletions(-)
>  create mode 100644 patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch
>  create mode 100644 patches/ModemManager-1.16.2/series
> 
> 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
> new file mode 100644
> index 000000000..511b1693f
> --- /dev/null
> +++ b/patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch
> @@ -0,0 +1,127 @@
> +From: Aleksander Morgado <aleksander@aleksander.es>
> +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.

Why not update libgudev instead of adding this patch?

Michael

> +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
> new file mode 100644
> index 000000000..073ee95c5
> --- /dev/null
> +++ b/patches/ModemManager-1.16.2/series
> @@ -0,0 +1,4 @@
> +# 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 ee0f78515..18191583c 100644
> --- a/rules/modemmanager.make
> +++ b/rules/modemmanager.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
>  #
>  # Paths and names
>  #
> -MODEMMANAGER_VERSION	:= 1.14.8
> -MODEMMANAGER_MD5	:= 138762a976a654d244744963d2250372
> +MODEMMANAGER_VERSION	:= 1.16.2
> +MODEMMANAGER_MD5	:= 83c5fc0bf65b8f321532b61b5f2b0b51
>  MODEMMANAGER		:= ModemManager-$(MODEMMANAGER_VERSION)
>  MODEMMANAGER_SUFFIX	:= tar.xz
>  MODEMMANAGER_URL	:= https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
> @@ -45,13 +45,16 @@ MODEMMANAGER_CONF_OPT	:= \
>  	--disable-gtk-doc-pdf \
>  	--disable-nls \
>  	--disable-rpath \
> +	--disable-code-coverage \
>  	--disable-introspection \
>  	--disable-vala \
>  	--enable-all-plugins \
>  	--with-gnu-ld \
> +	--without-gcov \
>  	--with-dbus-sys-dir=/usr/share/dbus-1/system.d \
>  	--with-udev-base-dir=/usr/lib/udev \
>  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
> +	--with-udev \
>  	--$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-suspend-resume \
>  	--$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-journal \
>  	--without-polkit \
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH v2 5/5] modemmanager: version bump 1.14.8 -> 1.16.2

[Roland Hieber]

On Tue, Mar 30, 2021 at 08:42:35AM +0200, Michael Olbrich wrote:
> On Mon, Mar 29, 2021 at 07:49:04AM +0200, Alexander Dahl wrote:
> > From: Alexander Dahl <ada@thorsis.com>
> > 
> > The patch allows build against libgudev older than version 232.
> > 
> > Link: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/349
> > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > ---
> >  ...dev-don-t-use-autoptr-in-GUdev-types.patch | 127 ++++++++++++++++++
> >  patches/ModemManager-1.16.2/series            |   4 +
> >  rules/modemmanager.make                       |   7 +-
> >  3 files changed, 136 insertions(+), 2 deletions(-)
> >  create mode 100644 patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch
> >  create mode 100644 patches/ModemManager-1.16.2/series
> > 
> > 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
> > new file mode 100644
> > index 000000000..511b1693f
> > --- /dev/null
> > +++ b/patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch
> > @@ -0,0 +1,127 @@
> > +From: Aleksander Morgado <aleksander@aleksander.es>
> > +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.
> 
> Why not update libgudev instead of adding this patch?

In <20210329054904.24342-1-post@lespocky.de>, Alexander Dahl wrote:
> Hei hei,
> 
> in this v2 series I removed the libgudev version bump, until that
> license issue is clarified. (I suggested to set 'LGPL-2.0-or-later AND
> LGPL-2.1-or-later' in IRC, but don't know if that's possible?)

I think that variant is the best way we can currently express this
situation (and it will effectively result in LGPL-2.1-or-later).

 - Roland


-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH v2 5/5] modemmanager: version bump 1.14.8 -> 1.16.2

[Alexander Dahl]

Hello,

Am Dienstag, 30. März 2021, 11:17:26 CEST schrieb Roland Hieber:
> On Tue, Mar 30, 2021 at 08:42:35AM +0200, Michael Olbrich wrote:
> > Why not update libgudev instead of adding this patch?
> 
> In <20210329054904.24342-1-post@lespocky.de>, Alexander Dahl wrote:
> > Hei hei,
> > 
> > in this v2 series I removed the libgudev version bump, until that
> > license issue is clarified. (I suggested to set 'LGPL-2.0-or-later AND
> > LGPL-2.1-or-later' in IRC, but don't know if that's possible?)
> 
> I think that variant is the best way we can currently express this
> situation (and it will effectively result in LGPL-2.1-or-later).

Meanwhile upstream clarified to LGPL-2.1-or-later only and included SPDX tags 
to file headers:

https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/14

So we could just wait for the next release to have that sorted out cleanly. 
Will have to switch to meson for building the libgudev package though.

Greets
Alex




_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH v2 5/5] modemmanager: version bump 1.14.8 -> 1.16.2

[Michael Olbrich]

On Tue, Mar 30, 2021 at 03:54:19PM +0200, Alexander Dahl wrote:
> Am Dienstag, 30. März 2021, 11:17:26 CEST schrieb Roland Hieber:
> > On Tue, Mar 30, 2021 at 08:42:35AM +0200, Michael Olbrich wrote:
> > > Why not update libgudev instead of adding this patch?
> > 
> > In <20210329054904.24342-1-post@lespocky.de>, Alexander Dahl wrote:
> > > Hei hei,
> > > 
> > > in this v2 series I removed the libgudev version bump, until that
> > > license issue is clarified. (I suggested to set 'LGPL-2.0-or-later AND
> > > LGPL-2.1-or-later' in IRC, but don't know if that's possible?)
> > 
> > I think that variant is the best way we can currently express this
> > situation (and it will effectively result in LGPL-2.1-or-later).
> 
> Meanwhile upstream clarified to LGPL-2.1-or-later only and included SPDX tags 
> to file headers:
> 
> https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/14
> 
> So we could just wait for the next release to have that sorted out cleanly. 
> Will have to switch to meson for building the libgudev package though.

I've applied the modemmanager update as is for now. Please keep the patch
in mind, when the update happens.

Regards,
Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] modemmanager: version bump 1.14.8 -> 1.16.2

[Michael Olbrich]

Thanks, applied as 3b21c8acabc4782a89a57bbcecace8d703508b43.

Michael

[sent from post-receive hook]

On Tue, 30 Mar 2021 20:08:05 +0200, Alexander Dahl <post@lespocky.de> wrote:
> The patch allows build against libgudev older than version 232.
> 
> Link: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/349
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20210329054904.24342-6-post@lespocky.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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
> new file mode 100644
> index 000000000000..511b1693f7bb
> --- /dev/null
> +++ b/patches/ModemManager-1.16.2/0001-kerneldevice-udev-don-t-use-autoptr-in-GUdev-types.patch
> @@ -0,0 +1,127 @@
> +From: Aleksander Morgado <aleksander@aleksander.es>
> +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
> new file mode 100644
> index 000000000000..073ee95c575b
> --- /dev/null
> +++ b/patches/ModemManager-1.16.2/series
> @@ -0,0 +1,4 @@
> +# 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 ee0f78515af3..18191583cc99 100644
> --- a/rules/modemmanager.make
> +++ b/rules/modemmanager.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
>  #
>  # Paths and names
>  #
> -MODEMMANAGER_VERSION	:= 1.14.8
> -MODEMMANAGER_MD5	:= 138762a976a654d244744963d2250372
> +MODEMMANAGER_VERSION	:= 1.16.2
> +MODEMMANAGER_MD5	:= 83c5fc0bf65b8f321532b61b5f2b0b51
>  MODEMMANAGER		:= ModemManager-$(MODEMMANAGER_VERSION)
>  MODEMMANAGER_SUFFIX	:= tar.xz
>  MODEMMANAGER_URL	:= https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
> @@ -45,13 +45,16 @@ MODEMMANAGER_CONF_OPT	:= \
>  	--disable-gtk-doc-pdf \
>  	--disable-nls \
>  	--disable-rpath \
> +	--disable-code-coverage \
>  	--disable-introspection \
>  	--disable-vala \
>  	--enable-all-plugins \
>  	--with-gnu-ld \
> +	--without-gcov \
>  	--with-dbus-sys-dir=/usr/share/dbus-1/system.d \
>  	--with-udev-base-dir=/usr/lib/udev \
>  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
> +	--with-udev \
>  	--$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-suspend-resume \
>  	--$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-journal \
>  	--without-polkit \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de