Browse code

Updating open-vm-tools

Change-Id: Ie372466016588586870dcc59d7e49d29c02b8bcb
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2100
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Kumar Kaushik authored on 2017/03/04 11:16:26
Showing 3 changed files
... ...
@@ -1,6 +1,6 @@
1
-diff -ru open-vm-tools-stable-10.1.0/open-vm-tools/libDeployPkg/linuxDeployment.c open-vm-tools-stable-10.1.0-modified/open-vm-tools/libDeployPkg/linuxDeployment.c
2
-+++ open-vm-tools-stable-10.1.0-modified/open-vm-tools/libDeployPkg/linuxDeployment.c	2016-11-18 12:36:48.544140958 -0800
1
+diff -ru open-vm-tools-stable-10.1.5/open-vm-tools/libDeployPkg/linuxDeployment.c open-vm-tools-stable-10.1.5-modified/open-vm-tools/libDeployPkg/linuxDeployment.c
2
+--- open-vm-tools-stable-10.1.5/open-vm-tools/libDeployPkg/linuxDeployment.c	2017-02-24 14:15:37.000000000 -0800
3 3
 @@ -558,13 +558,17 @@
4 4
     close(fd);
5 5
  
6 6
deleted file mode 100644
... ...
@@ -1,12 +0,0 @@
1
-diff -ru open-vm-tools-10.1.0/open-vm-tools/vgauth/service/Makefile.in open-vm-tools-10.1.0-mod/open-vm-tools/vgauth/service/Makefile.in
2
-+++ open-vm-tools-10.1.0-mod/open-vm-tools/vgauth/service/Makefile.in	2016-11-18 17:30:36.047647904 -0800
3
-@@ -367,7 +367,7 @@
4
- 	-I$(top_srcdir)/vgauth/serviceImpl
5
- VGAuthService_LDADD = @GLIB2_LIBS@ @GTHREAD_LIBS@ $(am__append_5) \
6
- 	$(am__append_6) @SSL_LIBS@ -lssl -lcrypto $(am__append_7)
7
--@HAVE_ICU_FALSE@VGAuthService_LINK = $(LINK)
8
-+@HAVE_ICU_FALSE@VGAuthService_LINK = $(CXXLINK)
9
- @HAVE_ICU_TRUE@VGAuthService_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS)     \
10
- @HAVE_ICU_TRUE@                            $(LIBTOOLFLAGS) --mode=link $(CXX)       \
11
- @HAVE_ICU_TRUE@                            $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
... ...
@@ -1,23 +1,22 @@
1 1
 Summary:        Usermode tools for VmWare virts
2 2
 Name:           open-vm-tools
3
-Version:        10.1.0
4
-Release:        2%{?dist}
3
+Version:        10.1.5
4
+Release:        1%{?dist}
5 5
 License:        LGPLv2+
6 6
 URL:            https://github.com/vmware/open-vm-tools
7 7
 Group:          Applications/System
8 8
 Vendor:         VMware, Inc.
9 9
 Distribution:   Photon
10
-Source0:        https://github.com/vmware/open-vm-tools/archive/%{name}-%{version}.tar.gz
11
-%define sha1 open-vm-tools=6deb5ff09b7033cd4224580e664a608e6b4d1db2
10
+Source0:        https://github.com/vmware/open-vm-tools/archive/%{name}-stable-%{version}.tar.gz
11
+%define sha1 open-vm-tools=9672874e8b785de27d7fda57bf791f900546c18f
12 12
 Source1:        gosc-scripts-1.0.tar.gz
13 13
 %define sha1 gosc-scripts-1.0=5031dd9b3b0569a40d2ee0caaa55a1cbf782345e
14 14
 Source2:        vmtoolsd.service
15 15
 Source3:        vgauthd.service
16
-Patch0:         open-vm-tools-service-link.patch
17
-Patch1:         GOSC-libDeploy.patch
18
-Patch2:         IPv6Support.patch
19
-Patch3:         hostnameReCustomizationFix.patch
20
-Patch4:         PureIPv6-hosts.patch
16
+Patch0:         GOSC-libDeploy.patch
17
+Patch1:         IPv6Support.patch
18
+Patch2:         hostnameReCustomizationFix.patch
19
+Patch3:         PureIPv6-hosts.patch
21 20
 BuildRequires:  glib-devel
22 21
 BuildRequires:  xerces-c-devel
23 22
 BuildRequires:  xml-security-c-devel
... ...
@@ -39,13 +38,12 @@ Requires:       systemd
39 39
 %description
40 40
 VmWare virtualization user mode tools
41 41
 %prep
42
-%setup -q -n open-vm-tools
43
-%setup -a 1 -n open-vm-tools
42
+%setup -q -n %{name}-stable-%{version}/%{name}
43
+%setup -a 1 -n %{name}-stable-%{version}/%{name}
44 44
 %patch0 -p2
45
-%patch1 -p2
45
+%patch1 -p0
46 46
 %patch2 -p0
47 47
 %patch3 -p0
48
-%patch4 -p0
49 48
 %build
50 49
 touch ChangeLog
51 50
 autoreconf -i
... ...
@@ -103,6 +101,8 @@ fi
103 103
 
104 104
 
105 105
 %changelog
106
+*   Fri Mar 03 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-1
107
+-   Updating version to 10.1.5
106 108
 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 10.1.0-2
107 109
 -   BuildRequires Linux-PAM-devel
108 110
 *   Mon Nov 21 2016 Kumar Kaushik <kaushikk@vmware.com> 10.1.0-1