diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-02 10:54:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-02 10:58:01 +0000 |
| commit | 8b24ae012866fd3053cba0b4aba7b71a1841d7c4 (patch) | |
| tree | f06c70e575effceb9e5bca6e600550551d0ef5d7 /main/open-vm-tools | |
| parent | ba20953a906db5514978336bde85b401ce3cd039 (diff) | |
| download | aports-8b24ae012866fd3053cba0b4aba7b71a1841d7c4.tar.bz2 aports-8b24ae012866fd3053cba0b4aba7b71a1841d7c4.tar.xz | |
main/open-vm-tools: fix segfault in error reporting
ref #5487
Diffstat (limited to 'main/open-vm-tools')
| -rw-r--r-- | main/open-vm-tools/APKBUILD | 6 | ||||
| -rw-r--r-- | main/open-vm-tools/strerror_r.patch | 20 |
2 files changed, 25 insertions, 1 deletions
diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD index 00845e8e88..e82da955f8 100644 --- a/main/open-vm-tools/APKBUILD +++ b/main/open-vm-tools/APKBUILD @@ -3,7 +3,7 @@ pkgname=open-vm-tools pkgver=10.0.7 _pkgsubver=${pkgver#*_p} _ver=${pkgver/_p/-} -pkgrel=5 +pkgrel=6 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." url="https://github.com/vmware/open-vm-tools/" @@ -29,6 +29,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/vmware/open-vm-tools/archive 0009-Rename-poll.h-to-vm_poll.h.patch 0010-Add-support-for-building-with-system-libtirpc.patch 0011-gnu-ucontext.patch + strerror_r.patch open-vm-tools.initd " @@ -88,6 +89,7 @@ b102e760b68521f95068956e2324207c 0004-Use-configure-test-for-struct-timespec.pa 3a92d0642f43ef6343a3525ed2b521d1 0009-Rename-poll.h-to-vm_poll.h.patch 87bfbfc96d0f7ff25f224af23eafc666 0010-Add-support-for-building-with-system-libtirpc.patch 657f988c96f1b8edf082fbf70e5172e8 0011-gnu-ucontext.patch +b7c1f9fd477def4f921b8e5a66aaa28d strerror_r.patch d666cfe7f779f9cb6b5c2260f6c50b54 open-vm-tools.initd" sha256sums="87d76dc3affd39dccfae80c7210ac89e8f14cb493a651709780f67b1b5a92ec8 open-vm-tools-10.0.7.tar.gz d33a60fd3ec63d677d13997ba811e901fa4096a5b883ffae6669dd3ce91ccf5e 0001-lib-misc-Recognize-Alpine-Linux.patch @@ -101,6 +103,7 @@ d4b2edf7be206dde75ca778599918bd6e01f148b12fe5f8a0a90b49dfd98eaf5 0004-Use-confi f080c651e75e9315c5b698646a7faf46a6af835189f49f045e3f1a930d5f621c 0009-Rename-poll.h-to-vm_poll.h.patch 58d062fb1fc148700dac17b2681cb4967ada5a1caac43fbb249f13258d93be37 0010-Add-support-for-building-with-system-libtirpc.patch 6359cf80de58e9d3988e3ebcbc8140e9074dac6cba9d73b6d3bfc1ce871ac5a5 0011-gnu-ucontext.patch +1258e4f953c2e9e013cb00c7ca99f0c9f44c3711c5b58d3018d73ec4b0765161 strerror_r.patch 5b824642ecf298136d39bc40ed25b4d62e1a83ecbdc6b3fe428c520c95f65479 open-vm-tools.initd" sha512sums="d91fcc9a30ba6fbe34ea8440106ef3d9c0b9bf04e5c40a787179735f534f93a1aaff43fb3b91fe33377b00b84f07b2dc91d7129cf0bbf82774b04a19a531223f open-vm-tools-10.0.7.tar.gz 87ab7df83f512cf5f1ff6bf68546bd3d72a82e7f60f35ce795db6d6105b1178c85dada2beaddd32f870b81e6af4bf907b3a6fca241b33fdee53864bbeb5863ce 0001-lib-misc-Recognize-Alpine-Linux.patch @@ -114,4 +117,5 @@ db9251502ca05cc3ddb111ee192300897615c30b1e17a9a1f62266bba687b7216d9a4d824b9ff618 b873864da2073e57cc7e1dad6b48200ad0b931d9448a60273e55bb2d44cb34c2eb6b1a2346c1708791e0add81a70d487966f2270a2bdf163cdfa37d38a2c0926 0009-Rename-poll.h-to-vm_poll.h.patch d2acbc98b79e0a41545443c1195807034b37083a6e7160d74af1173acd6a2d6e14a8e5f909bd17db80c0c93e1d8f34d7278902bd272b672dae412e7cb504517e 0010-Add-support-for-building-with-system-libtirpc.patch 09bb960aff0bcc94df9782b1c5b81db34f8f720421dfed36d80158e877813214871a525ef9c0df78f6072dcd2d2b97734496e9c2a4c4e783d81e3d2f457b3920 0011-gnu-ucontext.patch +b7881e886ffd24a4b2bc85cd9695217a4cabf311fe6e79abb6b2386da0d22a2cb4378829ab3b82c5916ef58b92006776851db4d18a42f72b2df2049539e36c84 strerror_r.patch c675323a823b3069a281d1b2c1dedccd9d9959e36cffb4763ab72fcf7e828fb1a048a20e005c15a46697a98a61e073bcd778db427a6f77c7b24ac20133f95695 open-vm-tools.initd" diff --git a/main/open-vm-tools/strerror_r.patch b/main/open-vm-tools/strerror_r.patch new file mode 100644 index 0000000000..0aea2fc6f5 --- /dev/null +++ b/main/open-vm-tools/strerror_r.patch @@ -0,0 +1,20 @@ +diff --git a/open-vm-tools/lib/err/errPosix.c b/open-vm-tools/lib/err/errPosix.c +index 5091f64..294cdd6 100644 +--- a/open-vm-tools/lib/err/errPosix.c ++++ b/open-vm-tools/lib/err/errPosix.c +@@ -63,11 +63,12 @@ ErrErrno2String(Err_Number errorNumber, // IN + { + char *p; + +-#if defined(linux) && !defined(N_PLAT_NLM) && !defined(__ANDROID__) ++#if defined(__GLIBC__) + p = strerror_r(errorNumber, buf, bufSize); + #else +- p = strerror(errorNumber); +-#endif ++ if (strerror_r(errorNumber, buf, bufSize) != 0) ++ snprintf(buf, bufSize, "unknown error %i", errorNumber); ++#endif /* defined __GLIBC__ */ + ASSERT(p != NULL); + return p; + } |