main/open-vm-tools: fix the strerror_r patch

4 files changed, 18 insertions, 17 deletions

diff --git a/main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch b/main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch
index 93d74cfb51..4d3319f08e 100644
--- a/main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch
+++ b/main/open-vm-tools/0012-use-posix-strerror_r-unless-gnu.patch
@@ -1,17 +1,17 @@
-From 2d207751bdc8d5b8d391604c31730909e8e271a4 Mon Sep 17 00:00:00 2001
+From f69bf0fb95f8db126ffcffe5c1a59a955d778a3e Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
 Date: Mon, 2 Jan 2017 14:39:27 +0000
 Subject: [PATCH 12/14] use posix strerror_r unless gnu
 
 ---
- open-vm-tools/lib/err/errPosix.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
+ open-vm-tools/lib/err/errPosix.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/open-vm-tools/lib/err/errPosix.c b/open-vm-tools/lib/err/errPosix.c
-index 37b45237..dd86fe90 100644
+index 37b45237..63ca9dd7 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
+@@ -63,11 +63,13 @@ ErrErrno2String(Err_Number errorNumber, // IN
  {
     char *p;
  
@@ -23,6 +23,7 @@ index 37b45237..dd86fe90 100644
 -#endif
 +   if (strerror_r(errorNumber, buf, bufSize) != 0)
 +      snprintf(buf, bufSize, "unknown error %i", errorNumber);
++   p = buf;
 +#endif /* defined __GLIBC__ */
     ASSERT(p != NULL);
     return p;
diff --git a/main/open-vm-tools/0013-use-off64_t-instead-of-loff_t.patch b/main/open-vm-tools/0013-use-off64_t-instead-of-loff_t.patch
index a91cab7f59..22780bdc1b 100644
--- a/main/open-vm-tools/0013-use-off64_t-instead-of-loff_t.patch
+++ b/main/open-vm-tools/0013-use-off64_t-instead-of-loff_t.patch
@@ -1,4 +1,4 @@
-From 9bb18e00ce3149401fc64555ef1fafbba865b13d Mon Sep 17 00:00:00 2001
+From 2c0e1ca2f797362f567cfde74060fd9a51c4182c Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
 Date: Mon, 2 Jan 2017 15:25:32 +0000
 Subject: [PATCH 13/14] use off64_t instead of loff_t
diff --git a/main/open-vm-tools/0014-remove-references-to-missing-common-agent-etc-config.patch b/main/open-vm-tools/0014-remove-references-to-missing-common-agent-etc-config.patch
index b668b49653..e22f7542ce 100644
--- a/main/open-vm-tools/0014-remove-references-to-missing-common-agent-etc-config.patch
+++ b/main/open-vm-tools/0014-remove-references-to-missing-common-agent-etc-config.patch
@@ -1,4 +1,4 @@
-From 0d38b5006ce9d2006f40a23f916e0b6e14d9b894 Mon Sep 17 00:00:00 2001
+From 7dedcc5ab0119a7812d88472175a0c2a90613424 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
 Date: Mon, 2 Jan 2017 14:40:17 +0000
 Subject: [PATCH 14/14] remove references to missing common-agent/etc/config
diff --git a/main/open-vm-tools/APKBUILD b/main/open-vm-tools/APKBUILD
index 1660b96b0c..37fa68a674 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=0
+pkgrel=1
 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
 url="https://github.com/vmware/open-vm-tools/"
 
@@ -92,9 +92,9 @@ bcf9081bb6274f1ccf9678758a363072  0007-Use-configure-to-test-for-feature-instead
 98018d5ada49d4867f95b73419608c0a  0009-Rename-poll.h-to-vm_poll.h.patch
 72ca616b5e32b174acc100e38faa0967  0010-Add-support-for-building-with-system-libtirpc.patch
 e53951c2c92051e5c438a7ba0843aaae  0011-gnu-ucontext.patch
-e1bf7232bb4fa4105f7e2af01bd06b9e  0012-use-posix-strerror_r-unless-gnu.patch
-7e0d2c35379b9d250991a92c2413f502  0013-use-off64_t-instead-of-loff_t.patch
-0d76b25b4322411bfcb5cba8928e9656  0014-remove-references-to-missing-common-agent-etc-config.patch
+0ce71ad6c2d7a292abccb21cc0b3b679  0012-use-posix-strerror_r-unless-gnu.patch
+d05d991069018fda5fd1b6d9cc7a51e5  0013-use-off64_t-instead-of-loff_t.patch
+abb3bffc30a445cedb8b4855f6cc7ec7  0014-remove-references-to-missing-common-agent-etc-config.patch
 d666cfe7f779f9cb6b5c2260f6c50b54  open-vm-tools.initd"
 sha256sums="2b76d8461022774f2c077b032fbe870f86046f20724eb24824cf9b6ccc4b5355  open-vm-tools-10.1.0.tar.gz
 d64a81213c1db39f92b7f7c381e28d111cd15099464d3856eea8bd7ab916373c  0001-remove-autotools-generated-files.patch
@@ -108,9 +108,9 @@ d14bfbe6e914544ff879f1e0f4ed136c3a3ccc923021cbc21d1514fb8f96b2aa  0004-Do-not-as
 78b807398d710c6dc7506457827e4b721055e798efe067aa5f4713fc21682d48  0009-Rename-poll.h-to-vm_poll.h.patch
 b51c76287154ce42876951f25cf77846231ad520097c66c203a845828f1d77a1  0010-Add-support-for-building-with-system-libtirpc.patch
 98f451d400a90d9fac389f0420a895d764296f1a15ac6e8c4b622afb491d91b6  0011-gnu-ucontext.patch
-970f8156591362ad12fead2b72bbf59533a64be9851286e9232c17def5e382b5  0012-use-posix-strerror_r-unless-gnu.patch
-6ee46c7422414095eb8ae197877c6172296b13018061b2f8dcc7a388ea55fb1c  0013-use-off64_t-instead-of-loff_t.patch
-b5659de12daad578fcd579031e5844d87f05d7bc26c469e4a9d2b303bfee1576  0014-remove-references-to-missing-common-agent-etc-config.patch
+b19397bffce98d06b668ea1dd774f5a6a7f8f8e58ad9e23ad820b50f7824cef9  0012-use-posix-strerror_r-unless-gnu.patch
+aa02fd095d8e82523b6ef00d446534a51a42ffb5f3729f3ab5c75ceb666e21b8  0013-use-off64_t-instead-of-loff_t.patch
+3a37f1f064591949c60ed5127ea96c403db00e9457ddcbb6a8b31f5c7f6d9713  0014-remove-references-to-missing-common-agent-etc-config.patch
 5b824642ecf298136d39bc40ed25b4d62e1a83ecbdc6b3fe428c520c95f65479  open-vm-tools.initd"
 sha512sums="f497b828510ebc2a88788ad5292047f20513c844e889b3f652ecce382efd6d4672560be7387b55dcb7300cfdde5c8eda407836c9b75614c018e058bb169b374d  open-vm-tools-10.1.0.tar.gz
 529d2c43f8a9ab011dd60da6bcbbc09f26c1aed350e1e712ac1a6e9d363010d842e0cc19e5bbcea08a130d33a3916519d8fa7326c3f6aba352820d1a0afff636  0001-remove-autotools-generated-files.patch
@@ -124,7 +124,7 @@ d5347aaba372415688c7d6addf107e15b2c8c57d4817b42c478481a6958b661a4cfa7b35191dbef0
 d2929a7da8b2a6ceee97d573483ed7b7f7e2f2ca9ff3be81882ed67a6504b9f9b26769dac28be3a96e3a960416786f72c7301b5add159553489f7d2ffec6d07f  0009-Rename-poll.h-to-vm_poll.h.patch
 8340b6043b9f69cf8db11711033f5dc45b71b8e16bacf96c5288ab33af25f39cc17a838efeca9302e289da8042d59fb10e4a4855b3725c3d28a678a383f1e62f  0010-Add-support-for-building-with-system-libtirpc.patch
 d0551458fa6a9d9fd3e576f856fb0269e1a40930ab625bd5243a256a90ca89b3a90e7bd97678ca831fbeabd766c993f9a648089afe830ac6299587e7d710d217  0011-gnu-ucontext.patch
-34b64ce228330a611245ad6963416c4cf723adb32e23369f4b8cf258aee99fa0c7708c6934c84ad8d48010e99bbd48258c2c19e2b15a92559026870e673cce80  0012-use-posix-strerror_r-unless-gnu.patch
-08dedccd5a49d6788a3a1930623a43041bfbf21a817ca12d483385d6289b97883a217f47779f827bacb7750b1ffdc914d7ac4191ff43da37123fd7738f5139be  0013-use-off64_t-instead-of-loff_t.patch
-1306e0d0fd6d45203ca245b29667055395c3d19428f70c140a9c37b1b34796d8760cc29cb73a4cd83eaa0d649109ca0045738bce04b4f326a41a514cd54db4ef  0014-remove-references-to-missing-common-agent-etc-config.patch
+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
 c675323a823b3069a281d1b2c1dedccd9d9959e36cffb4763ab72fcf7e828fb1a048a20e005c15a46697a98a61e073bcd778db427a6f77c7b24ac20133f95695  open-vm-tools.initd"