Browse code
Added upstream patch to open-vm-tools package
Divya Thaluru authored on 2015/05/16 05:28:03Showing 3 changed files
- SPECS/open-vm-tools/open-vm-tools-glibc-fixes.patch
- SPECS/open-vm-tools/open-vm-tools-strerror_r-fix.patch
- SPECS/open-vm-tools/open-vm-tools.spec
| 1 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,18 +0,0 @@ |
| 1 |
-+++ open-vm-tools-9.10.0/vgauth/common/VGAuthLog_modified.c 2015-04-09 14:51:14.404456241 -0700 |
|
| 2 |
-@@ -205,15 +205,9 @@ |
|
| 3 |
- g_vsnprintf(buf, sizeof buf, fmt, args); |
|
| 4 |
- buf[sizeof buf - 1] = '\0'; |
|
| 5 |
- |
|
| 6 |
--#ifdef sun |
|
| 7 |
- strerror_r(code, errMsg, sizeof errMsg); |
|
| 8 |
- g_warning("[function %s, file %s, line %d], %s, [errno = %d], %s\n",
|
|
| 9 |
- func, file, line, buf, code, errMsg); |
|
| 10 |
--#else |
|
| 11 |
-- g_warning("[function %s, file %s, line %d], %s, [errno = %d], %s\n",
|
|
| 12 |
-- func, file, line, buf, code, |
|
| 13 |
-- strerror_r(code, errMsg, sizeof errMsg)); |
|
| 14 |
--#endif |
|
| 15 |
- } |
|
| 16 |
- |
|
| 17 |
- #endif |
| 18 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,24 @@ |
| 0 |
+--- open-vm-tools-9.10.0-2476743.orig/configure.ac 2015-03-19 15:53:25.000000000 -0700 |
|
| 1 |
+@@ -1041,6 +1041,7 @@ |
|
| 2 |
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500" |
|
| 3 |
+ CPPFLAGS="$CPPFLAGS -D_BSD_SOURCE" |
|
| 4 |
+ CPPFLAGS="$CPPFLAGS -D_SVID_SOURCE" |
|
| 5 |
++ CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE" |
|
| 6 |
+ |
|
| 7 |
+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lrt" |
|
| 8 |
+ |
|
| 9 |
+--- open-vm-tools-9.10.0-2476743.orig/vgauth/common/VGAuthLog.c 2015-03-19 15:53:25.000000000 -0700 |
|
| 10 |
+@@ -25,6 +25,11 @@ |
|
| 11 |
+ #ifdef _WIN32 |
|
| 12 |
+ #include <windows.h> |
|
| 13 |
+ #else |
|
| 14 |
++/* |
|
| 15 |
++ * Need GNU definition of strerror_r for better compatibility |
|
| 16 |
++ * across different glibc versions. |
|
| 17 |
++ */ |
|
| 18 |
++#define _GNU_SOURCE |
|
| 19 |
+ #include <errno.h> |
|
| 20 |
+ #include <unistd.h> |
|
| 21 |
+ #include <string.h> |
| ... | ... |
@@ -1,14 +1,14 @@ |
| 1 | 1 |
Summary: Usermode tools for VmWare virts |
| 2 | 2 |
Name: open-vm-tools |
| 3 | 3 |
Version: 9.10.0 |
| 4 |
-Release: 1 |
|
| 4 |
+Release: 2 |
|
| 5 | 5 |
License: LGPLv2+ |
| 6 | 6 |
URL: https://github.com/vmware/open-vm-tools/archive/stable-9.10.x.zip |
| 7 | 7 |
Group: Applications/System |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-9.10.0/%{name}-%{version}.tar.gz
|
| 11 |
-Patch0: open-vm-tools-glibc-fixes.patch |
|
| 11 |
+Patch0: open-vm-tools-strerror_r-fix.patch |
|
| 12 | 12 |
Patch1: open-vm-tools-service-link.patch |
| 13 | 13 |
BuildRequires: glib-devel |
| 14 | 14 |
BuildRequires: xerces-c-devel |
| ... | ... |
@@ -31,8 +31,7 @@ VmWare virtualization user mode tools |
| 31 | 31 |
%patch0 -p1 |
| 32 | 32 |
%patch1 -p1 |
| 33 | 33 |
%build |
| 34 |
-export CFLAGS="$RPM_OPT_FLAGS -Wno-unused-local-typedefs -Wno-deprecated-declarations -D_DEFAULT_SOURCE" |
|
| 35 |
-export CXXFLAGS="$RPM_OPT_FLAGS -Wno-unused-local-typedefs -Wno-deprecated-declarations -D_DEFAULT_SOURCE" |
|
| 34 |
+autoreconf -i |
|
| 36 | 35 |
./configure --prefix=/usr --without-x --without-kernel-modules --without-icu --disable-static |
| 37 | 36 |
make %{?_smp_mflags}
|
| 38 | 37 |
%install |
| ... | ... |
@@ -78,5 +77,7 @@ rm -f %{buildroot}/sbin/mount.vmhgfs
|
| 78 | 78 |
%{_sbindir}/*
|
| 79 | 79 |
|
| 80 | 80 |
%changelog |
| 81 |
+* Tue Apr 21 2015 Divya Thaluru <dthaluru@vmware.com> 9.10.0-2 |
|
| 82 |
+ Added open-vm-tools-stderr_r-fix upstream patch and removed glibc patch. |
|
| 81 | 83 |
* Thu Nov 06 2014 Sharath George <sharathg@vmware.com> 9.10.0-1 |
| 82 | 84 |
Initial version |