Upgrade to ModemManager 1.16.8

.gitignore

@@ -117,6 +117,7 @@ Makefile.in
 /docs/reference/libmm-glib/libmm-glib.interfaces
 /docs/reference/libmm-glib/libmm-glib.prerequisites
 /docs/reference/libmm-glib/libmm-glib.signals
+/docs/reference/libmm-glib/libmm-glib.actions
 /docs/reference/libmm-glib/libmm-glib.types
 /docs/reference/libmm-glib/*.stamp
 /docs/reference/libmm-glib/*.txt
@@ -167,8 +168,8 @@ Makefile.in
 /plugins/test-service-*
 
 /plugins/ublox/mm-ublox-enums-types.[ch]
-
 /plugins/telit/mm-telit-enums-types.[ch]
+/plugins/huawei/mm-huawei-enums-types.[ch]
 
 /plugins/xmm7360/mm-xmm7360-rpc-enums-types.[ch]
 
@@ -178,5 +179,9 @@ Makefile.in
 /test/mmsmspdu
 /test/mmsmsmonitor
 
+/tools/tests/services/org.freedesktop.ModemManager1.service
+/tools/tests/test-stub
+/tools/tests/test-wrapper.sh
+
 /ModemManager-*-coverage.info
 /ModemManager-*-coverage/

.gitlab-ci.yml

@@ -1,101 +1,165 @@
-image: gcc
+include:
+  - project: freedesktop/ci-templates
+    ref: 290b79e0e78eab67a83766f4e9691be554fc4afd
+    file:
+    - templates/ubuntu.yml
 
 stages:
+  - container prep
   - build
 
-before_script:
-    - apt update || true
-    - apt -y install autoconf automake libtool libglib2.0-dev libgudev-1.0-dev libgettextpo-dev autopoint xsltproc dbus autoconf-archive gettext
+.common_variables:
+  variables:
+    FDO_UPSTREAM_REPO: mobile-broadband/ModemManager
+    FDO_DISTRIBUTION_VERSION: '20.04'
+    FDO_DISTRIBUTION_TAG: '2021-04-28.2'
+    FDO_DISTRIBUTION_PACKAGES: ca-certificates git gcc autoconf automake libtool
+                               libgettextpo-dev libgirepository1.0-dev libglib2.0-dev
+                               libgudev-1.0-dev python3-dbus python3-gi autopoint
+                               xsltproc dbus autoconf-archive gettext gtk-doc-tools
+                               libglib2.0-doc gobject-introspection libsystemd-dev
+                               libpolkit-gobject-1-dev valac
+
+build container:
+  extends:
+  - .fdo.container-build@ubuntu
+  - .common_variables
+  stage: container prep
+  only:
+    - master
+    - branches
+    - merge_requests
+    - tags
+    - pushes
 
 build-no-qmi:
   stage: build
+  extends:
+  - .fdo.distribution-image@ubuntu
+  - .common_variables
   only:
     - master
     - merge_requests
     - tags
     - schedules
   script:
-    - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
+    - git clone --depth 1 --branch mbim-1-24 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
     - pushd libmbim
     - NOCONFIGURE=1 ./autogen.sh
-    - ./configure --prefix=/usr
+    - ./configure --prefix=/usr --disable-gtk-doc --disable-introspection
     - make
     - make install
     - popd
     - NOCONFIGURE=1 ./autogen.sh
-    - ./configure --prefix=/tmp/build-no-qmi --disable-gtk-doc --without-qmi
+    - ./configure --prefix=/usr --disable-gtk-doc --disable-introspection --without-qmi
     - make
     - make check
     - make install
 
 build-no-mbim:
   stage: build
+  extends:
+  - .fdo.distribution-image@ubuntu
+  - .common_variables
   only:
     - master
     - merge_requests
     - tags
     - schedules
   script:
-    - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
+    - git clone --depth 1 --branch qmi-1-28 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
     - pushd libqmi
     - NOCONFIGURE=1 ./autogen.sh
-    - ./configure --prefix=/usr --disable-mbim-qmux
+    - ./configure --prefix=/usr --disable-mbim-qmux --enable-collection=basic
     - make
     - make install
     - popd
     - NOCONFIGURE=1 ./autogen.sh
-    - ./configure --prefix=/tmp/build-no-mbim --disable-gtk-doc --without-mbim
+    - ./configure --prefix=/usr --disable-gtk-doc --disable-introspection --without-mbim
     - make
     - make check
     - make install
 
 build-no-qmi-no-mbim:
   stage: build
+  extends:
+  - .fdo.distribution-image@ubuntu
+  - .common_variables
+  only:
+    - master
+    - merge_requests
+    - tags
+    - schedules
+  script:
+    - NOCONFIGURE=1 ./autogen.sh
+    - ./configure --prefix=/usr --disable-gtk-doc --disable-introspection --without-qmi --without-mbim
+    - make
+    - make check
+    - make install
+
+build-qmi-newest-commands:
+  stage: build
+  extends:
+  - .fdo.distribution-image@ubuntu
+  - .common_variables
   only:
     - master
     - merge_requests
     - tags
     - schedules
   script:
+    - git clone --depth 1 --branch qmi-1-28 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
+    - pushd libqmi
+    - NOCONFIGURE=1 ./autogen.sh
+    - ./configure --prefix=/usr --disable-gtk-doc --disable-introspection --disable-mbim-qmux --enable-collection=basic
+    - make
+    - make install
+    - popd
     - NOCONFIGURE=1 ./autogen.sh
-    - ./configure --prefix=/tmp/build-no-qmi-no-mbim --disable-gtk-doc --without-qmi --without-mbim
+    - ./configure --prefix=/usr --disable-gtk-doc --disable-introspection --without-mbim CFLAGS="-DWITH_NEWEST_QMI_COMMANDS"
     - make
     - make check
     - make install
 
 build-single-plugins:
   stage: build
+  extends:
+  - .fdo.distribution-image@ubuntu
+  - .common_variables
   only:
     - schedules
   script:
-    - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
+    - git clone --depth 1 --branch mbim-1-24 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
     - pushd libmbim
     - NOCONFIGURE=1 ./autogen.sh
-    - ./configure --prefix=/usr
+    - ./configure --prefix=/usr --disable-gtk-doc --disable-introspection
     - make
     - make install
     - popd
-    - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
+    - git clone --depth 1 --branch qmi-1-28 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
     - pushd libqmi
     - NOCONFIGURE=1 ./autogen.sh
-    - ./configure --prefix=/usr --enable-mbim-qmux
+    - ./configure --prefix=/usr --enable-mbim-qmux --enable-collection=basic
     - make
     - make install
     - popd
     - NOCONFIGURE=1 ./autogen.sh
-    - for plugin in generic altair-lte anydata cinterion dell dlink
-                    fibocom foxconn haier huawei iridium linktop
-                    longcheer mbm motorola mtk nokia nokia-icera
+    - for plugin in generic altair-lte anydata broadmobi cinterion
+                    dell dlink fibocom foxconn gosuncn haier huawei iridium
+                    linktop longcheer mbm motorola mtk nokia nokia-icera
                     novatel novatel-lte option option-hso pantech
-                    quectel samsung sierra-legacy sierra simtech
+                    qcom-soc quectel samsung sierra-legacy sierra simtech
                     telit thuraya tplink ublox via wavecom x22x zte; do
-        ./configure --prefix=/usr --disable-gtk-doc --disable-all-plugins --enable-plugin-$plugin;
+        ./configure --prefix=/usr --disable-gtk-doc --disable-introspection --disable-all-plugins --enable-plugin-$plugin;
         make;
         make clean;
       done
 
 build-default:
   stage: build
+  extends:
+  - .fdo.distribution-image@ubuntu
+  - .common_variables
   only:
     - master
     - branches
@@ -104,24 +168,30 @@ build-default:
     - schedules
     - pushes
   script:
-    - apt -y install gtk-doc-tools libglib2.0-doc gobject-introspection libgirepository1.0-dev libsystemd-dev libpolkit-gobject-1-dev valac
-    - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
+    - git clone --depth 1 --branch mbim-1-24 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
     - pushd libmbim
     - NOCONFIGURE=1 ./autogen.sh
-    - ./configure --prefix=/usr
+    - ./configure --prefix=/usr --disable-gtk-doc --enable-introspection
     - make
     - make install
     - popd
-    - git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
+    - git clone --depth 1 --branch qmi-1-28 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
     - pushd libqmi
     - NOCONFIGURE=1 ./autogen.sh
-    - ./configure --prefix=/usr --enable-mbim-qmux
+    - ./configure --prefix=/usr --enable-mbim-qmux --enable-collection=basic
     - make
     - make install
     - popd
     - NOCONFIGURE=1 ./autogen.sh
-    - ./configure --prefix=/usr --enable-gtk-doc --with-polkit=strict --with-suspend-resume=systemd --with-systemdsystemunitdir=/lib/systemd/system
+    - ./configure --prefix=/usr --enable-gtk-doc --enable-introspection --with-polkit=strict --with-suspend-resume=systemd --with-systemdsystemunitdir=/lib/systemd/system
     - make
     - make check
     - make install
     - make distcheck
+    - sha256sum $CI_PROJECT_NAME-*.tar.xz | awk '{print $1;}' > pkg_hash.txt
+  artifacts:
+    name: "$CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA"
+    paths:
+      - /builds/$CI_PROJECT_ROOT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME-*.tar.xz
+      - /builds/$CI_PROJECT_ROOT_NAMESPACE/$CI_PROJECT_NAME/pkg_hash.txt
+    expire_in: 2 days

AUTHORS

@@ -17,13 +17,16 @@ Other contributors:
   Riccardo Vangelisti
   Alexander Sack
   Guido Günther
+  Eric Caruso
   Eric Shienbrood
   Elly Jones
-  Eric Caruso
+  Bob Ham
+  Giacinto Cifelli
   David McCullough
   Prathmesh Prabhu
   Thieu Le
   Thomas Tuttle
+  Maxim Anisimov
   Bjørn Mork
   Marius B. Kotsbak
   Michael Biebl
@@ -33,7 +36,6 @@ Other contributors:
   Christian Persch
   Sven Schwermer
   Thomas Sailer
-  Bob Ham
   Colin Walters
   Franko Fang
   Jakub Sitnicki
@@ -49,29 +51,33 @@ Other contributors:
   Martyn Russell
   Thomas Haller
   Tomas Jura
+  Amol Lad
   Colin Helliwell
   Graham Inggs
   Javier Viguera
   Lionel Landwerlin
   Maksim Salau
   Martin Pitt
   Matthew Stanger
-  Maxim Anisimov
+  Milo Casagrande
   Nick Stevens
   Norbert Frese
   Piotr Drąg
   Thomas Bechtold
   Yegor Yefremov
+  Yuri Chornoivan
   Adrian Bunk
   Alexander Couzens
   Amit Mendapara
+  Andika Triwidada
   Andrew Bird
   Anton Blanchard
   Arnd Hannemann
   Arto Jantunen
   Arun Raghavan
   Baruch Siach
   Beniamino Galvani
+  Brendan Peter
   Brian Norris
   Brian, Sam
   Bryan Duff
@@ -80,6 +86,7 @@ Other contributors:
   David Castellanos
   David Herrmann
   David Härdeman
+  David Khouya
   Dmitry Ivanyushin
   Enrico Mioso
   Eugene Crosser
@@ -99,6 +106,7 @@ Other contributors:
   Krzysztof Kotlenga
   Lech Perczak
   LiuQiFeng
+  Louis-Alexis Eyraud
   Luis A. Lozano
   M. I. Spozta
   Marc Murphy
@@ -107,18 +115,20 @@ Other contributors:
   Mark-Jablonsky
   Michael Farrell
   Michał Sroczyński
-  Milo Casagrande
   Mohammed Sadiq
   Moo
+  Murithi Borona
   Nathan J. Williams
   Noel J. Bergman
   Oskar Enoksson
   Piotr Figiel
   Quentin.Li
+  Rafael Fontenelle
   Roshan Pius
   Sam Spilsbury
   Sławomir Bocheński
   Tabor Kelly
+  Teijo Kinnunen
   Thomas Grenman
   Thomas Voß
   Ting-Yuan Huang
@@ -131,10 +141,13 @@ Other contributors:
   Ville Skyttä
   Vincent Untz
   Vitaly Gimly
-  Yuri Chornoivan
   Amol Lad
+  emintufan
   kuonirat
+  mozzwald
+  mstanger
   poma
   scootergrisen
   wi24rd
   yparitcher
+  Артемий Судаков

Makefile.am

@@ -13,6 +13,7 @@ SUBDIRS = \
 	vapi \
 	introspection \
 	test \
+	tools \
 	examples \
 	docs \
 	$(NULL)