From 014a93f6802a6aad8e30587b8df621f3091175f5 Mon Sep 17 00:00:00 2001 From: clayton craft Date: Thu, 5 Oct 2017 20:28:46 +0000 Subject: [PATCH] [ofono] update to 1.21 (#705) This release (1.21) includes 3 patches upstreamed earlier. The 4th patch didn't make the cutoff, but has just been merged so it'll be in 1.22 --- main/ofono/0001-udevng-detect-non-usb.patch | 29 --------------- .../0002-udevng-remove-unneeded-prop.patch | 10 ------ .../0003-isimodem-fix-sim-state-resp-cb.patch | 36 ------------------- main/ofono/APKBUILD | 12 ++----- 4 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 main/ofono/0001-udevng-detect-non-usb.patch delete mode 100644 main/ofono/0002-udevng-remove-unneeded-prop.patch delete mode 100644 main/ofono/0003-isimodem-fix-sim-state-resp-cb.patch diff --git a/main/ofono/0001-udevng-detect-non-usb.patch b/main/ofono/0001-udevng-detect-non-usb.patch deleted file mode 100644 index 80ac13050..000000000 --- a/main/ofono/0001-udevng-detect-non-usb.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/plugins/udevng.c -+++ b/plugins/udevng.c -@@ -1325,7 +1325,7 @@ static void add_serial_device(struct udev_device *dev) - - devnode = udev_device_get_devnode(dev); - -- if (!syspath || !devname || !devpath || !devnode) -+ if (!syspath || !devpath) - return; - - modem = g_hash_table_lookup(modem_list, syspath); -@@ -1337,7 +1337,7 @@ static void add_serial_device(struct udev_device *dev) - modem->type = MODEM_TYPE_SERIAL; - modem->syspath = g_strdup(syspath); - modem->devname = g_strdup(devname); -- modem->driver = g_strdup("legacy"); -+ modem->driver = g_strdup(driver); - - g_hash_table_replace(modem_list, modem->syspath, modem); - } -@@ -1357,7 +1357,7 @@ static void add_serial_device(struct udev_device *dev) - info->subsystem = g_strdup(subsystem); - info->dev = udev_device_ref(dev); - -- modem->devices = g_slist_append(modem->devices, info); -+ modem->serial = info; - } - - static void add_device(const char *syspath, const char *devname, diff --git a/main/ofono/0002-udevng-remove-unneeded-prop.patch b/main/ofono/0002-udevng-remove-unneeded-prop.patch deleted file mode 100644 index 8ad69fe8c..000000000 --- a/main/ofono/0002-udevng-remove-unneeded-prop.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/plugins/udevng.c -+++ b/plugins/udevng.c -@@ -1013,8 +1013,6 @@ static gboolean setup_isi_serial(struct modem_info* modem) - if (value) - ofono_modem_set_integer(modem->modem, "Address", atoi(value)); - -- ofono_modem_set_string(modem->modem, "Device", info->devnode); -- - return TRUE; - } diff --git a/main/ofono/0003-isimodem-fix-sim-state-resp-cb.patch b/main/ofono/0003-isimodem-fix-sim-state-resp-cb.patch deleted file mode 100644 index 2334a46bb..000000000 --- a/main/ofono/0003-isimodem-fix-sim-state-resp-cb.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/drivers/isimodem/sim.c -+++ b/drivers/isimodem/sim.c -@@ -646,8 +646,31 @@ error: - /* ISI callback: PIN state (enabled/disabled) query */ - static void sec_code_state_resp_cb(const GIsiMessage *msg, void *opaque) - { -- check_sec_response(msg, opaque, SEC_CODE_STATE_OK_RESP, -- SEC_CODE_STATE_FAIL_RESP); -+ struct isi_cb_data *cbd = opaque; -+ ofono_query_facility_lock_cb_t cb = cbd->cb; -+ int locked; -+ uint8_t state; -+ uint8_t status; -+ -+ if (!g_isi_msg_data_get_byte(msg, 0, &state) || -+ !g_isi_msg_data_get_byte(msg, 1, &status)) -+ goto error; -+ -+ if (state != SEC_CODE_STATE_OK_RESP) -+ goto error; -+ -+ if (status == SEC_CODE_ENABLE) -+ locked = 1; -+ else if (status == SEC_CODE_DISABLE) -+ locked = 0; -+ else -+ goto error; -+ -+ CALLBACK_WITH_SUCCESS(cb, locked, cbd->data); -+ return; -+ -+error: -+ CALLBACK_WITH_FAILURE(cb, -1, cbd->data); - } - - static void isi_query_locked(struct ofono_sim *sim, diff --git a/main/ofono/APKBUILD b/main/ofono/APKBUILD index 1acf76497..ace7d3bc1 100644 --- a/main/ofono/APKBUILD +++ b/main/ofono/APKBUILD @@ -1,6 +1,6 @@ pkgname=ofono -pkgver=1.20 -pkgrel=2 +pkgver=1.21 +pkgrel=0 pkgdesc="Infrastructure for building mobile telephony (GSM/UMTS) applications" url="https://01.org/ofono" arch="all" @@ -13,9 +13,6 @@ options="!check" subpackages="$pkgname-dev $pkgname-doc" source="https://www.kernel.org/pub/linux/network/$pkgname/$pkgname-$pkgver.tar.xz $pkgname.initd - 0001-udevng-detect-non-usb.patch - 0002-udevng-remove-unneeded-prop.patch - 0003-isimodem-fix-sim-state-resp-cb.patch 0004-nokia-gpio-do-not-create-links-to-gpios-in-dev-cmt.patch" builddir="$srcdir"/$pkgname-$pkgver @@ -36,9 +33,6 @@ package() { install -Dm644 "$srcdir/$pkgname-${pkgver}/plugins/ofono.rules" "$pkgdir/usr/lib/udev/rules.d/60-ofono.rules" } -sha512sums="8dc86654ae8a1dc1761c95df5f0de55566db20012e523f11bcd5ab5e1540f4cd9fc7bd6bf1665dcbeb31f2925f9322c21fd05fb00034e408b5d85b265e2fe840 ofono-1.20.tar.xz +sha512sums="bbc7fdb1d05294839eee5f31ec345866315a80feac8ccc2a67e0ca2c1030c55e0fb4fd6faee82133c00ec287730a5fd8df0610146a4f6a099e6b90703e621945 ofono-1.21.tar.xz 7f17143545e1a229254b34da76a449d2c1dea238ee988d606de1a12a54fe691cd946f73e446ae786624abbcdc539338334c1d3b0d1e49fdd8ba8ba6aa51b15ff ofono.initd -a10f60e0b3b026fcd8e8bba9282c84c7b04f97621c23cdd92a8474cd0d7cd958e4e49433c454dd478b6aaf2b5b0fc5e3d8b1b87ebfef23430acdee408b76e959 0001-udevng-detect-non-usb.patch -ec8b24be9ad5db6ad3a29fb17bcc4ecd0cfc2e41131973ad03037bc5dbd3202504f6b26531f78252d99c24c816a24940dbed1a28347c1361a874eebb1fc91979 0002-udevng-remove-unneeded-prop.patch -18e9be5324babc08a986d56eb896b5bec8c35a37a0ad40c5812f226507f50379da89e469fc7cc0328be8fe49f37fc40ea0b61d053c25e469631538afeb1589cc 0003-isimodem-fix-sim-state-resp-cb.patch a1f66f3f40c1aa4af5f5b66436414408b46f3c90f2a2c88fa12e09ca6a1732334d2f47687478d652a3a176ee93c1905752635246fd01412834565626c021ca64 0004-nokia-gpio-do-not-create-links-to-gpios-in-dev-cmt.patch"