diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-05 19:24:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-05 19:47:07 +0000 |
| commit | 26e7a7c6ff609fe93d72fa6da71cfaac5e720d01 (patch) | |
| tree | 51653688f64594e53b474284904556e88e38d365 | |
| parent | eae2154208ce1ccb5fce909ec671767ff1a510d1 (diff) | |
| download | aports-26e7a7c6ff609fe93d72fa6da71cfaac5e720d01.tar.bz2 aports-26e7a7c6ff609fe93d72fa6da71cfaac5e720d01.tar.xz | |
main/open-vm-tools: fix another strerror_r issue
possibly related ref #6997
| -rw-r--r-- | main/open-vm-tools/APKBUILD | 4 | ||||
| -rw-r--r-- | main/open-vm-tools/strerror_r.patch | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD index 154ad2071d..79e00db788 100644 --- a/main/open-vm-tools/APKBUILD +++ b/main/open-vm-tools/APKBUILD @@ -3,7 +3,7 @@ pkgname=open-vm-tools pkgver=10.1.0 _pkgsubver=${pkgver#*_p} _ver=${pkgver/_p/-} -pkgrel=6 +pkgrel=7 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools." url="https://github.com/vmware/open-vm-tools/" arch="x86 x86_64" @@ -31,6 +31,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/vmware/$pkgname/archive/stab 0012-use-posix-strerror_r-unless-gnu.patch 0013-use-off64_t-instead-of-loff_t.patch 0014-remove-references-to-missing-common-agent-etc-config.patch + strerror_r.patch $pkgname.initd $pkgname.confd @@ -123,6 +124,7 @@ d0551458fa6a9d9fd3e576f856fb0269e1a40930ab625bd5243a256a90ca89b3a90e7bd97678ca83 4d55f8bc31afe70831992b70e600a47078026d0f00215ef8284a97859d05167d33e23c2512bc17827b396cab070e2a200ae667d4dc918fef98c059559575e822 0012-use-posix-strerror_r-unless-gnu.patch af109a9aab9da5f312e1f06a4db318f577a5bbb22a8974892a9a1f6941865fea663694362dd8ffb0d8cbe776f3297458bec1004131b3e92b8da003506087df39 0013-use-off64_t-instead-of-loff_t.patch d30c74e2de1ae729fb0eec9f510c89b9c5180478b3ace625dd7a0b3fa3fd269ddbdcf802c6c014e39da794b36891beed2f5b85e7c6a0179ec0723ee6be390782 0014-remove-references-to-missing-common-agent-etc-config.patch +5507a58198179805e4c924b6bd6ac8b026bd602c9e5e4c52213dadf6c8880a23a16ee49a4dfe2db27515c2a36009e609dd81b7ee0d560bbea1ddf6a5324eb7ac strerror_r.patch d4d0c0c3042eef4d241c933de6f7c398a88275744b3576efc2f909acd681752f548e4ae4a17eca7db731ee0b9254b46169a48463d12a72ec6354065d788159f4 open-vm-tools.initd ffc9c945a41e48791bab61ba72fed96c1a6ae3722caa715424e3077d167421b4e2f53bb4d415ab227d1f6e40d6ca3779df41e6b0a38db34b520979fa2b19298d open-vm-tools.confd 5626c68b8ee01ece804f314b829476280e892581a448c27092e32a60b04d40ecfa8e8eca464c4376c3cfc497eb60406798b7383d1a747a173d3cd8b78d23100b open-vm-tools.logrotate" diff --git a/main/open-vm-tools/strerror_r.patch b/main/open-vm-tools/strerror_r.patch new file mode 100644 index 0000000000..1d3554d0fd --- /dev/null +++ b/main/open-vm-tools/strerror_r.patch @@ -0,0 +1,13 @@ +diff --git a/open-vm-tools/vgauth/common/VGAuthLog.c b/open-vm-tools/vgauth/common/VGAuthLog.c +index fb4261e..1b29536 100644 +--- a/open-vm-tools/vgauth/common/VGAuthLog.c ++++ b/open-vm-tools/vgauth/common/VGAuthLog.c +@@ -210,7 +210,7 @@ LogErrorPosixCodeV(int code, + g_vsnprintf(buf, sizeof buf, fmt, args); + buf[sizeof buf - 1] = '\0'; + +-#ifdef sun ++#if !defined(__GLIBC__) + strerror_r(code, errMsg, sizeof errMsg); + g_warning("[function %s, file %s, line %d], %s, [errno = %d], %s\n", + func, file, line, buf, code, errMsg); |