Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ofono for openSUSE:Factory checked 
in at 2022-01-11 21:20:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ofono (Old)
 and      /work/SRC/openSUSE:Factory/.ofono.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ofono"

Tue Jan 11 21:20:17 2022 rev:20 rq:945576 version:1.34

Changes:
--------
--- /work/SRC/openSUSE:Factory/ofono/ofono.changes      2021-10-15 
23:04:07.850104617 +0200
+++ /work/SRC/openSUSE:Factory/.ofono.new.1892/ofono.changes    2022-01-11 
21:24:29.445179171 +0100
@@ -1,0 +2,7 @@
+Mon Jan 10 22:52:08 UTC 2022 - Martin Hauke <mar...@gmx.de>
+
+- Update to version 1.34:
+  * Fix issue with handling device info of Quectel modems.
+  * Fix issue with handling callback for RIL dial manager.
+
+-------------------------------------------------------------------

Old:
----
  ofono-1.33.tar.xz
  ofono-1.33.tar.xz.sig

New:
----
  ofono-1.34.tar.xz
  ofono-1.34.tar.xz.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ofono.spec ++++++
--- /var/tmp/diff_new_pack.t7godg/_old  2022-01-11 21:24:29.865179466 +0100
+++ /var/tmp/diff_new_pack.t7godg/_new  2022-01-11 21:24:29.869179469 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ofono
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2014 Sergey Kondakov <virtuous...@gmail.com>.
 # Copyright (c) 2014 Bernd Wachter <bwach...@lart.info>.
 #
@@ -19,7 +19,7 @@
 
 
 Name:           ofono
-Version:        1.33
+Version:        1.34
 Release:        0
 Summary:        Mobile telephony application development framework
 License:        GPL-2.0-only

++++++ ofono-1.33.tar.xz -> ofono-1.34.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/ChangeLog new/ofono-1.34/ChangeLog
--- old/ofono-1.33/ChangeLog    2021-09-15 13:22:21.000000000 +0200
+++ new/ofono-1.34/ChangeLog    2022-01-05 22:36:42.000000000 +0100
@@ -1,3 +1,7 @@
+ver 1.34:
+       Fix issue with handling device info of Quectel modems.
+       Fix issue with handling callback for RIL dial manager.
+
 ver 1.33:
        Fix issue with filling unused part of AID with FFs.
        Fix issue with reads beyond the first block of SIM filesystem.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/Makefile.am new/ofono-1.34/Makefile.am
--- old/ofono-1.33/Makefile.am  2021-09-15 13:22:21.000000000 +0200
+++ new/ofono-1.34/Makefile.am  2022-01-05 22:36:42.000000000 +0100
@@ -32,7 +32,8 @@
                        ell/file.h \
                        ell/uintset.h \
                        ell/string.h \
-                       ell/gpio.h
+                       ell/gpio.h \
+                       ell/cleanup.h
 
 ell_sources = ell/private.h \
                        ell/missing.h \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/Makefile.in new/ofono-1.34/Makefile.in
--- old/ofono-1.33/Makefile.in  2021-09-15 13:23:36.000000000 +0200
+++ new/ofono-1.34/Makefile.in  2022-01-05 22:37:23.000000000 +0100
@@ -447,11 +447,12 @@
        ell/strv.h ell/utf8.h ell/queue.h ell/timeout.h ell/main.h \
        ell/idle.h ell/signal.h ell/io.h ell/log.h ell/checksum.h \
        ell/random.h ell/uuid.h ell/file.h ell/uintset.h ell/string.h \
-       ell/gpio.h ell/private.h ell/missing.h ell/util.c ell/test.c \
-       ell/strv.c ell/utf8.c ell/queue.c ell/timeout.c \
-       ell/main-private.h ell/main.c ell/idle.c ell/signal.c ell/io.c \
-       ell/log.c ell/checksum.c ell/random.c ell/uuid.c ell/file.c \
-       ell/uintset.c ell/string.c ell/gpio.c ell/useful.h
+       ell/gpio.h ell/cleanup.h ell/private.h ell/missing.h \
+       ell/util.c ell/test.c ell/strv.c ell/utf8.c ell/queue.c \
+       ell/timeout.c ell/main-private.h ell/main.c ell/idle.c \
+       ell/signal.c ell/io.c ell/log.c ell/checksum.c ell/random.c \
+       ell/uuid.c ell/file.c ell/uintset.c ell/string.c ell/gpio.c \
+       ell/useful.h
 am__objects_1 =
 am__dirstamp = $(am__leading_dot)dirstamp
 @EXTERNAL_ELL_FALSE@am__objects_2 = ell/util.lo ell/test.lo \
@@ -1919,7 +1920,8 @@
 @EXTERNAL_ELL_FALSE@                   ell/file.h \
 @EXTERNAL_ELL_FALSE@                   ell/uintset.h \
 @EXTERNAL_ELL_FALSE@                   ell/string.h \
-@EXTERNAL_ELL_FALSE@                   ell/gpio.h
+@EXTERNAL_ELL_FALSE@                   ell/gpio.h \
+@EXTERNAL_ELL_FALSE@                   ell/cleanup.h
 
 @EXTERNAL_ELL_FALSE@ell_sources = ell/private.h \
 @EXTERNAL_ELL_FALSE@                   ell/missing.h \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/configure new/ofono-1.34/configure
--- old/ofono-1.33/configure    2021-09-15 13:23:32.000000000 +0200
+++ new/ofono-1.34/configure    2022-01-05 22:37:19.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ofono 1.33.
+# Generated by GNU Autoconf 2.69 for ofono 1.34.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='ofono'
 PACKAGE_TARNAME='ofono'
-PACKAGE_VERSION='1.33'
-PACKAGE_STRING='ofono 1.33'
+PACKAGE_VERSION='1.34'
+PACKAGE_STRING='ofono 1.34'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1415,7 +1415,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ofono 1.33 to adapt to many kinds of systems.
+\`configure' configures ofono 1.34 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1486,7 +1486,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ofono 1.33:";;
+     short | recursive ) echo "Configuration of ofono 1.34:";;
    esac
   cat <<\_ACEOF
 
@@ -1640,7 +1640,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ofono configure 1.33
+ofono configure 1.34
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1918,7 +1918,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ofono $as_me 1.33, which was
+It was created by ofono $as_me 1.34, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2777,7 +2777,7 @@
 
 # Define the identity of the package.
  PACKAGE='ofono'
- VERSION='1.33'
+ VERSION='1.34'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14633,7 +14633,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ofono $as_me 1.33, which was
+This file was extended by ofono $as_me 1.34, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14699,7 +14699,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ofono config.status 1.33
+ofono config.status 1.34
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/configure.ac new/ofono-1.34/configure.ac
--- old/ofono-1.33/configure.ac 2021-09-15 13:22:21.000000000 +0200
+++ new/ofono-1.34/configure.ac 2022-01-05 22:36:42.000000000 +0100
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(ofono, 1.33)
+AC_INIT(ofono, 1.34)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
 AC_CONFIG_HEADERS(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/drivers/rilmodem/netmon.c 
new/ofono-1.34/drivers/rilmodem/netmon.c
--- old/ofono-1.33/drivers/rilmodem/netmon.c    2021-05-05 11:06:20.000000000 
+0200
+++ new/ofono-1.34/drivers/rilmodem/netmon.c    2022-01-05 22:36:42.000000000 
+0100
@@ -358,8 +358,10 @@
        struct cb_data *cbd = user_data;
        ofono_netmon_cb_t cb = cbd->cb;
 
-       if (message->error != RIL_E_SUCCESS)
+       if (message->error != RIL_E_SUCCESS) {
                CALLBACK_WITH_FAILURE(cb, cbd->data);
+               return;
+       }
 
        CALLBACK_WITH_SUCCESS(cb, cbd->data);
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/drivers/rilmodem/stk.c 
new/ofono-1.34/drivers/rilmodem/stk.c
--- old/ofono-1.33/drivers/rilmodem/stk.c       2019-01-23 19:14:34.000000000 
+0100
+++ new/ofono-1.34/drivers/rilmodem/stk.c       2022-01-05 22:36:42.000000000 
+0100
@@ -214,13 +214,13 @@
 
        ofono_stk_set_data(stk, data);
 
-       g_ril_register(ril, RIL_UNSOL_STK_PROACTIVE_COMMAND,
+       g_ril_register(data->ril, RIL_UNSOL_STK_PROACTIVE_COMMAND,
                                        ril_stk_proactive_cmd_notify, stk);
 
-       g_ril_register(ril, RIL_UNSOL_STK_SESSION_END,
+       g_ril_register(data->ril, RIL_UNSOL_STK_SESSION_END,
                                        ril_stk_session_end_notify, stk);
 
-       g_ril_register(ril, RIL_UNSOL_STK_EVENT_NOTIFY,
+       g_ril_register(data->ril, RIL_UNSOL_STK_EVENT_NOTIFY,
                                        ril_stk_event_notify, stk);
 
        g_ril_send(data->ril, RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING, NULL,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/drivers/rilmodem/voicecall.c 
new/ofono-1.34/drivers/rilmodem/voicecall.c
--- old/ofono-1.33/drivers/rilmodem/voicecall.c 2021-05-05 11:06:20.000000000 
+0200
+++ new/ofono-1.34/drivers/rilmodem/voicecall.c 2022-01-05 22:36:42.000000000 
+0100
@@ -396,6 +396,8 @@
         * DIAL_MODIFIED_TO_DIAL means redirection. The call we will see when
         * polling will have a different called number.
         */
+       vd->suppress_clcc_poll = FALSE;
+
        if (message->error == RIL_E_SUCCESS ||
                        (g_ril_vendor(vd->ril) == OFONO_RIL_VENDOR_AOSP &&
                        message->error == RIL_E_DIAL_MODIFIED_TO_DIAL)) {
@@ -448,8 +450,10 @@
 
        /* Send request to RIL */
        if (g_ril_send(vd->ril, RIL_REQUEST_DIAL, &rilp,
-                       rild_cb, cbd, g_free) > 0)
+                       rild_cb, cbd, g_free) > 0) {
+               vd->suppress_clcc_poll = TRUE;
                return;
+       }
 
        g_free(cbd);
        CALLBACK_WITH_FAILURE(cb, data);
@@ -594,6 +598,11 @@
 
        g_ril_print_unsol_no_args(vd->ril, message);
 
+       if (vd->suppress_clcc_poll) {
+               DBG("suppress clcc poll!");
+               return;
+       }
+
        /* Just need to request the call list again */
        ril_poll_clcc(vc);
 
@@ -829,6 +838,7 @@
        vd->vendor = vendor;
        vd->cb = NULL;
        vd->data = NULL;
+       vd->suppress_clcc_poll = FALSE;
 
        clear_dtmf_queue(vd);
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/drivers/rilmodem/voicecall.h 
new/ofono-1.34/drivers/rilmodem/voicecall.h
--- old/ofono-1.33/drivers/rilmodem/voicecall.h 2016-05-03 19:04:11.000000000 
+0200
+++ new/ofono-1.34/drivers/rilmodem/voicecall.h 2022-01-05 22:36:42.000000000 
+0100
@@ -31,6 +31,7 @@
        void *data;
        gchar *tone_queue;
        gboolean tone_pending;
+       gboolean suppress_clcc_poll;
 };
 
 int ril_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/ell/cleanup.h new/ofono-1.34/ell/cleanup.h
--- old/ofono-1.33/ell/cleanup.h        1970-01-01 01:00:00.000000000 +0100
+++ new/ofono-1.34/ell/cleanup.h        2021-11-02 15:41:45.000000000 +0100
@@ -0,0 +1,27 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2021  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#pragma once
+
+#define DEFINE_CLEANUP_FUNC(func)                      \
+       inline __attribute__((always_inline))           \
+       void func ## _cleanup(void *p) { func(*(void **) p); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/ell/log.h new/ofono-1.34/ell/log.h
--- old/ofono-1.33/ell/log.h    2020-09-05 09:26:19.000000000 +0200
+++ new/ofono-1.34/ell/log.h    2021-11-18 20:53:14.000000000 +0100
@@ -61,12 +61,20 @@
        unsigned int flags;
 } __attribute__((aligned(8)));
 
+/*
+ * Set the retain attribute so that the section cannot be discarded by ld
+ * --gc-sections -z start-stop-gc. Older compilers would warn for the unknown
+ *  attribute, so just disable -Wattributes.
+ */
 #define L_DEBUG_SYMBOL(symbol, format, ...) do { \
+_Pragma("GCC diagnostic push") \
+_Pragma("GCC diagnostic ignored \"-Wattributes\"") \
        static struct l_debug_desc symbol \
-       __attribute__((used, section("__ell_debug"), aligned(8))) = { \
+       __attribute__((used, retain, section("__ell_debug"), aligned(8))) = { \
                .file = __FILE__, .func = __func__, \
                .flags = L_DEBUG_FLAG_DEFAULT, \
        }; \
+_Pragma("GCC diagnostic pop") \
        if (symbol.flags & L_DEBUG_FLAG_PRINT) \
                l_log(L_LOG_DEBUG, "%s:%s() " format, __FILE__, \
                                        __func__ , ##__VA_ARGS__); \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/ell/string.h new/ofono-1.34/ell/string.h
--- old/ofono-1.33/ell/string.h 2020-04-14 20:24:28.000000000 +0200
+++ new/ofono-1.34/ell/string.h 2021-11-02 15:41:45.000000000 +0100
@@ -24,6 +24,7 @@
 #define __ELL_STRING_H
 
 #include <stdarg.h>
+#include <ell/cleanup.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,6 +34,7 @@
 
 struct l_string *l_string_new(size_t initial_length);
 void l_string_free(struct l_string *string);
+DEFINE_CLEANUP_FUNC(l_string_free);
 char *l_string_unwrap(struct l_string *string);
 
 struct l_string *l_string_append(struct l_string *dest, const char *src);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/ell/strv.c new/ofono-1.34/ell/strv.c
--- old/ofono-1.33/ell/strv.c   2021-03-29 14:19:13.000000000 +0200
+++ new/ofono-1.34/ell/strv.c   2021-11-02 15:41:45.000000000 +0100
@@ -359,3 +359,23 @@
 
        return copy;
 }
+
+/**
+ * l_strv_eq:
+ * @a: a %NULL terminated array of strings or %NULL
+ * @b: another %NULL terminated array of strings or %NULL
+ *
+ * Returns: Whether @a and @b's contents are identical, including the
+ * order, or @a and @b are both %NULL.
+ */
+LIB_EXPORT bool l_strv_eq(char **a, char **b)
+{
+       if (!a || !b)
+               return a == b;
+
+       for (; *a; a++, b++)
+               if (!*b || strcmp(*a, *b))
+                       return false;
+
+       return !*b;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/ell/strv.h new/ofono-1.34/ell/strv.h
--- old/ofono-1.33/ell/strv.h   2020-11-29 22:35:22.000000000 +0100
+++ new/ofono-1.34/ell/strv.h   2021-11-02 15:41:45.000000000 +0100
@@ -25,6 +25,7 @@
 
 #include <stdarg.h>
 #include <stdbool.h>
+#include <ell/cleanup.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,6 +38,7 @@
 
 char **l_strv_new(void);
 void l_strv_free(char **str_array);
+DEFINE_CLEANUP_FUNC(l_strv_free);
 unsigned int l_strv_length(char **str_array);
 bool l_strv_contains(char **str_array, const char *item);
 char **l_strv_append(char **str_array, const char *str);
@@ -46,6 +48,7 @@
                                                        va_list args)
                                        __attribute__((format(printf, 2, 0)));
 char **l_strv_copy(char **str_array);
+bool l_strv_eq(char **a, char **b);
 
 #ifdef __cplusplus
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/ell/uintset.c new/ofono-1.34/ell/uintset.c
--- old/ofono-1.33/ell/uintset.c        2021-03-29 14:19:13.000000000 +0200
+++ new/ofono-1.34/ell/uintset.c        2022-01-05 22:10:31.000000000 +0100
@@ -555,3 +555,27 @@
 
        return true;
 }
+
+/**
+ * l_uintset_size
+ *
+ * @set: The set of numbers
+ *
+ * Returns the number of set elements
+ */
+LIB_EXPORT uint32_t l_uintset_size(const struct l_uintset *set)
+{
+       uint16_t i;
+       uint32_t offset_max;
+       uint32_t count = 0;
+
+       if (unlikely(!set))
+               return 0;
+
+       offset_max = (set->size + BITS_PER_LONG - 1) / BITS_PER_LONG;
+
+       for (i = 0; i < offset_max; i++)
+               count += __builtin_popcountl(set->bits[i]);
+
+       return count;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/ell/uintset.h new/ofono-1.34/ell/uintset.h
--- old/ofono-1.33/ell/uintset.h        2020-09-05 09:26:19.000000000 +0200
+++ new/ofono-1.34/ell/uintset.h        2022-01-05 22:10:31.000000000 +0100
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
+#include <ell/cleanup.h>
 
 typedef void (*l_uintset_foreach_func_t) (uint32_t number, void *user_data);
 
@@ -38,6 +39,7 @@
 struct l_uintset *l_uintset_new_from_range(uint32_t min, uint32_t max);
 struct l_uintset *l_uintset_new(unsigned int size);
 void l_uintset_free(struct l_uintset *set);
+DEFINE_CLEANUP_FUNC(l_uintset_free);
 
 bool l_uintset_contains(struct l_uintset *set, uint32_t number);
 bool l_uintset_take(struct l_uintset *set, uint32_t number);
@@ -59,6 +61,7 @@
 struct l_uintset *l_uintset_intersect(const struct l_uintset *set_a,
                                                const struct l_uintset *set_b);
 bool l_uintset_isempty(const struct l_uintset *set);
+uint32_t l_uintset_size(const struct l_uintset *set);
 
 #ifdef __cplusplus
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/ell/useful.h new/ofono-1.34/ell/useful.h
--- old/ofono-1.33/ell/useful.h 2021-09-14 21:48:51.000000000 +0200
+++ new/ofono-1.34/ell/useful.h 2021-11-02 15:41:45.000000000 +0100
@@ -59,16 +59,11 @@
        _x / _d;                                        \
 })
 
-#define __AUTODESTRUCT(var, func)                      \
-       void cleanup_ ## var(void *ptr)                 \
-       { func(*(void **) ptr); }                       \
-       __attribute((cleanup(cleanup_ ## var)))
-
-#define _AUTODESTRUCT(var, func)                       \
-       __AUTODESTRUCT(var, func)
+#define __AUTODESTRUCT(func)                           \
+       __attribute((cleanup(func ## _cleanup)))
 
 #define _auto_(func)                                   \
-       _AUTODESTRUCT(__COUNTER__, func)
+       __AUTODESTRUCT(func)
 
 /*
  * Trick the compiler into thinking that var might be changed somehow by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/ell/util.h new/ofono-1.34/ell/util.h
--- old/ofono-1.33/ell/util.h   2021-08-01 21:49:37.000000000 +0200
+++ new/ofono-1.34/ell/util.h   2021-11-02 15:41:45.000000000 +0100
@@ -30,6 +30,7 @@
 #include <endian.h>
 #include <byteswap.h>
 #include <sys/uio.h>
+#include <ell/cleanup.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -235,6 +236,7 @@
 void *l_memdup(const void *mem, size_t size)
                        __attribute__ ((warn_unused_result, malloc));
 void l_free(void *ptr);
+DEFINE_CLEANUP_FUNC(l_free);
 
 void *l_realloc(void *mem, size_t size)
                        __attribute__ ((warn_unused_result, malloc));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/ofono-1.33/plugins/quectel.c 
new/ofono-1.34/plugins/quectel.c
--- old/ofono-1.33/plugins/quectel.c    2021-05-05 11:06:20.000000000 +0200
+++ new/ofono-1.34/plugins/quectel.c    2022-01-05 22:36:42.000000000 +0100
@@ -1320,6 +1320,8 @@
 
        DBG("%p", modem);
 
+       ofono_devinfo_create(modem, data->vendor, "atmodem", data->aux);
+
        ofono_voicecall_create(modem, data->vendor, "atmodem", data->aux);
        sim = ofono_sim_create(modem, data->vendor, "atmodem", data->aux);
 

++++++ ofono-1.33.tar.xz.sig -> ofono-1.34.tar.xz.sig ++++++
--- /work/SRC/openSUSE:Factory/ofono/ofono-1.33.tar.xz.sig      2021-09-17 
23:26:23.209259469 +0200
+++ /work/SRC/openSUSE:Factory/.ofono.new.1892/ofono-1.34.tar.xz.sig    
2022-01-11 21:24:29.433179163 +0100
@@ -243,6 +243,8 @@
 f7d775887b7b80cf3b82e3f0a6c2696c6d01963d222ca2217919d21b9e803042  
ofono-1.32.tar.xz
 a4853e791851cd3a36f9d2c648dc1a08ed15fc076e5c66541c43c52e67a19ed7  
ofono-1.33.tar.gz
 e4591c5353ad2069cb9c0861fad3f1bf655137f9785fc5f16151d509e49ba708  
ofono-1.33.tar.xz
+ee6c4104fe010490d0c3ea50b030c5d30f481c35e5d7408634a2319ec0ef8ec5  
ofono-1.34.tar.gz
+c0b96d3013447ec2bcb74579bef90e4e59c68dbfa4b9c6fbce5d12401a43aac7  
ofono-1.34.tar.xz
 e1f9d55573be140640576e5da3ed1be2e72c1d7174b77aa72c17f385a0a03f7f  
phonesim-1.0.tar.bz2
 2d4bf2c28cce3f8e0e718a10977d07b655b8005c47842968115af83739e5414f  
phonesim-1.0.tar.gz
 f7197c0a2ad939c9c9d5a38c22f3b34c2088003f8c3f090823b062ed060b674e  
phonesim-1.0.tar.xz
@@ -310,17 +312,17 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJhQdyUAAoJEGMtOgZYnaaxHnQP+wXbmG0MV/NQf4iVsr6U0JdH
-W7eZMcbX2LufAdO9zUcVBlMFjz07DwXMvZofuOzt7QLtLtvQVEZuLrOxMC9MM1Vg
-Ix26u7xs/xDcvhg7DxYegGQDoKKd3eb3JHpNiXyeUrNW8D6nDI8EolUMv50w+/Im
-wnhueo2c02nHBnBa9jR3oOgMXvS8jdyQbN2tn6uTuqY7341Ig/uw+nTwXvr1HZEu
-t3QEHVI9NBdb5u8syRT3/9RBdSkdNtARsX1dQUvMBiJapf8xiDe84RUG3FdJpt+f
-F++IC6vYlhyxHBtHJcb77OSzcIEYf3ZOOSsVUsE79fJoFZIFhy7AuMiUx3FMRihy
-gH+gX4GgYg5ouJ/j+qZMrmkhPC9tTe26/Yq8929ffLuLUH3seTNrEMPM5KywDwFk
-D+7Vf+hADTApOutg4PvEcKjThuu+MrMaXLCCT48eHryIRk5/57fCkZLudhaFMxRd
-6Rr9uP5djRTv4u8UXC8BxpQU9c1c/x8n4i4aicWTFhkh8DfX9dexcc7RvgunshgM
-K/7vRTgP3vCZIPoFw7SFTUSXq+9IqSkAikiViTezbCQPFyPLSeeUG5QrfCk34e7M
-eGjWAmjsw95HymrCLPe2Inakn9MMHwCxzWMog+biGiQJtCaqlsX4ojkXlMbRnQ3y
-Apz91ehTOU3YQ51UwKO2
-=KnSy
+iQIcBAEBCAAGBQJh1hSeAAoJEGMtOgZYnaaxHKQP/0L5w8y9M+9KsfZ62Q4SDb5K
+znLJW65J/5eE8uJhfxuvGhDLhmQ4xYtwAYh5NwGMi0j7RxFy/YgIa4hW0V/15LIP
+Q5LMhxPauZkxPFsUkP4KS3ONV8QFk0ToHYKPr2zxb/5970o9HxbMt1n0dtn9LipN
+FQht03+1cy8rcR/uXqACgRvvP/eBMK+Ie2q1YpZbpp5Wl3KZBGzWihHkpY5YF3Un
+IP17oa/JKK4XAmu2F20Gr8j0VgEYRoCObrRRjShD6PNfdByW8b9LkNdabWIODZbd
+Ux26lgXRlEUwFA0BfGkrTSXFy+/BRoN20hbgV0EA7+DiXA0uHCOzJUC2uE2iZ/5O
+iA2YCvP2vsYzg6ccO9m6QszbNsB9t3Ht9cxtryioRUKJbb6MlljHxxYW5O1aG7dH
+AI+rTOjHXFA/wuixFr/ekR7N6NKt+zOpS/mAONRF5NrfjunNCVdLET2YlLrDzrYB
+tJXNzwFEIrBkLxrrotllJCgswTiGzL0OQspSMV5CL/GkU2qDQHuRAceLNsCb5gFO
+ag74nENKVIT2NAHV1HHOqFAr0R/O0AnX3gzYCnxRxnmybctwMSK5PCtqM2Kd4fo1
+Qn9HT8O60jcMx/Gz1DexNm+PHh+QMdxmHW3pNycjmeJna8Y6nFpvble8Z1dYwk7w
+E7weVQpiQTWH5rsZAXJ1
+=rLgz
 -----END PGP SIGNATURE-----

Reply via email to