[ptxdist] [PATCH 0/6] ModemManager: version bump

[ptxdist] [PATCH 0/6] ModemManager: version bump

[Alexander Dahl]

Hei hei,

for building the latest release of ModemManager either a patched 1.16.2
is required or bumping libgudev. This series has both, you might pick
independently.

Greets
Alex


Alexander Dahl (6):
  libgudev: Add license file hash
  libgudev: version bump 230 -> 234
  libqmi: Add license file hashes
  libqmi: version bump 1.26.2 -> 1.28.2
  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 +
 ...1-Prepare-to-check-for-an-older-UDEV.patch | 131 ------------------
 ...1-Prepare-to-check-for-an-older-UDEV.patch |  27 ++++
 .../{libgudev-230 => libgudev-234}/autogen.sh |   0
 patches/{libgudev-230 => libgudev-234}/series |   0
 rules/libgudev.make                           |   9 +-
 rules/libqmi.make                             |   7 +-
 rules/modemmanager.make                       |  10 +-
 9 files changed, 177 insertions(+), 138 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
 delete mode 100644 patches/libgudev-230/0001-Prepare-to-check-for-an-older-UDEV.patch
 create mode 100644 patches/libgudev-234/0001-Prepare-to-check-for-an-older-UDEV.patch
 rename patches/{libgudev-230 => libgudev-234}/autogen.sh (100%)
 rename patches/{libgudev-230 => libgudev-234}/series (100%)


Cc: Alexander Dahl <ada@thorsis.com>
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 1/6] libgudev: Add license file hash

[Alexander Dahl]

From: Alexander Dahl <ada@thorsis.com>

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

diff --git a/rules/libgudev.make b/rules/libgudev.make
index 637ea662d..343d1dea6 100644
--- a/rules/libgudev.make
+++ b/rules/libgudev.make
@@ -22,6 +22,7 @@ LIBGUDEV_URL		:= $(call ptx/mirror, GNOME, libgudev/$(LIBGUDEV_VERSION)/$(LIBGUD
 LIBGUDEV_SOURCE		:= $(SRCDIR)/$(LIBGUDEV).$(LIBGUDEV_SUFFIX)
 LIBGUDEV_DIR		:= $(BUILDDIR)/$(LIBGUDEV)
 LIBGUDEV_LICENSE	:= LGPL-2.1-or-later
+LIBGUDEV_LICENSE_FILES	:= file://COPYING;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

[ptxdist] [PATCH 2/6] libgudev: version bump 230 -> 234

[Alexander Dahl]

From: Alexander Dahl <ada@thorsis.com>

Required by upcoming ModemManager version bump.

Note: upstream changed build system from autotools to meson with version
235. This is the last autotools based release.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 ...1-Prepare-to-check-for-an-older-UDEV.patch | 131 ------------------
 ...1-Prepare-to-check-for-an-older-UDEV.patch |  27 ++++
 .../{libgudev-230 => libgudev-234}/autogen.sh |   0
 patches/{libgudev-230 => libgudev-234}/series |   0
 rules/libgudev.make                           |   8 +-
 5 files changed, 32 insertions(+), 134 deletions(-)
 delete mode 100644 patches/libgudev-230/0001-Prepare-to-check-for-an-older-UDEV.patch
 create mode 100644 patches/libgudev-234/0001-Prepare-to-check-for-an-older-UDEV.patch
 rename patches/{libgudev-230 => libgudev-234}/autogen.sh (100%)
 rename patches/{libgudev-230 => libgudev-234}/series (100%)

diff --git a/patches/libgudev-230/0001-Prepare-to-check-for-an-older-UDEV.patch b/patches/libgudev-230/0001-Prepare-to-check-for-an-older-UDEV.patch
deleted file mode 100644
index 02834a648..000000000
--- a/patches/libgudev-230/0001-Prepare-to-check-for-an-older-UDEV.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From: Juergen Borleis <entwicklung@pengutronix.de>
-Date: Thu, 10 Dec 2015 16:28:37 +0100
-Subject: [PATCH] Prepare to check for an older UDEV
-
-In order to use libgudev with systemd's based udev and the standalone udev
-we must libgudev check for an older udev release. Since v182 is the last
-standalone udev, check for this specific release. The libudev API seems stable
-enough in both releases.
-
-Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
----
- configure.ac        |  2 +-
- m4/introspection.m4 | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 97 insertions(+), 1 deletion(-)
- create mode 100644 m4/introspection.m4
-
-diff --git a/configure.ac b/configure.ac
-index 2b5e96ef30a1..58a35631187f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,7 +38,7 @@ GOBJECT_INTROSPECTION_CHECK([1.31.1])
-    AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
-    enable_introspection=no])
- 
--PKG_CHECK_MODULES([LIBUDEV], [libudev >= 199])
-+PKG_CHECK_MODULES([LIBUDEV], [libudev >= 182])
- PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0])
- 
- AC_CONFIG_FILES([
-diff --git a/m4/introspection.m4 b/m4/introspection.m4
-new file mode 100644
-index 000000000000..aa7b3b408852
---- /dev/null
-+++ b/m4/introspection.m4
-@@ -0,0 +1,96 @@
-+dnl -*- mode: autoconf -*-
-+dnl Copyright 2009 Johan Dahlin
-+dnl
-+dnl This file is free software; the author(s) gives unlimited
-+dnl permission to copy and/or distribute it, with or without
-+dnl modifications, as long as this notice is preserved.
-+dnl
-+
-+# serial 1
-+
-+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-+[
-+    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-+
-+    dnl enable/disable introspection
-+    m4_if([$2], [require],
-+    [dnl
-+        enable_introspection=yes
-+    ],[dnl
-+        AC_ARG_ENABLE(introspection,
-+                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-+                                 [Enable introspection for this build]),,
-+                                 [enable_introspection=auto])
-+    ])dnl
-+
-+    AC_MSG_CHECKING([for gobject-introspection])
-+
-+    dnl presence/version checking
-+    AS_CASE([$enable_introspection],
-+    [no], [dnl
-+        found_introspection="no (disabled, use --enable-introspection to enable)"
-+    ],dnl
-+    [yes],[dnl
-+        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-+                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-+                         found_introspection=yes,
-+                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-+    ],dnl
-+    [auto],[dnl
-+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-+	dnl Canonicalize enable_introspection
-+	enable_introspection=$found_introspection
-+    ],dnl
-+    [dnl
-+        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-+    ])dnl
-+
-+    AC_MSG_RESULT([$found_introspection])
-+
-+    INTROSPECTION_SCANNER=
-+    INTROSPECTION_COMPILER=
-+    INTROSPECTION_GENERATE=
-+    INTROSPECTION_GIRDIR=
-+    INTROSPECTION_TYPELIBDIR=
-+    if test "x$found_introspection" = "xyes"; then
-+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-+    fi
-+    AC_SUBST(INTROSPECTION_SCANNER)
-+    AC_SUBST(INTROSPECTION_COMPILER)
-+    AC_SUBST(INTROSPECTION_GENERATE)
-+    AC_SUBST(INTROSPECTION_GIRDIR)
-+    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-+    AC_SUBST(INTROSPECTION_CFLAGS)
-+    AC_SUBST(INTROSPECTION_LIBS)
-+    AC_SUBST(INTROSPECTION_MAKEFILE)
-+
-+    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-+])
-+
-+
-+dnl Usage:
-+dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-+[
-+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-+])
-+
-+dnl Usage:
-+dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-+
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-+[
-+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-+])
diff --git a/patches/libgudev-234/0001-Prepare-to-check-for-an-older-UDEV.patch b/patches/libgudev-234/0001-Prepare-to-check-for-an-older-UDEV.patch
new file mode 100644
index 000000000..5edc09ee4
--- /dev/null
+++ b/patches/libgudev-234/0001-Prepare-to-check-for-an-older-UDEV.patch
@@ -0,0 +1,27 @@
+From: Juergen Borleis <entwicklung@pengutronix.de>
+Date: Thu, 10 Dec 2015 16:28:37 +0100
+Subject: [PATCH] Prepare to check for an older UDEV
+
+In order to use libgudev with systemd's based udev and the standalone udev
+we must libgudev check for an older udev release. Since v182 is the last
+standalone udev, check for this specific release. The libudev API seems stable
+enough in both releases.
+
+Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 605de2ce8a46..570b21bc5592 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,7 +38,7 @@ GOBJECT_INTROSPECTION_CHECK([1.31.1])
+    AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
+    enable_introspection=no])
+ 
+-PKG_CHECK_MODULES([LIBUDEV], [libudev >= 199])
++PKG_CHECK_MODULES([LIBUDEV], [libudev >= 182])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.38 gobject-2.0 gio-2.0])
+ 
+ AC_ARG_ENABLE([umockdev],
diff --git a/patches/libgudev-230/autogen.sh b/patches/libgudev-234/autogen.sh
similarity index 100%
rename from patches/libgudev-230/autogen.sh
rename to patches/libgudev-234/autogen.sh
diff --git a/patches/libgudev-230/series b/patches/libgudev-234/series
similarity index 100%
rename from patches/libgudev-230/series
rename to patches/libgudev-234/series
diff --git a/rules/libgudev.make b/rules/libgudev.make
index 343d1dea6..cc7217715 100644
--- a/rules/libgudev.make
+++ b/rules/libgudev.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBGUDEV) += libgudev
 #
 # Paths and names
 #
-LIBGUDEV_VERSION	:= 230
-LIBGUDEV_MD5		:= e4dee8f3f349e9372213d33887819a4d
+LIBGUDEV_VERSION	:= 234
+LIBGUDEV_MD5		:= 386889d460003a4242a64cb47244a39a
 LIBGUDEV		:= libgudev-$(LIBGUDEV_VERSION)
 LIBGUDEV_SUFFIX		:= tar.xz
 LIBGUDEV_URL		:= $(call ptx/mirror, GNOME, libgudev/$(LIBGUDEV_VERSION)/$(LIBGUDEV).$(LIBGUDEV_SUFFIX))
@@ -38,10 +38,12 @@ endif
 LIBGUDEV_CONF_TOOL	:= autoconf
 LIBGUDEV_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-largefile \
 	--disable-gtk-doc \
 	--disable-gtk-doc-html \
 	--disable-gtk-doc-pdf \
-	--$(call ptx/endis, PTXCONF_LIBGUDEV_INTROSPECTION)-introspection
+	--$(call ptx/endis, PTXCONF_LIBGUDEV_INTROSPECTION)-introspection \
+	--disable-umockdev
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.20.1


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

[ptxdist] [PATCH 3/6] 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

[ptxdist] [PATCH 4/6] 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

[ptxdist] [PATCH 5/6] 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 09b3bc422..397a32850 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 GPL-3.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

[ptxdist] [PATCH 6/6] 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 397a32850..766144a3a 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 5/6] modemmanager: Add license file hashes

[Roland Hieber]

On Wed, Mar 24, 2021 at 07:35:39AM +0100, Alexander Dahl wrote:
> 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 09b3bc422..397a32850 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 GPL-3.0-or-later AND LGPL-2.1-or-later
> +MODEMMANAGER_LICENSE_FILES := \
> +	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c

Did you find anything for GPL-3.0-or-later? The only files I could find
were config.sub, ltmain.sh and config.guess, which are generated code,
and won't make it into the binary at all.
The ChangeLog mentions [1] something in 2015 about mmcli being wrongly
attributed as GPLv3, although it has always been GPL-2.0-or-later.
So I guess we could get rid of the "GPL-3.0-or-later" part in the
license expression.

[1]: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/ee85a463cf806cd01a61587520245a4818ab1fbb

 - Roland

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

Re: [ptxdist] [PATCH 1/6] libgudev: Add license file hash

[Roland Hieber]

On Wed, Mar 24, 2021 at 07:35:35AM +0100, Alexander Dahl wrote:
> From: Alexander Dahl <ada@thorsis.com>
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
>  rules/libgudev.make | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/rules/libgudev.make b/rules/libgudev.make
> index 637ea662d..343d1dea6 100644
> --- a/rules/libgudev.make
> +++ b/rules/libgudev.make
> @@ -22,6 +22,7 @@ LIBGUDEV_URL		:= $(call ptx/mirror, GNOME, libgudev/$(LIBGUDEV_VERSION)/$(LIBGUD
>  LIBGUDEV_SOURCE		:= $(SRCDIR)/$(LIBGUDEV).$(LIBGUDEV_SUFFIX)
>  LIBGUDEV_DIR		:= $(BUILDDIR)/$(LIBGUDEV)
>  LIBGUDEV_LICENSE	:= LGPL-2.1-or-later
> +LIBGUDEV_LICENSE_FILES	:= file://COPYING;md5=4fbd65380cdd255951079008b364516c

Hmm yes, that file contains the LGPL-2.1 text, but all files in gudev/
have license headers saying they are LGPL-2.0-or-later… I would suggest
using LGPL-2.0-or-later for the expression, and adding one of the source
files to the MD5sums.

 - Roland

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

Re: [ptxdist] [PATCH 3/6] libqmi: Add license file hashes

[Roland Hieber]

On Wed, Mar 24, 2021 at 07:35:37AM +0100, Alexander Dahl wrote:
> 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

Same here, someone seems to have copied the wrong license. Files in
src/libqmi-glib/ and src/libqrtr-glib/ carry LGPL-2.0-or-later headers,
and the README says that too. I didn't mention this in my previous mail,
but I would rather not include COPYING.LIB then, and add a short comment
why it isn't in there.

 - 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 5/6] modemmanager: Add license file hashes

[Alexander Dahl]

Hello Roland,

> Roland Hieber <rhi@pengutronix.de> hat am 24.03.2021 21:31 geschrieben:
> 
>  
> On Wed, Mar 24, 2021 at 07:35:39AM +0100, Alexander Dahl wrote:
> > 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 09b3bc422..397a32850 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 GPL-3.0-or-later AND LGPL-2.1-or-later
> > +MODEMMANAGER_LICENSE_FILES := \
> > +	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> > +	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c
> 
> Did you find anything for GPL-3.0-or-later? The only files I could find
> were config.sub, ltmain.sh and config.guess, which are generated code,
> and won't make it into the binary at all.

There is also gtk-doc.make but the same applies for that.

> The ChangeLog mentions [1] something in 2015 about mmcli being wrongly
> attributed as GPLv3, although it has always been GPL-2.0-or-later.
> So I guess we could get rid of the "GPL-3.0-or-later" part in the
> license expression.
> 
> [1]: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/ee85a463cf806cd01a61587520245a4818ab1fbb

Agreed. I will add an additional patch to v2 of the series. I think we can tag that as fix for 9e22636e4ffd ("ModemManager: version bump 1.4.14 -> 1.6.0") then.

Greets
Alex

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

Re: [ptxdist] [PATCH 1/6] libgudev: Add license file hash

[Alexander Dahl]

Hello Roland,

> Roland Hieber <rhi@pengutronix.de> hat am 24.03.2021 21:36 geschrieben:
> 
>  
> On Wed, Mar 24, 2021 at 07:35:35AM +0100, Alexander Dahl wrote:
> > From: Alexander Dahl <ada@thorsis.com>
> > 
> > Signed-off-by: Alexander Dahl <ada@thorsis.com>
> > ---
> >  rules/libgudev.make | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/rules/libgudev.make b/rules/libgudev.make
> > index 637ea662d..343d1dea6 100644
> > --- a/rules/libgudev.make
> > +++ b/rules/libgudev.make
> > @@ -22,6 +22,7 @@ LIBGUDEV_URL		:= $(call ptx/mirror, GNOME, libgudev/$(LIBGUDEV_VERSION)/$(LIBGUD
> >  LIBGUDEV_SOURCE		:= $(SRCDIR)/$(LIBGUDEV).$(LIBGUDEV_SUFFIX)
> >  LIBGUDEV_DIR		:= $(BUILDDIR)/$(LIBGUDEV)
> >  LIBGUDEV_LICENSE	:= LGPL-2.1-or-later
> > +LIBGUDEV_LICENSE_FILES	:= file://COPYING;md5=4fbd65380cdd255951079008b364516c
> 
> Hmm yes, that file contains the LGPL-2.1 text, but all files in gudev/
> have license headers saying they are LGPL-2.0-or-later… 

Good catch!

> I would suggest
> using LGPL-2.0-or-later for the expression, and adding one of the source
> files to the MD5sums.

I opened a ticket at upstream: 
https://gitlab.gnome.org/GNOME/libgudev/-/issues/8

Maybe we postpone this until upstream clarifies? It's not strictly needed for ModemManager anyways. Someone could then migrate the package to meson build with the next upstream release right away.

Greets
Alex

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

Re: [ptxdist] [PATCH 3/6] libqmi: Add license file hashes

[Alexander Dahl]

Hello Roland,

> Roland Hieber <rhi@pengutronix.de> hat am 24.03.2021 21:45 geschrieben:
> 
>  
> On Wed, Mar 24, 2021 at 07:35:37AM +0100, Alexander Dahl wrote:
> > 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
> 
> Same here, someone seems to have copied the wrong license. Files in
> src/libqmi-glib/ and src/libqrtr-glib/ carry LGPL-2.0-or-later headers,
> and the README says that too. I didn't mention this in my previous mail,
> but I would rather not include COPYING.LIB then, and add a short comment
> why it isn't in there.

I'm not sure about this one. File headers say "Lesser GPL". The original LGPL 2.0 said "Library GPL". Looks to me like someone wanted 2.1 already, also in file headers. 

Should we also open a ticket at upstream to request clarification? That would be here in this case:

https://gitlab.freedesktop.org/mobile-broadband/libqmi

(It's a different maintainer than for libgudev btw.)

Greets
Alex

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