projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b5e1b51)
package/openvmtools: bump version to 10.3.5
authorPeter Korsgaard <peter@korsgaard.com>
Thu, 17 Jan 2019 19:13:22 +0000 (20:13 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Thu, 17 Jan 2019 22:12:31 +0000 (23:12 +0100)
Fixes build against glibc 2.28: closes #11546
http://autobuild.buildroot.net/results/f2c/f2c73480b5a1060bb17ac260ef82c3e641fad085/
http://autobuild.buildroot.net/results/e21/e219b8bacb52bb661eb6663b82f549ed941f26fe/

Use released tarball rather than github helper.  The tarball does not
contain the open-vm-tools sub directory, so adjust the paths in the patches
to match and drop OPENVMTOOLS_SUBDIR.

Drop 0001-has_bsd_printf.patch: msgList.c has been removed upstream since:
https://github.com/vmware/open-vm-tools/commit/dc81979e78e1b8f42639aeb7aaec69f7ea49eb79

Drop 0004-uclibc_secure_getenv.sh: uClibc-ng provides secure_getenv() since
1.0.22.

Renumber remaining patches.

Add hash for license file.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/openvmtools/0001-has_bsd_printf.patch [deleted file] patch | blob | history
package/openvmtools/0001-no_cflags_werror.patch [new file with mode: 0644] patch | blob
package/openvmtools/0002-dont-force-cppflags.patch [new file with mode: 0644] patch | blob
package/openvmtools/0002-no_cflags_werror.patch [deleted file] patch | blob | history
package/openvmtools/0003-dont-force-cppflags.patch [deleted file] patch | blob | history
package/openvmtools/0004-uclibc_secure_getenv.patch [deleted file] patch | blob | history
package/openvmtools/openvmtools.hash patch | blob | history
package/openvmtools/openvmtools.mk patch | blob | history

diff --git a/package/openvmtools/0001-has_bsd_printf.patch b/package/openvmtools/0001-has_bsd_printf.patch
deleted file mode 100644 (file)
index df23f00..0000000
--- a/package/openvmtools/0001-has_bsd_printf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-lib/misc/msgList.c: missing #ifdef
-
-This macro checks for BSD style printf(), which is not present
-when compiling for uClibc. The linked functions are unnecessary in
-this case, and they break compilation.
-
-Signed-off-by: Karoly Kasza <kaszak@gmail.com>
-
---- openvmtools-stable-9.10.0.orig/open-vm-tools/lib/misc/msgList.c    2015-06-17 10:01:00.000000000 +0200
-+++ openvmtools-stable-9.10.0/open-vm-tools/lib/misc/msgList.c         2015-06-17 10:01:00.000000000 +0200
-@@ -487,6 +487,7 @@
-    return messages->id;
- }
- 
-+#ifdef HAS_BSD_PRINTF
- 
- /*
-  *----------------------------------------------------------------------
-@@ -566,6 +567,7 @@
-    }
- }
- 
-+#endif
- 
- /*
-  *----------------------------------------------------------------------
diff --git a/package/openvmtools/0001-no_cflags_werror.patch b/package/openvmtools/0001-no_cflags_werror.patch
new file mode 100644 (file)
index 0000000..3378cb8
--- /dev/null
+++ b/package/openvmtools/0001-no_cflags_werror.patch
@@ -0,0 +1,18 @@
+configure.ac: disable -Werror
+
+Disable the mandatory flag -Werror in configure.ac.
+
+Signed-off-by: Karoly Kasza <kaszak@gmail.com>
+
+--- open-vm-tools/configure.ac 2015-06-17 10:02:00.000000000 +0200
++++ open-vm-tools/configure.ac 2015-06-17 10:02:00.000000000 +0200
+@@ -935,7 +935,7 @@
+ 
+ ### General flags / actions
+ CFLAGS="$CFLAGS -Wall"
+-CFLAGS="$CFLAGS -Werror"
++# CFLAGS="$CFLAGS -Werror"
+ 
+ # -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident'
+ # in Xlib.h on OpenSolaris.
+
diff --git a/package/openvmtools/0002-dont-force-cppflags.patch b/package/openvmtools/0002-dont-force-cppflags.patch
new file mode 100644 (file)
index 0000000..eb2fe16
--- /dev/null
+++ b/package/openvmtools/0002-dont-force-cppflags.patch
@@ -0,0 +1,21 @@
+m4: do not force -I/usr/include in CPPFLAGS
+
+This is so horribly broken for cross-compilation. :-(
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+--- open-vm-tools/m4/vmtools.m4        2015-06-17 10:03:00.000000000 +0200
++++ open-vm-tools/m4/vmtools.m4        2015-06-17 10:03:00.000000000 +0200
+@@ -281,10 +281,10 @@
+       if test "$os" = freebsd; then
+          CUSTOM_$1_CPPFLAGS="-I/usr/local/include"
+       else
+-         CUSTOM_$1_CPPFLAGS="-I/usr/include"
++         CUSTOM_$1_CPPFLAGS=" "
+       fi
+       if test -n "$2"; then
+-         CUSTOM_$1_CPPFLAGS="${CUSTOM_$1_CPPFLAGS}/$2"
++         : CUSTOM_$1_CPPFLAGS="${CUSTOM_$1_CPPFLAGS}/$2"
+       fi
+    fi
+ ])
diff --git a/package/openvmtools/0002-no_cflags_werror.patch b/package/openvmtools/0002-no_cflags_werror.patch
deleted file mode 100644 (file)
index 1621574..0000000
--- a/package/openvmtools/0002-no_cflags_werror.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-configure.ac: disable -Werror
-
-Disable the mandatory flag -Werror in configure.ac.
-
-Signed-off-by: Karoly Kasza <kaszak@gmail.com>
-
---- openvmtools-stable-9.10.0.orig/open-vm-tools/configure.ac  2015-06-17 10:02:00.000000000 +0200
-+++ openvmtools-stable-9.10.0/open-vm-tools/configure.ac       2015-06-17 10:02:00.000000000 +0200
-@@ -935,7 +935,7 @@
- 
- ### General flags / actions
- CFLAGS="$CFLAGS -Wall"
--CFLAGS="$CFLAGS -Werror"
-+# CFLAGS="$CFLAGS -Werror"
- 
- # -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident'
- # in Xlib.h on OpenSolaris.
-
diff --git a/package/openvmtools/0003-dont-force-cppflags.patch b/package/openvmtools/0003-dont-force-cppflags.patch
deleted file mode 100644 (file)
index c8fa6b1..0000000
--- a/package/openvmtools/0003-dont-force-cppflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-m4: do not force -I/usr/include in CPPFLAGS
-
-This is so horribly broken for cross-compilation. :-(
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
---- openvmtools-stable-9.10.0.orig/open-vm-tools/m4/vmtools.m4 2015-06-17 10:03:00.000000000 +0200
-+++ openvmtools-stable-9.10.0/open-vm-tools/m4/vmtools.m4      2015-06-17 10:03:00.000000000 +0200
-@@ -281,10 +281,10 @@
-       if test "$os" = freebsd; then
-          CUSTOM_$1_CPPFLAGS="-I/usr/local/include"
-       else
--         CUSTOM_$1_CPPFLAGS="-I/usr/include"
-+         CUSTOM_$1_CPPFLAGS=" "
-       fi
-       if test -n "$2"; then
--         CUSTOM_$1_CPPFLAGS="${CUSTOM_$1_CPPFLAGS}/$2"
-+         : CUSTOM_$1_CPPFLAGS="${CUSTOM_$1_CPPFLAGS}/$2"
-       fi
-    fi
- ])
diff --git a/package/openvmtools/0004-uclibc_secure_getenv.patch b/package/openvmtools/0004-uclibc_secure_getenv.patch
deleted file mode 100644 (file)
index 6fb9ebd..0000000
--- a/package/openvmtools/0004-uclibc_secure_getenv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-lib/misc/idLinux.c: add uClibc support
-
-uClibc does not have a secure_getenv function, so we use the
-Android method.
-
-Signed-off-by: Karoly Kasza <kaszak@gmail.com>
-
---- openvmtools-stable-9.10.0.orig/open-vm-tools/lib/misc/idLinux.c    2015-06-17 10:04:00.000000000 +0200
-+++ openvmtools-stable-9.10.0/open-vm-tools/lib/misc/idLinux.c         2015-06-17 10:04:00.000000000 +0200
-@@ -997,7 +997,7 @@
- static Bool
- IdIsSetUGid(void)
- {
--#if defined(__ANDROID__)
-+#if defined(__ANDROID__) || defined(__UCLIBC__)
-    /* Android does not have a secure_getenv, so be conservative. */
-    return TRUE;
- #else
diff --git a/package/openvmtools/openvmtools.hash b/package/openvmtools/openvmtools.hash
index bf344e506bcb96976dbd49ef06e4cfeda3309916..bd81d1f05c976cc89918992650a58c145f1e22ca 100644 (file)
--- a/package/openvmtools/openvmtools.hash
+++ b/package/openvmtools/openvmtools.hash
@@ -1,2 +1,3 @@
 # locally computed
-sha256  ff384ab0c11e19db0fd6ddab60e8ae48a4591b141fb3a8e8f1d4e1a489dd293f  openvmtools-5a9033ddfa95786d867e4d02bbb9a29bac8fb64f.tar.gz
+sha256  364cd0fdfa5a05e872d08609659e6231ec99788669f7ebba24bfb8c94168daef  open-vm-tools-10.3.5-10430147.tar.gz
+sha256  f734933bd7d49aef25aaf897ed7281ee822e8635056e69b895a7d2e668937fc5  COPYING
diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk
index 9501ef33612a826980df867aa3af57110cb78bfe..0dc2956d02589508b3887d65959179304d85689e 100644 (file)
--- a/package/openvmtools/openvmtools.mk
+++ b/package/openvmtools/openvmtools.mk
@@ -4,13 +4,14 @@
 #
 ################################################################################
 
-OPENVMTOOLS_VERSION = 5a9033ddfa95786d867e4d02bbb9a29bac8fb64f
-OPENVMTOOLS_SITE = $(call github,vmware,open-vm-tools,$(OPENVMTOOLS_VERSION))
-OPENVMTOOLS_SUBDIR = open-vm-tools
+OPENVMTOOLS_VERSION_MAJOR = 10.3.5
+OPENVMTOOLS_VERSION = $(OPENVMTOOLS_VERSION_MAJOR)-10430147
+OPENVMTOOLS_SITE = https://github.com/vmware/open-vm-tools/releases/download/stable-$(OPENVMTOOLS_VERSION_MAJOR)
+OPENVMTOOLS_SOURCE = open-vm-tools-$(OPENVMTOOLS_VERSION).tar.gz
 OPENVMTOOLS_LICENSE = LGPL-2.1
-OPENVMTOOLS_LICENSE_FILES = $(OPENVMTOOLS_SUBDIR)/COPYING
+OPENVMTOOLS_LICENSE_FILES = COPYING
 
-# Autoreconf needed or config/missing will run configure again at buildtime
+# configure.ac is patched
 OPENVMTOOLS_AUTORECONF = YES
 OPENVMTOOLS_CONF_OPTS = --with-dnet \
        --without-icu --without-x --without-gtk2 \