testing/ofono: upgrade to 1.29, removed unused patch

3 files changed, 20 insertions, 106 deletions

diff --git a/testing/ofono/0001-nokia-gpio-do-not-create-links-to-gpios-in-dev-cmt.patch b/testing/ofono/0001-nokia-gpio-do-not-create-links-to-gpios-in-dev-cmt.patch
deleted file mode 100644
index 83c1b64caa..0000000000
--- a/testing/ofono/0001-nokia-gpio-do-not-create-links-to-gpios-in-dev-cmt.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 20642bfed99dac5559f88743c3043f33fa3e7796 Mon Sep 17 00:00:00 2001
-From: Clayton Craft <clayton@craftyguy.net>
-Date: Tue, 26 Sep 2017 19:42:11 -0700
-Subject: [PATCH] nokia-gpio: do not create links to gpios in /dev/cmt
-
-The nokia-gpio plugin should not try to create symlinks to relevant gpio
-pins under /dev/cmt, since the location it is looking is no longer
-correct on newer kernels and it might change again in the future. This
-patch removes code from nokia-gpio that tries to create a symlink.
-
-Users will now need to symlink the modem gpios to /dev/cmt themselves.
-On the 4.13 kernel, this can be done by, for example, adding a udev rule
-to:
- # ln -sf /sys/bus/hsi/devices/n900-modem /dev/cmt
----
- plugins/nokia-gpio.c | 67 ++++------------------------------------------------
- 1 file changed, 4 insertions(+), 63 deletions(-)
-
-diff --git a/plugins/nokia-gpio.c b/plugins/nokia-gpio.c
-index 7a93106c..1d014337 100644
---- a/plugins/nokia-gpio.c
-+++ b/plugins/nokia-gpio.c
-@@ -632,74 +632,15 @@ static void phonet_status_cb(GIsiModem *idx, enum GIsiPhonetLinkState state,
- 
- static int gpio_probe_links(void)
- {
--	char const *gpiodir = "/sys/class/gpio";
- 	char const *cmtdir = "/dev/cmt";
--	DIR *gpio;
--	struct dirent *d;
- 
--	if (file_exists(cmtdir)) {
--		DBG("Using %s", cmtdir);
--		return 0;
--	}
--
--	DBG("Using %s: trying to make links to %s", gpiodir, cmtdir);
--
--	if (!dir_exists(cmtdir)) {
--		if (mkdir(cmtdir, 0755) == -1) {
--			DBG("%s: %s", cmtdir, strerror(errno));
--			return -(errno = ENODEV);
--		}
--	}
--
--	gpio = opendir(gpiodir);
--	if (gpio == NULL) {
--		DBG("%s: %s", "gpiodir", strerror(errno));
-+	if (!file_exists(cmtdir)) {
-+		DBG("%s: %s", cmtdir, strerror(errno));
- 		return -(errno = ENODEV);
- 	}
- 
--	while ((d = readdir(gpio)) != NULL) {
--		char nn[PATH_MAX], name[PATH_MAX], from[PATH_MAX], to[PATH_MAX];
--		FILE *nf;
--		size_t len;
--
--		snprintf(nn, sizeof nn, "%s/%s/name", gpiodir, d->d_name);
--
--		nf = fopen(nn, "rb");
--		if (nf == NULL) {
--			DBG("%s: %s", nn, strerror(errno));
--			continue;
--		}
--
--		len = fread(name, sizeof name, 1, nf);
--
--		if (ferror(nf)) {
--			DBG("read from %s: %s", nn, strerror(errno));
--			fclose(nf);
--			continue;
--		}
--
--		fclose(nf);
--
--		if (len < 4)
--			continue;
--
--		name[--len] = '\0';
--
--		if (strncmp(name, "cmt_", 4))
--			continue;
--
--		snprintf(from, sizeof from, "%s/%s", gpiodir, d->d_name);
--		snprintf(to, sizeof to, "%s/%s", cmtdir, name);
--
--		if (symlink(from, to) == -1)
--			DBG("%s: %s", to, strerror(errno));
--	}
--
--	DBG("%s: %s", "/sys/class/gpio", strerror(errno));
--
--	(void) closedir(gpio);
--
--	return -(errno = ENODEV);
-+	DBG("Using %s", cmtdir);
-+	return 0;
- }
- 
- 
--- 
-2.14.1
-
diff --git a/testing/ofono/APKBUILD b/testing/ofono/APKBUILD
index bd14820ef5..a2add78449 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.28
+pkgver=1.29
 pkgrel=0
 pkgdesc="Infrastructure for building mobile telephony (GSM/UMTS) applications"
 url="https://01.org/ofono"
@@ -14,6 +14,7 @@ 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
+	fix-explicit-bzero.patch
 	fix-TEMP_FAILURE_RETRY.patch
 	$pkgname.initd"
 builddir="$srcdir"/$pkgname-$pkgver
@@ -35,6 +36,7 @@ package() {
 	install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
 }
 
-sha512sums="963471fac89db746d0e99fee805413342203be0d200bc14f0e56c5ec3053e25ea8112943657c88c57c539ae485ac11eb5f80052aad12443c248888f6e6a4114e  ofono-1.28.tar.xz
+sha512sums="14c3cd3a7ee134dd85f286e3ce47914a10c48a9a2bbbebd0d2715334f233a9b7e4e01bae5a151e4f4b3fb3e98eab96ba345f3fb2c2960d2f9c0645f36c218a99  ofono-1.29.tar.xz
+7367464a8983969c9a78c1e4f8759a17eb47f6c61c94b088d749c83bb7ef5d19e037cadedd7ef5d34a0fdfe837fa8059e963f4fb2b14148e4a80f00e7cb29286  fix-explicit-bzero.patch
 687a2fd592add40122b789073ab9970d6e966752fdecc4077afe1c1bba705fe541dd0e457094f1d9cde747c571b7810b5b1a30835a3f1869bcd810751d5bf76f  fix-TEMP_FAILURE_RETRY.patch
 8bf14296d15458c930c99b97408fd6fb0d6d3cb9bffd5d85e7500514dc99fffe39a300da24ebc776811fe75e217a5537e358f72c3e8ac5070ec17f36bab086a9  ofono.initd"
diff --git a/testing/ofono/fix-explicit-bzero.patch b/testing/ofono/fix-explicit-bzero.patch
new file mode 100644
index 0000000000..855fa6ba76
--- /dev/null
+++ b/testing/ofono/fix-explicit-bzero.patch
@@ -0,0 +1,16 @@
+diff --git a/ell/missing.h b/ell/missing.h
+index 37d5586..649a5ac 100644
+--- a/ell/missing.h
++++ b/ell/missing.h
+@@ -54,11 +54,3 @@
+ #    define __NR_getrandom 0xffffffff
+ #  endif
+ #endif
+-
+-#ifndef HAVE_EXPLICIT_BZERO
+-static inline void explicit_bzero(void *s, size_t n)
+-{
+-	memset(s, 0, n);
+-	__asm__ __volatile__ ("" : : "r"(s) : "memory");
+-}
+-#endif