aboutsummaryrefslogtreecommitdiffstats
path: root/testing/ofono
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2019-04-04 20:31:03 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2019-04-05 08:38:07 +0000
commit0f2ac520abf33d56c7b9550f800902aa5d1765d2 (patch)
treeb9eac16bfa4218428a18d9d2598719e575068f05 /testing/ofono
parent18b35f387b7fbecf49db7219aeab629a75a8dd74 (diff)
testing/ofono: upgrade to 1.28
Diffstat (limited to 'testing/ofono')
-rw-r--r--testing/ofono/APKBUILD12
-rw-r--r--testing/ofono/fix-TEMP_FAILURE_RETRY.patch21
2 files changed, 27 insertions, 6 deletions
diff --git a/testing/ofono/APKBUILD b/testing/ofono/APKBUILD
index 1e7d6732949..bd14820ef54 100644
--- a/testing/ofono/APKBUILD
+++ b/testing/ofono/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=ofono
-pkgver=1.21
+pkgver=1.28
pkgrel=0
pkgdesc="Infrastructure for building mobile telephony (GSM/UMTS) applications"
url="https://01.org/ofono"
@@ -14,8 +14,8 @@ makedepends="glib-dev dbus-dev eudev-dev
options="!check"
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
source="https://www.kernel.org/pub/linux/network/$pkgname/$pkgname-$pkgver.tar.xz
- $pkgname.initd
- 0001-nokia-gpio-do-not-create-links-to-gpios-in-dev-cmt.patch"
+ fix-TEMP_FAILURE_RETRY.patch
+ $pkgname.initd"
builddir="$srcdir"/$pkgname-$pkgver
build() {
@@ -35,6 +35,6 @@ package() {
install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
}
-sha512sums="bbc7fdb1d05294839eee5f31ec345866315a80feac8ccc2a67e0ca2c1030c55e0fb4fd6faee82133c00ec287730a5fd8df0610146a4f6a099e6b90703e621945 ofono-1.21.tar.xz
-8bf14296d15458c930c99b97408fd6fb0d6d3cb9bffd5d85e7500514dc99fffe39a300da24ebc776811fe75e217a5537e358f72c3e8ac5070ec17f36bab086a9 ofono.initd
-a1f66f3f40c1aa4af5f5b66436414408b46f3c90f2a2c88fa12e09ca6a1732334d2f47687478d652a3a176ee93c1905752635246fd01412834565626c021ca64 0001-nokia-gpio-do-not-create-links-to-gpios-in-dev-cmt.patch"
+sha512sums="963471fac89db746d0e99fee805413342203be0d200bc14f0e56c5ec3053e25ea8112943657c88c57c539ae485ac11eb5f80052aad12443c248888f6e6a4114e ofono-1.28.tar.xz
+687a2fd592add40122b789073ab9970d6e966752fdecc4077afe1c1bba705fe541dd0e457094f1d9cde747c571b7810b5b1a30835a3f1869bcd810751d5bf76f fix-TEMP_FAILURE_RETRY.patch
+8bf14296d15458c930c99b97408fd6fb0d6d3cb9bffd5d85e7500514dc99fffe39a300da24ebc776811fe75e217a5537e358f72c3e8ac5070ec17f36bab086a9 ofono.initd"
diff --git a/testing/ofono/fix-TEMP_FAILURE_RETRY.patch b/testing/ofono/fix-TEMP_FAILURE_RETRY.patch
new file mode 100644
index 00000000000..70df8c97026
--- /dev/null
+++ b/testing/ofono/fix-TEMP_FAILURE_RETRY.patch
@@ -0,0 +1,21 @@
+diff --git a/drivers/mbimmodem/mbim.c b/drivers/mbimmodem/mbim.c
+index 54b18ac..5f924ca 100644
+--- a/drivers/mbimmodem/mbim.c
++++ b/drivers/mbimmodem/mbim.c
+@@ -41,6 +41,15 @@
+ #define HEADER_SIZE (sizeof(struct mbim_message_header) + \
+ sizeof(struct mbim_fragment_header))
+
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++ (__extension__ \
++ ({ long int __result; \
++ do __result = (long int) (expression); \
++ while (__result == -1L && errno == EINTR); \
++ __result; }))
++#endif
++
+ const uint8_t mbim_uuid_basic_connect[] = {
+ 0xa2, 0x89, 0xcc, 0x33, 0xbc, 0xbb, 0x8b, 0x4f, 0xb6, 0xb0,
+ 0x13, 0x3e, 0xc2, 0xaa, 0xe6, 0xdf
+