Accepting request 534282 from Virtualization:VMware

1

OBS-URL: https://build.opensuse.org/request/show/534282
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-vm-tools?expand=0&rev=74

fix_discards_qualifiers_warning.patch

@@ -0,0 +1,23 @@
+This patch is required in SLES11 environments which will report the following
+error during compilation:
+
+ cert_key.c: In function 'LoadOpenSSLConf':
+ cert_key.c:264: error: passing argument 1 of 'ASN1_STRING_set_default_mask_asc'
+   discards qualifiers from pointer target type
+
+In order to avoid the warning, mask must be passed as a char to 
+ ASN1_STRING_set_default_mask_asc.
+
+Index: open-vm-tools-10.1.15-6677369/guestproxycerttool/cert_key.c
+===================================================================
+--- open-vm-tools-10.1.15-6677369.orig/guestproxycerttool/cert_key.c
++++ open-vm-tools-10.1.15-6677369/guestproxycerttool/cert_key.c
+@@ -261,7 +261,7 @@ LoadOpenSSLConf(const gchar *fname)
+ 
+    mask = NCONF_get_string(config, "req", "string_mask");
+    if (mask) {
+-      ASN1_STRING_set_default_mask_asc(mask);
++      ASN1_STRING_set_default_mask_asc((char*)mask);
+    }
+ 
+    ret = TRUE;

open-vm-tools-10.1.10-6082533.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4632d815996e7f2c283818b0d84b0c4cf2fb82a0897d77aee0f8cbcdc5678c61
-size 5111726

open-vm-tools-10.1.15-6677369.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc9479faa90b1051b772ad2260db06da06769b8b8f5f2121cf861048f4e70f31
+size 5153995

open-vm-tools.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Oct 13 17:05:56 UTC 2017 - mlatimer@suse.com
+
+- Build deploypackage plugin for SLES11 (bsc#1062837)
+- Enable building with ssl capabilities for SLES11.
+  +fix_discards_qualifiers_warning.patch 
+
+-------------------------------------------------------------------
+Fri Oct  6 17:08:18 UTC 2017 - mlatimer@suse.com
+
+- Update to 10.1.15 stable release
+  + Tools Hgfs Plugin: refresh Hgfs drives on client start
+  + Report version data via guestinfo vars
+  + Add entries for MacOS 10.13 (High Sierra) to guest_os_tables.h
+
 -------------------------------------------------------------------
 Mon Aug 21 16:01:33 UTC 2017 - mlatimer@suse.com
 

open-vm-tools.spec

@@ -17,13 +17,11 @@
 #
 
 
-# systemd and deploypkg should be enabled by default on versions >= 13.1
+# systemd should be enabled by default on versions >= 13.1
 %if 0%{?suse_version} >= 1310
 %bcond_without systemd
-%bcond_without deploypkg
 %else
 %bcond_with systemd
-%bcond_with deploypkg
 %endif
 
 # vgauth is enabled for openSUSE Factory, Leap 42.1, SLES12SP1 and later releases (which include xml-security-c and xerces-c)
@@ -73,8 +71,8 @@
 Name:           open-vm-tools
 %define subname open-vm-tools
 %define tarname open-vm-tools
-%define bldnum  6082533
+%define bldnum  6677369
-Version:        10.1.10
+Version:        10.1.15
 Release:        0
 Summary:        Open Virtual Machine Tools
 License:        BSD-3-Clause and GPL-2.0 and LGPL-2.1
@@ -144,6 +142,7 @@ Requires(pre):  %insserv_prereq
 ExclusiveArch:  %ix86 x86_64
 Patch0:         Report-SLES12-SAP-guest-OS-as-SLES12.patch
 Patch1:         resolutionKMS-wayland.patch
+Patch2:         fix_discards_qualifiers_warning.patch
 
 %if %{with systemd}
 %systemd_requires
@@ -213,14 +212,15 @@ if you intend to create own plugins for vmtoolsd.
 sed -i -e "s/\r//" README
 %patch0 -p2
 %patch1 -p1
+%if 0%{?suse_version} < 1310
+%patch2 -p1
+%endif
 
 %build
 # disable warning unused-but-set-variable which will raise error because of -Werror
 # disable warning deprecated-declarations which will raise error because of -Werror
 # disable warning sizeof-pointer-memaccess which will raise error because of -Werror
 # (this is because of 'g_static_mutex_init' usage which is now deprecated)
-# disable deploypkg due to old versions of libmspack not providing pkgconfig
-# disable ssl due to 'discards qualifiers' error in SLES11
 %if 0%{?suse_version} > 1110
 export CFLAGS="%{optflags} -Wno-unused-local-typedefs -Wno-unused-but-set-variable -Wno-deprecated-declarations -Wno-sizeof-pointer-memaccess -Wno-cpp -fPIE"
 export CXXFLAGS="%{optflags} -Wno-unused-local-typedefs -Wno-unused-but-set-variable -Wno-deprecated-declarations -Wno-sizeof-pointer-memaccess -Wno-cpp -fPIE"
@@ -241,10 +241,6 @@ chmod 755 configure
 %if 0%{?suse_version} < 1230
     --without-procps \
 %endif
-%if ! %{with deploypkg}
-    --disable-deploypkg \
-    --without-ssl \
-%endif
 %if %{with_X}
     --with-x \
 %else
@@ -439,15 +435,18 @@ rm -rf %{buildroot}
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/plugins/common
 %dir %{_libdir}/%{name}/plugins/vmsvc
+%{_libdir}/%{name}/plugins/vmsvc/libdeployPkgPlugin.so
+%{_libdir}/%{name}/plugins/vmsvc/libgrabbitmqProxy.so
 %{_libdir}/%{name}/plugins/vmsvc/libguestInfo.so
 %{_libdir}/%{name}/plugins/vmsvc/libpowerOps.so
+%{_libdir}/%{name}/plugins/vmsvc/libresolutionKMS.so
 %{_libdir}/%{name}/plugins/vmsvc/libtimeSync.so
 %{_libdir}/%{name}/plugins/vmsvc/libvmbackup.so
-%{_libdir}/%{name}/plugins/vmsvc/libresolutionKMS.so
 %{_libdir}/%{name}/plugins/common/libhgfsServer.so
 %{_libdir}/%{name}/plugins/common/libvix.so
 %{_bindir}/vmhgfs-fuse
 %{_bindir}/vmware-checkvm
+%{_bindir}/vmware-guestproxycerttool
 %{_bindir}/vmware-hgfsclient
 %{_bindir}/vmware-namespace-cmd
 %{_bindir}/vmware-rpctool
@@ -457,6 +456,7 @@ rm -rf %{buildroot}
 %{_sbindir}/mount.vmhgfs
 /sbin/mount.vmhgfs
 %config(noreplace) %{_sysconfdir}/pam.d/vmtoolsd
+%config(noreplace) %{_sysconfdir}/vmware-tools/guestproxy-ssl.conf
 %dir %{_sysconfdir}/vmware-tools
 %dir %{_sysconfdir}/vmware-tools/scripts
 %dir %{_sysconfdir}/vmware-tools/scripts/vmware
@@ -472,12 +472,6 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/modprobe.d
 %config %{_sysconfdir}/modprobe.d/50-vmnics.conf
 %endif
-%if %{with deploypkg}
-%{_bindir}/vmware-guestproxycerttool
-%{_libdir}/%{name}/plugins/vmsvc/libdeployPkgPlugin.so
-%{_libdir}/%{name}/plugins/vmsvc/libgrabbitmqProxy.so
-%config(noreplace) %{_sysconfdir}/vmware-tools/guestproxy-ssl.conf
-%endif
 %if %{with vgauth}
 %dir %{_var}/lib/vmware
 %{_bindir}/VGAuthService
@@ -521,9 +515,7 @@ rm -rf %{buildroot}
 %{_libdir}/libvmtools.so.*
 %{_libdir}/libguestlib.so.*
 %{_libdir}/libhgfs.so.*
-%if %{with deploypkg}
 %{_libdir}/libDeployPkg.so.*
-%endif
 %if %{with vgauth}
 %{_libdir}/libvgauth.so.*
 %endif
@@ -534,9 +526,7 @@ rm -rf %{buildroot}
 %{_includedir}/vmGuestLib
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/vmguestlib.pc
-%if %{with deploypkg}
 %{_includedir}/libDeployPkg
 %{_libdir}/pkgconfig/libDeployPkg.pc
-%endif
 
 %changelog