diff options
| -rw-r--r-- | main/powertop/APKBUILD | 8 | ||||
| -rw-r--r-- | main/powertop/strerror_r.patch | 20 |
2 files changed, 3 insertions, 25 deletions
diff --git a/main/powertop/APKBUILD b/main/powertop/APKBUILD index 1f49d9dbe5..d5b90a7da9 100644 --- a/main/powertop/APKBUILD +++ b/main/powertop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Leo <thinkabit.ukim@gmail.com> pkgname=powertop -pkgver=2.10 +pkgver=2.11 pkgrel=0 pkgdesc="Power consumption monitor" url="https://01.org/powertop" @@ -12,7 +12,6 @@ makedepends="linux-headers ncurses-dev pciutils-dev zlib-dev libnl-dev subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/fenrus75/powertop/archive/v$pkgver.tar.gz musl-fix-headers.patch - strerror_r.patch " prepare() { @@ -32,6 +31,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ce7b5c4a5c80596c6a78f1c00c107a13dd3f0d9051c7c44333d18a0f0c050c8e148c8b251d59bd49341f20a6a19eb1f956902e8c57110251e9e4f608e0542357 powertop-2.10.tar.gz -d3bb0e8eaa56fe9ef5aed5d7bea4860be2135fc163ec0c669dc2d01f5ee46ee22ee58cac0835518dc1a4e2939748cf57f2ab37e8d0d879bbc0161d66db7d1919 musl-fix-headers.patch -0c3a67cae24ec675c71160bfb7222f32a01f59105726c6676b1a3c75ab91073782a593ec319d0e87e5391dbf455b900f6c18459f1fd58ac5789e82aa905c1046 strerror_r.patch" +sha512sums="bbe2882196f1b3ae39885d38dd86018576bfac5b5e8f16ea10c7dfd197197d0493ae4ce83c969417a4c4239c41dbcfada989063f14e2943c088a7489e43953b7 powertop-2.11.tar.gz +d3bb0e8eaa56fe9ef5aed5d7bea4860be2135fc163ec0c669dc2d01f5ee46ee22ee58cac0835518dc1a4e2939748cf57f2ab37e8d0d879bbc0161d66db7d1919 musl-fix-headers.patch" diff --git a/main/powertop/strerror_r.patch b/main/powertop/strerror_r.patch deleted file mode 100644 index cf8659e1e3..0000000000 --- a/main/powertop/strerror_r.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- traceevent/event-parse.c.orig -+++ ./traceevent/event-parse.c -@@ -5121,12 +5121,17 @@ - const char *msg; - - if (errnum >= 0) { -+#if defined(__GLIBC__) - msg = strerror_r(errnum, buf, buflen); - if (msg != buf) { - size_t len = strlen(msg); - memcpy(buf, msg, min(buflen - 1, len)); - *(buf + min(buflen - 1, len)) = '\0'; - } -+#else -+ if (strerror_r(errnum, buf, buflen)) -+ snprintf(buf, buflen, "errnum %i", errnum); -+#endif - return 0; - } - |