[Buildroot] [PATCH 1/3] package/openvmtools: configure fix USE_SLASH_PROC

[Buildroot] [PATCH 1/3] package/openvmtools: configure fix USE_SLASH_PROC

[Romain Naour]

Backport a patch from Fedora

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 package/openvmtools/0006-ip_route_config.patch | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/openvmtools/0006-ip_route_config.patch

diff --git a/package/openvmtools/0006-ip_route_config.patch b/package/openvmtools/0006-ip_route_config.patch
new file mode 100644
index 0000000..2396413
--- /dev/null
+++ b/package/openvmtools/0006-ip_route_config.patch
@@ -0,0 +1,27 @@
+Patch from Fedora:
+
+http://pkgs.fedoraproject.org/cgit/open-vm-tools.git/commit/?id=f86513592cdc468f9af24c7ed29daae48e2cd26e
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+
+--- open-vm-tools-9.4.6-1770165/configure.ac.orig	2015-02-03 18:42:39.431466158 -0800
++++ open-vm-tools-9.4.6-1770165/configure.ac	2015-02-03 18:43:15.338468630 -0800
+@@ -1032,7 +1032,7 @@
+ AM_CONDITIONAL(HAVE_GNU_LD, test "$with_gnu_ld" = "yes")
+ AM_CONDITIONAL(HAVE_GTKMM, test "$have_x" = "yes" -a "$with_gtkmm" = "yes")
+ AM_CONDITIONAL(HAVE_PAM, test "$with_pam" = "yes")
+-AM_CONDITIONAL(USE_SLASH_PROC, test "os" = "linux" -a "$have_glib_2_14" = "yes")
++AM_CONDITIONAL(USE_SLASH_PROC, test "$os" = "linux" -a "$have_glib_2_14" = "yes")
+ AM_CONDITIONAL(USE_PRINTF_WRAPPERS, test "$bsdPrintfWrappers" = "yes")
+ 
+ if test "$have_xsm" != "yes"; then
+--- open-vm-tools-9.4.6-1770165/services/plugins/guestInfo/getlib/Makefile.am.orig	2015-02-03 18:48:55.528772952 -0800
++++ open-vm-tools-9.4.6-1770165/services/plugins/guestInfo/getlib/Makefile.am	2015-02-03 18:52:51.597199001 -0800
+@@ -28,4 +28,6 @@
+ libGuestInfo_la_CPPFLAGS += -I$(srcdir)/..
+ 
+ AM_CFLAGS = $(DNET_CPPFLAGS)
+-
++if USE_SLASH_PROC
++AM_CFLAGS += -DUSE_SLASH_PROC
++endif
-- 
1.9.3

[Buildroot] [PATCH 2/3] package/openvmtools: fix syncDriverPosix

[Romain Naour]

Backport a patch from Fedora

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 package/openvmtools/0007-sizeof_argument.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 package/openvmtools/0007-sizeof_argument.patch

diff --git a/package/openvmtools/0007-sizeof_argument.patch b/package/openvmtools/0007-sizeof_argument.patch
new file mode 100644
index 0000000..ec2a3f6
--- /dev/null
+++ b/package/openvmtools/0007-sizeof_argument.patch
@@ -0,0 +1,18 @@
+Patch from Fedora:
+
+http://pkgs.fedoraproject.org/cgit/open-vm-tools.git/commit/sizeof_argument.patch?id=3031fb5279096189aeb50d197b02313c12d701f3
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+
+--- open-vm-tools-9.4.6-1770165.orig/lib/syncDriver/syncDriverPosix.c	2014-07-15 13:42:21.043818478 -0700
++++ open-vm-tools-9.4.6-1770165/lib/syncDriver/syncDriverPosix.c	2014-07-15 13:55:41.724103304 -0700
+@@ -72,8 +72,7 @@
+    size_t i;
+ 
+    for (i = 0; i < ARRAYSIZE(gRemoteFSTypes); i++) {
+-      if (Str_Strncmp(fsType, gRemoteFSTypes[i],
+-                      sizeof gRemoteFSTypes[i]) == 0) {
++      if (Str_Strcmp(gRemoteFSTypes[i], fsType) == 0) {
+          return TRUE;
+       }
+    }
-- 
1.9.3

[Buildroot] [PATCH 2/3] package/openvmtools: fix syncDriverPosix

[Thomas Petazzoni]

Dear Romain Naour,

On Mon,  9 Feb 2015 00:22:09 +0100, Romain Naour wrote:
> Backport a patch from Fedora
> 
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  package/openvmtools/0007-sizeof_argument.patch | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>  create mode 100644 package/openvmtools/0007-sizeof_argument.patch

Applied to master, thanks.

Note that Debian also has a collection of patches on open-vm-tools, and
at least two of them seem to fix security related issues. Is this stuff
still maintained upstream? They have apparently moved their development
to github, at https://github.com/vmware/open-vm-tools.

Can you check if those patches were merged here already?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/3] package/openvmtools: fix syncDriverPosix

[Romain Naour]

Hi Thomas,

Le 14/02/2015 09:20, Thomas Petazzoni a ?crit :
> Dear Romain Naour,
> 
> On Mon,  9 Feb 2015 00:22:09 +0100, Romain Naour wrote:
>> Backport a patch from Fedora
>>
>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>> ---
>>  package/openvmtools/0007-sizeof_argument.patch | 18 ++++++++++++++++++
>>  1 file changed, 18 insertions(+)
>>  create mode 100644 package/openvmtools/0007-sizeof_argument.patch
> 
> Applied to master, thanks.
> 
> Note that Debian also has a collection of patches on open-vm-tools, and
> at least two of them seem to fix security related issues. Is this stuff
> still maintained upstream? They have apparently moved their development
> to github, at https://github.com/vmware/open-vm-tools.
> 

Indeed, I've cloned this repository to check if the Fedora patches were merged.
It seems that it is still maintained, but not on regular basis.

I think the two patches from Debian needs further testing...
Karoly can you review those patches ?

In the meantime, I'll try to have some time next week to test this package with
our VWware image at work.

> Can you check if those patches were merged here already?

Not yet, the last commit has been merged the 28/10/2014.

Best regards,
Romain

> 
> Thanks!
> 
> Thomas
> 

[Buildroot] [PATCH 2/3] package/openvmtools: fix syncDriverPosix

[Károly Kasza]

Hi Romain, Thomas, list,


> > Note that Debian also has a collection of patches on open-vm-tools, and
> > at least two of them seem to fix security related issues. Is this stuff
> > still maintained upstream? They have apparently moved their development
> > to github, at https://github.com/vmware/open-vm-tools.
>
> Indeed, I've cloned this repository to check if the Fedora patches were
> merged.
> It seems that it is still maintained, but not on regular basis.
>
> I think the two patches from Debian needs further testing...
> Karoly can you review those patches ?
>
>
Of course, I'll add those to my (sadly ever growing) to-do list. Hopefully
I can do it sometime this week.
I promised a new Inetutils revision too to Thomas, but it is only half done
yet.

Kind regards
Karoly
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150215/d876859f/attachment.html>

[Buildroot] [PATCH 2/3] package/openvmtools: fix syncDriverPosix

[Thomas Petazzoni]

Dear K?roly Kasza,

On Sun, 15 Feb 2015 21:55:04 +0100, K?roly Kasza wrote:

> Of course, I'll add those to my (sadly ever growing) to-do list. Hopefully
> I can do it sometime this week.

No problem!

> I promised a new Inetutils revision too to Thomas, but it is only half done
> yet.

Great, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/3] package/openvmtools: fix syncDriverPosix

[Romain Naour]

Hi Karoly, Thomas, all,

Le 15/02/2015 21:55, K?roly Kasza a ?crit :
> Hi Romain, Thomas, list,
> 
> 
>     > Note that Debian also has a collection of patches on open-vm-tools, and
>     > at least two of them seem to fix security related issues. Is this stuff
>     > still maintained upstream? They have apparently moved their development
>     > to github, at https://github.com/vmware/open-vm-tools.
> 
>     Indeed, I've cloned this repository to check if the Fedora patches were merged.
>     It seems that it is still maintained, but not on regular basis.
> 
>     I think the two patches from Debian needs further testing...
>     Karoly can you review those patches ?
> 
> 
> Of course, I'll add those to my (sadly ever growing) to-do list. Hopefully I can
> do it sometime this week.
> I promised a new Inetutils revision too to Thomas, but it is only half done yet.

Great :)

On my side, I completed the open-vm-tools package to be able to build and
install the open-vm-tools's kernel module. I have successfully tested the
vmhgfs.ko module by sharing a folder between the host and the guest.

I'm using a 3.2 kernel but the build is broken for recent kernel (I tried with a
3.14 kernel)

I applied most of the patches from debian, fedora and archlinux but I need
further testing.

Best regards,
Romain

> Kind regards
> Karoly
> 
>  

[Buildroot] [PATCH 3/3] package/openmvtools: don't use host library path

[Romain Naour]

Set CUSTOM_PROCPS_LIBS to -L$(STAGING_DIR) otherwise -L/lib is
used by default.

Fixes:
http://autobuild.buildroot.net/results/bff/bff7d8f3ec19ce790f0c88a336d1007e1ff29836/build-end.log

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 package/openvmtools/openvmtools.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk
index 7aa04af..42cda82 100644
--- a/package/openvmtools/openvmtools.mk
+++ b/package/openvmtools/openvmtools.mk
@@ -22,7 +22,8 @@ OPENVMTOOLS_DEPENDENCIES += libfuse
 endif
 
 ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PROCPS),y)
-OPENVMTOOLS_CONF_ENV += CUSTOM_PROCPS_NAME=procps
+OPENVMTOOLS_CONF_ENV += CUSTOM_PROCPS_NAME=procps \
+	CUSTOM_PROCPS_LIBS="-L$(STAGING_DIR)"
 OPENVMTOOLS_CONF_OPTS += --with-procps
 OPENVMTOOLS_DEPENDENCIES += procps-ng
 else
-- 
1.9.3

[Buildroot] [PATCH 3/3] package/openmvtools: don't use host library path

[Thomas Petazzoni]

Dear Romain Naour,

On Mon,  9 Feb 2015 00:22:10 +0100, Romain Naour wrote:

>  ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PROCPS),y)
> -OPENVMTOOLS_CONF_ENV += CUSTOM_PROCPS_NAME=procps
> +OPENVMTOOLS_CONF_ENV += CUSTOM_PROCPS_NAME=procps \
> +	CUSTOM_PROCPS_LIBS="-L$(STAGING_DIR)"

This is wrong, because $(STAGING_DIR) does not contain libraries. It
should either be -L$(STAGING_DIR)/usr/lib and/or
-L$(STAGING_DIR)/usr/lib. And also, please add a comment above this to
explain why we are passing this explicitly (it should normally not be
needed).

I've marked this patch as Changes Requested in patchwork.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/3] package/openmvtools: don't use host library path

[Thomas Petazzoni]

Dear Romain Naour,

On Mon,  9 Feb 2015 00:22:10 +0100, Romain Naour wrote:

> +OPENVMTOOLS_CONF_ENV += CUSTOM_PROCPS_NAME=procps \
> +	CUSTOM_PROCPS_LIBS="-L$(STAGING_DIR)"

Have you tried:

	CUSTOM_PROCPS_LIBS=" "

 ?

We're already using this trick in the openvmtools package for the
libdnet detection.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/3] package/openmvtools: don't use host library path

[Romain Naour]

Hi Thomas,

Le 14/02/2015 09:23, Thomas Petazzoni a ?crit :
> Dear Romain Naour,
> 
> On Mon,  9 Feb 2015 00:22:10 +0100, Romain Naour wrote:
> 
>> +OPENVMTOOLS_CONF_ENV += CUSTOM_PROCPS_NAME=procps \
>> +	CUSTOM_PROCPS_LIBS="-L$(STAGING_DIR)"
> 
> Have you tried:
> 
> 	CUSTOM_PROCPS_LIBS=" "
> 
>  ?
> 
> We're already using this trick in the openvmtools package for the
> libdnet detection.
> 

My intention was to help the configure script to find libprocps.so in
STAGING_DIR/lib. I forgot to add the "/lib"...

But, you're right.
Using CUSTOM_PROCPS_LIBS=" " is enough.

I'll respin shortly.

Best regards,
Romain

> Thomas
> 

[Buildroot] [PATCH 1/3] package/openvmtools: configure fix USE_SLASH_PROC

[Thomas Petazzoni]

Dear Romain Naour,

On Mon,  9 Feb 2015 00:22:08 +0100, Romain Naour wrote:
> Backport a patch from Fedora
> 
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  package/openvmtools/0006-ip_route_config.patch | 27 ++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
>  create mode 100644 package/openvmtools/0006-ip_route_config.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com