From 75f6e99adfa8d2e0fc0d4989bb7b3a86c2c32855fa4792c21bed49f48d2bf63c Mon Sep 17 00:00:00 2001 From: Mike Latimer Date: Wed, 15 Aug 2018 15:08:57 +0000 Subject: [PATCH] Accepting request 629299 from home:kallan:branches:Virtualization:VMware - Remove vgauthd.service from the %pre and %post section in the spec file. This allows vmtoolsd.service to enable vgauthd if needed which creates the vmtoolsd.service.requires/vgauthd.service symlink. (bsc#1103868) - Add Requires: libxmlsec1-openssl1 to the spec file. This is needed when using xmlsec1 rather than xml-ssecurity-c. - Update to 10.3.0 (build 8931395) + Starting with 10.3.0, open-vm-tools builds with xmlsec1 by default (instead of building with xml-security). To revert to the old behavior and build with xml-security, use the option '--enable-xmlsecurity' for the ./configure command. + Add BuildRequires: libxml2-devel + Add BuildRequires: pkgconfig(xmlsec1) for all openSUSE builds + Use --enable-xmlsecurity when building for SLE - Drop unnecessary patches - 100-libtirpc.patch OBS-URL: https://build.opensuse.org/request/show/629299 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=359 --- 100-libtirpc.patch | 560 ---------------------------- open-vm-tools-10.2.5-8068406.tar.gz | 3 - open-vm-tools-10.3.0-8931395.tar.gz | 3 + open-vm-tools.changes | 25 ++ open-vm-tools.spec | 51 +-- 5 files changed, 57 insertions(+), 585 deletions(-) delete mode 100644 100-libtirpc.patch delete mode 100644 open-vm-tools-10.2.5-8068406.tar.gz create mode 100644 open-vm-tools-10.3.0-8931395.tar.gz diff --git a/100-libtirpc.patch b/100-libtirpc.patch deleted file mode 100644 index 4a6e0a5..0000000 --- a/100-libtirpc.patch +++ /dev/null @@ -1,560 +0,0 @@ -commit 375d4463c68be3a133e4377655b68cc090cd9511 -Author: Oliver Kurth -Date: Thu May 17 16:58:49 2018 -0700 - - open-vm-tools: build with tirpc - - Newer distros (Fedora, OpenSuSE Tumblweed) no longer ship rpcgen with glibc, - so we need to build with libtirpc (see - https://bugzilla.redhat.com/show_bug.cgi?id=1531540 and - https://bugzilla.suse.com/show_bug.cgi?id=1089181). With this change, - configure will check for the presence of libtirpc and if found, sets - flags to build with it. configure will also exit with an error if - rpcgen is not found. - -diff --git open-vm-tools-10.2.5-8068406.org/configure.ac open-vm-tools-10.2.5-8068406/configure.ac -index b283ebe8..bc6e87a7 100644 ---- open-vm-tools-10.2.5-8068406.org/configure.ac -+++ open-vm-tools-10.2.5-8068406/configure.ac -@@ -586,6 +586,11 @@ AC_ARG_WITH([xml2], - [enable_vgauth=no], - [with_xml2=yes]) - -+AC_ARG_WITH([tirpc], -+ [AS_HELP_STRING([--without-tirpc], -+ [compiles with/without libtirpc.])], -+ [], -+ [with_tirpc=auto]) - - # Make sure we are building with openssl 1.0.1 and above so that - # we use only TLSv1_2. -@@ -1066,10 +1071,74 @@ if test "$enable_caf" = "yes"; then - - fi - -+if test "$with_tirpc" != "no"; then -+ AC_VMW_CHECK_LIB([libtirpc], -+ [TIRPC], -+ [libtirpc], -+ [], -+ [], -+ [], -+ [], -+ [have_tirpc="yes"], -+ [have_tirpc="no"]) -+fi -+ -+if test "$with_tirpc" != "yes"; then -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+ #include -+ #include -+ -+ int main() -+ { -+ struct xdr_ops xdr; -+#if defined(__GLIBC__) -+ xdr.x_putint32(NULL, NULL); -+#endif -+ return 0; -+ } -+ ]])], [need_tirpc="no"], [need_tirpc="yes"]) -+ AC_MSG_NOTICE([tirpc is needed: $need_tirpc]) -+fi -+ -+if test "$with_tirpc" = "no"; then -+ if test "$need_tirpc" = "yes"; then -+ AC_MSG_ERROR([libtirpc is required but it is disabled.]) -+ fi -+ use_tirpc="no" -+elif test "$with_tirpc" = "auto"; then -+ if test "$need_tirpc" = "yes" -a "$have_tirpc" = "no"; then -+ AC_MSG_ERROR([cannot find libtirpc but it is required.]) -+ fi -+ use_tirpc=$need_tirpc -+elif test "$with_tirpc" = "yes"; then -+ if test "$have_tirpc" = "no"; then -+ AC_MSG_ERROR([cannot build with libtirpc because it cannot be found.]) -+ fi -+ use_tirpc="yes" -+fi -+ -+XDR_LIBS= -+XDR_CPPFLAGS= -+if test "$use_tirpc" = "yes"; then -+ AC_MSG_NOTICE([building with libtirpc]) -+ XDR_LIBS="$TIRPC_LIBS" -+ XDR_CPPFLAGS="-DUSE_TIRPC $TIRPC_CPPFLAGS" -+else -+ AC_MSG_NOTICE([building without libtirpc]) -+ # In Solaris, the XDR-related functions are not in libc like in Linux and -+ # FreeBSD, so binaries need to be linked to some extra libraries. -+ if test "$os" = "solaris"; then -+ XDR_LIBS="-lnsl -lrpcsvc" -+ fi -+fi -+ - AC_PATH_PROG( - [RPCGEN], - [rpcgen], -- [ AC_MSG_ERROR([rpcgen not found. Please install the libc devel package.]) ]) -+ [not_found]) -+if test "$RPCGEN" == "not_found"; then -+ AC_MSG_ERROR([rpcgen not found.]) -+fi - - ### - ### Headers -@@ -1389,7 +1458,6 @@ AM_CONDITIONAL(HAVE_XSM, test "$have_xsm" = "yes") - AM_CONDITIONAL(HAVE_XCOMPOSITE, test "$have_xcomposite" = "yes") - AM_CONDITIONAL(ENABLE_TESTS, test "$have_cunit" = "yes") - AM_CONDITIONAL(WITH_ROOT_PRIVILEGES, test "$with_root_privileges" = "yes") --AM_CONDITIONAL(HAVE_DNET, test "$have_dnet" = "yes") - AM_CONDITIONAL(HAVE_DOXYGEN, test "$have_doxygen" = "yes") - AM_CONDITIONAL(HAVE_FUSE, test "$have_fuse" = "yes") - AM_CONDITIONAL(HAVE_GNU_LD, test "$with_gnu_ld" = "yes") -@@ -1447,13 +1515,6 @@ VMTOOLS_CPPFLAGS="-DVMTOOLS_USE_GLIB $GLIB2_CPPFLAGS" - PLUGIN_CPPFLAGS="$VMTOOLS_CPPFLAGS $PLUGIN_CPPFLAGS" - PLUGIN_LDFLAGS="-Wl,-z,defs -Wl,-lc -shared -module -avoid-version" - --# In Solaris, the XDR-related functions are not in libc like in Linux and --# FreeBSD, so binaries need to be linked to some extra libraries. --XDR_LIBS= --if test "$os" = "solaris"; then -- XDR_LIBS="-lnsl -lrpcsvc" --fi -- - # Installation directories for core services plugins. - TEST_PLUGIN_INSTALLDIR=$datadir/open-vm-tools/tests - COMMON_PLUGIN_INSTALLDIR=$libdir/open-vm-tools/plugins/common -@@ -1493,6 +1554,7 @@ AC_SUBST([VMTOOLS_CPPFLAGS]) - AC_SUBST([VMTOOLS_LIBS]) - AC_SUBST([RPCGENFLAGS]) - AC_SUBST([XDR_LIBS]) -+AC_SUBST([XDR_CPPFLAGS]) - AC_SUBST([TEST_PLUGIN_INSTALLDIR]) - AC_SUBST([COMMON_PLUGIN_INSTALLDIR]) - AC_SUBST([VMSVC_PLUGIN_INSTALLDIR]) -diff --git open-vm-tools-10.2.5-8068406.org/lib/dynxdr/Makefile.am open-vm-tools-10.2.5-8068406/lib/dynxdr/Makefile.am -index 841c17db..058606fe 100644 ---- open-vm-tools-10.2.5-8068406.org/lib/dynxdr/Makefile.am -+++ open-vm-tools-10.2.5-8068406/lib/dynxdr/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2008-2016 VMware, Inc. All rights reserved. -+### Copyright (C) 2008-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -17,7 +17,13 @@ - - noinst_LTLIBRARIES = libDynxdr.la - --libDynxdr_la_SOURCES = -+libDynxdr_la_SOURCES = - libDynxdr_la_SOURCES += dynxdr.c - libDynxdr_la_SOURCES += xdrutil.c - -+libDynxdr_la_CPPFLAGS = -+libDynxdr_la_CPPFLAGS += @XDR_CPPFLAGS@ -+ -+libDynxdr_la_LIBADD = -+libDynxdr_la_LIBADD += @XDR_LIBS@ -+ -diff --git open-vm-tools-10.2.5-8068406.org/lib/dynxdr/dynxdr.c open-vm-tools-10.2.5-8068406/lib/dynxdr/dynxdr.c -index 95fdc7e2..bd42c751 100644 ---- open-vm-tools-10.2.5-8068406.org/lib/dynxdr/dynxdr.c -+++ open-vm-tools-10.2.5-8068406/lib/dynxdr/dynxdr.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2008-2017 VMware, Inc. All rights reserved. -+ * Copyright (C) 2008-2018 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -55,7 +55,7 @@ typedef struct DynXdrData { - * Mac OS X, FreeBSD and Solaris don't take a const parameter to the - * "x_getpostn" function. - */ --#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) -+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(USE_TIRPC) - # define DYNXDR_GETPOS_CONST - #else - # define DYNXDR_GETPOS_CONST const -@@ -172,7 +172,11 @@ DynXdrSetPos(XDR *xdrs, // IN - } - - --#if defined(__GLIBC__) || (defined(sun) && (defined(_LP64) || defined(_KERNEL))) -+#if !defined(USE_TIRPC) && \ -+ defined(__GLIBC__) || \ -+ (defined(sun) && \ -+ (defined(_LP64) || \ -+ defined(_KERNEL))) - /* - *----------------------------------------------------------------------------- - * -@@ -322,11 +326,11 @@ DynXdr_Create(XDR *in) // IN - DynXdrSetPos, /* x_setpostn */ - DynXdrInline, /* x_inline */ - NULL, /* x_destroy */ --#if defined(__GLIBC__) -+#if defined(__APPLE__) || defined(USE_TIRPC) -+ NULL, /* x_control */ -+#elif defined(__GLIBC__) - NULL, /* x_getint32 */ - DynXdrPutInt32, /* x_putint32 */ --#elif defined(__APPLE__) -- NULL, /* x_control */ - #elif defined(sun) && (defined(_LP64) || defined(_KERNEL)) - NULL, /* x_control */ - NULL, /* x_getint32 */ -diff --git open-vm-tools-10.2.5-8068406.org/lib/guestRpc/Makefile.am open-vm-tools-10.2.5-8068406/lib/guestRpc/Makefile.am -index 1605a27c..f06972be 100644 ---- open-vm-tools-10.2.5-8068406.org/lib/guestRpc/Makefile.am -+++ open-vm-tools-10.2.5-8068406/lib/guestRpc/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2008-2016 VMware, Inc. All rights reserved. -+### Copyright (C) 2008-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -43,3 +43,9 @@ nicinfo.h: nicinfo.x - nicinfo_xdr.c: nicinfo.x nicinfo.h - @RPCGEN_WRAPPER@ lib/guestRpc/nicinfo.x $@ - -+libGuestRpc_la_CPPFLAGS = -+libGuestRpc_la_CPPFLAGS += @XDR_CPPFLAGS@ -+ -+libGuestRpc_la_LIBADD = -+libGuestRpc_la_LIBADD += @XDR_LIBS@ -+ -diff --git open-vm-tools-10.2.5-8068406.org/lib/netUtil/Makefile.am open-vm-tools-10.2.5-8068406/lib/netUtil/Makefile.am -index eddc4ae0..aa93f77e 100644 ---- open-vm-tools-10.2.5-8068406.org/lib/netUtil/Makefile.am -+++ open-vm-tools-10.2.5-8068406/lib/netUtil/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2007-2016 VMware, Inc. All rights reserved. -+### Copyright (C) 2007-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -20,3 +20,9 @@ noinst_LTLIBRARIES = libNetUtil.la - libNetUtil_la_SOURCES = - libNetUtil_la_SOURCES += netUtilLinux.c - -+libNetUtil_la_CPPFLAGS = -+libNetUtil_la_CPPFLAGS += @XDR_CPPFLAGS@ -+ -+libNetUtil_la_LIBADD = -+libNetUtil_la_LIBADD += @XDR_LIBS@ -+ -diff --git open-vm-tools-10.2.5-8068406.org/lib/nicInfo/Makefile.am open-vm-tools-10.2.5-8068406/lib/nicInfo/Makefile.am -index de09172b..b7085a79 100644 ---- open-vm-tools-10.2.5-8068406.org/lib/nicInfo/Makefile.am -+++ open-vm-tools-10.2.5-8068406/lib/nicInfo/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2014-2016 VMware, Inc. All rights reserved. -+### Copyright (C) 2014-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -25,13 +25,13 @@ libNicInfo_la_SOURCES += nicInfoPosix.c - - libNicInfo_la_CPPFLAGS = - libNicInfo_la_CPPFLAGS += @GLIB2_CPPFLAGS@ -- --AM_CFLAGS = $(DNET_CPPFLAGS) -+libNicInfo_la_CPPFLAGS += @XDR_CPPFLAGS@ -+libNicInfo_la_CPPFLAGS += $(DNET_CPPFLAGS) - if USE_SLASH_PROC --AM_CFLAGS += -DUSE_SLASH_PROC -+libNicInfo_la_CPPFLAGS += -DUSE_SLASH_PROC - endif -+ - libNicInfo_la_LIBADD = --if HAVE_DNET -- libNicInfo_la_LIBADD += @DNET_LIBS@ --endif -+libNicInfo_la_LIBADD += @DNET_LIBS@ -+libNicInfo_la_LIBADD += @XDR_LIBS@ - -diff --git open-vm-tools-10.2.5-8068406.org/lib/rpcChannel/Makefile.am open-vm-tools-10.2.5-8068406/lib/rpcChannel/Makefile.am -index 4577b655..283a2da6 100644 ---- open-vm-tools-10.2.5-8068406.org/lib/rpcChannel/Makefile.am -+++ open-vm-tools-10.2.5-8068406/lib/rpcChannel/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2009-2016 VMware, Inc. All rights reserved. -+### Copyright (C) 2009-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -27,3 +27,8 @@ endif - - libRpcChannel_la_CPPFLAGS = - libRpcChannel_la_CPPFLAGS += @VMTOOLS_CPPFLAGS@ -+libRpcChannel_la_CPPFLAGS += @XDR_CPPFLAGS@ -+ -+libRpcChannel_la_LIBADD = -+libRpcChannel_la_LIBADD += @XDR_LIBS@ -+ -diff --git open-vm-tools-10.2.5-8068406.org/lib/slashProc/Makefile.am open-vm-tools-10.2.5-8068406/lib/slashProc/Makefile.am -index b3afe9e5..181127e1 100644 ---- open-vm-tools-10.2.5-8068406.org/lib/slashProc/Makefile.am -+++ open-vm-tools-10.2.5-8068406/lib/slashProc/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2007-2016 VMware, Inc. All rights reserved. -+### Copyright (C) 2007-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -22,6 +22,5 @@ libSlashProc_la_SOURCES += net.c - - libSlashProc_la_CPPFLAGS = - libSlashProc_la_CPPFLAGS += @GLIB2_CPPFLAGS@ -- --AM_CFLAGS = $(DNET_CPPFLAGS) -+libSlashProc_la_CPPFLAGS += @DNET_CPPFLAGS@ - -diff --git open-vm-tools-10.2.5-8068406.org/lib/slashProc/net.c open-vm-tools-10.2.5-8068406/lib/slashProc/net.c -index 1d2a8880..952fb90e 100644 ---- open-vm-tools-10.2.5-8068406.org/lib/slashProc/net.c -+++ open-vm-tools-10.2.5-8068406/lib/slashProc/net.c -@@ -36,7 +36,6 @@ - #include "panic.h" - #include "slashProc.h" - #include "slashProcNetInt.h" --#include "netutil.h" - - - /* -diff --git open-vm-tools-10.2.5-8068406.org/libguestlib/Makefile.am open-vm-tools-10.2.5-8068406/libguestlib/Makefile.am -index b49af696..5181409f 100644 ---- open-vm-tools-10.2.5-8068406.org/libguestlib/Makefile.am -+++ open-vm-tools-10.2.5-8068406/libguestlib/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2007-2016 VMware, Inc. All rights reserved. -+### Copyright (C) 2007-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -22,6 +22,7 @@ AM_CFLAGS += -I$(top_srcdir)/include - - libguestlib_la_LIBADD = - libguestlib_la_LIBADD += @VMTOOLS_LIBS@ -+libguestlib_la_LIBADD += @XDR_LIBS@ - - libguestlib_la_SOURCES = - libguestlib_la_SOURCES += guestlibV3_xdr.c -@@ -56,6 +57,7 @@ CFLAGS += -Wno-unused - libguestlib_la_CPPFLAGS = - libguestlib_la_CPPFLAGS += -DVMTOOLS_USE_GLIB - libguestlib_la_CPPFLAGS += @GLIB2_CPPFLAGS@ -+libguestlib_la_CPPFLAGS += @XDR_CPPFLAGS@ - - EXTRA_DIST = vmguestlib.pc.in - -diff --git open-vm-tools-10.2.5-8068406.org/services/plugins/dndcp/Makefile.am open-vm-tools-10.2.5-8068406/services/plugins/dndcp/Makefile.am -index d1543054..be088e54 100644 ---- open-vm-tools-10.2.5-8068406.org/services/plugins/dndcp/Makefile.am -+++ open-vm-tools-10.2.5-8068406/services/plugins/dndcp/Makefile.am -@@ -28,6 +28,7 @@ libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dndGuest - libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/stringxx - libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/xutils - libdndcp_la_CPPFLAGS += -I$(top_srcdir)/include -+libdndcp_la_CPPFLAGS += @XDR_CPPFLAGS@ - - # Passing C++ related flags to CPPFLAGS generates error. - # So, we need to pass these to C++ compilation only. -@@ -45,6 +46,7 @@ libdndcp_la_LIBADD += @GTKMM_LIBS@ - libdndcp_la_LIBADD += @VMTOOLS_LIBS@ - libdndcp_la_LIBADD += @HGFS_LIBS@ - libdndcp_la_LIBADD += $(top_builddir)/lib/hgfsUri/hgfsUriPosix.lo -+libdndcp_la_LIBADD += @XDR_LIBS@ - - libdndcp_la_SOURCES = - -diff --git open-vm-tools-10.2.5-8068406.org/services/plugins/guestInfo/Makefile.am open-vm-tools-10.2.5-8068406/services/plugins/guestInfo/Makefile.am -index 319e719f..09ae4ddf 100644 ---- open-vm-tools-10.2.5-8068406.org/services/plugins/guestInfo/Makefile.am -+++ open-vm-tools-10.2.5-8068406/services/plugins/guestInfo/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2009-2017 VMware, Inc. All rights reserved. -+### Copyright (C) 2009-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -22,6 +22,7 @@ plugin_LTLIBRARIES = libguestInfo.la - - libguestInfo_la_CPPFLAGS = - libguestInfo_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ -+libguestInfo_la_CPPFLAGS += @XDR_CPPFLAGS@ - - libguestInfo_la_LDFLAGS = - libguestInfo_la_LDFLAGS += @PLUGIN_LDFLAGS@ -@@ -30,9 +31,7 @@ libguestInfo_la_LIBADD = - libguestInfo_la_LIBADD += @VMTOOLS_LIBS@ - libguestInfo_la_LIBADD += @XDR_LIBS@ - --if HAVE_DNET -- libguestInfo_la_LIBADD += @DNET_LIBS@ --endif -+libguestInfo_la_LIBADD += @DNET_LIBS@ - - libguestInfo_la_SOURCES = - libguestInfo_la_SOURCES += guestInfoServer.c -diff --git open-vm-tools-10.2.5-8068406.org/services/plugins/resolutionKMS/resolutionKMS.c open-vm-tools-10.2.5-8068406/services/plugins/resolutionKMS/resolutionKMS.c -index 22292713..4dc9084f 100644 ---- open-vm-tools-10.2.5-8068406.org/services/plugins/resolutionKMS/resolutionKMS.c -+++ open-vm-tools-10.2.5-8068406/services/plugins/resolutionKMS/resolutionKMS.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2008-2017 VMware, Inc. All rights reserved. -+ * Copyright (C) 2008-2018 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -29,16 +29,13 @@ - #include - #include - -+#include - #include - #include - - #include "vmware.h" --#include "debug.h" --#include "rpcout.h" --#include "str.h" - #include "strutil.h" - --#include "xdrutil.h" - #include "vmware/guestrpc/tclodefs.h" - #include "vmware/tools/plugin.h" - #include "vmware/tools/utils.h" -diff --git open-vm-tools-10.2.5-8068406.org/services/plugins/resolutionSet/resolutionSet.c open-vm-tools-10.2.5-8068406/services/plugins/resolutionSet/resolutionSet.c -index b9da3fdf..4cc9bd16 100644 ---- open-vm-tools-10.2.5-8068406.org/services/plugins/resolutionSet/resolutionSet.c -+++ open-vm-tools-10.2.5-8068406/services/plugins/resolutionSet/resolutionSet.c -@@ -1,5 +1,5 @@ - /********************************************************* -- * Copyright (C) 2008-2017 VMware, Inc. All rights reserved. -+ * Copyright (C) 2008-2018 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published -@@ -34,7 +34,6 @@ - - #include "resolutionInt.h" - --#include "xdrutil.h" - #include "vmware/guestrpc/tclodefs.h" - #include "vmware/tools/plugin.h" - #include "vmware/tools/utils.h" -diff --git open-vm-tools-10.2.5-8068406.org/services/plugins/vix/Makefile.am open-vm-tools-10.2.5-8068406/services/plugins/vix/Makefile.am -index f7d541e5..5c4d7f52 100644 ---- open-vm-tools-10.2.5-8068406.org/services/plugins/vix/Makefile.am -+++ open-vm-tools-10.2.5-8068406/services/plugins/vix/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2009-2016 VMware, Inc. All rights reserved. -+### Copyright (C) 2009-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -21,6 +21,7 @@ plugin_LTLIBRARIES = libvix.la - libvix_la_CPPFLAGS = - libvix_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ - libvix_la_CPPFLAGS += -I$(top_srcdir)/vgauth/public -+libvix_la_CPPFLAGS += @XDR_CPPFLAGS@ - - libvix_la_LDFLAGS = - libvix_la_LDFLAGS += @PLUGIN_LDFLAGS@ -@@ -35,6 +36,7 @@ libvix_la_LIBADD += $(top_builddir)/lib/impersonate/libImpersonate.la - if ENABLE_VGAUTH - libvix_la_LIBADD += $(top_builddir)/vgauth/lib/libvgauth.la - endif -+libvix_la_LIBADD += @XDR_LIBS@ - - libvix_la_SOURCES = - libvix_la_SOURCES += foundryToolsDaemon.c -diff --git open-vm-tools-10.2.5-8068406.org/services/plugins/vix/vixTools.c open-vm-tools-10.2.5-8068406/services/plugins/vix/vixTools.c -index 98df172d..d16bcc6e 100644 ---- open-vm-tools-10.2.5-8068406.org/services/plugins/vix/vixTools.c -+++ open-vm-tools-10.2.5-8068406/services/plugins/vix/vixTools.c -@@ -91,7 +91,6 @@ - #include "str.h" - #include "file.h" - #include "err.h" --#include "guestInfo.h" // MAX_VALUE_LEN - #include "hostinfo.h" - #include "guest_os.h" - #include "guest_msg_def.h" -diff --git open-vm-tools-10.2.5-8068406.org/services/plugins/vmbackup/Makefile.am open-vm-tools-10.2.5-8068406/services/plugins/vmbackup/Makefile.am -index 88082b92..7beeb375 100644 ---- open-vm-tools-10.2.5-8068406.org/services/plugins/vmbackup/Makefile.am -+++ open-vm-tools-10.2.5-8068406/services/plugins/vmbackup/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2009-2017 VMware, Inc. All rights reserved. -+### Copyright (C) 2009-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -20,6 +20,7 @@ plugin_LTLIBRARIES = libvmbackup.la - - libvmbackup_la_CPPFLAGS = - libvmbackup_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ -+libvmbackup_la_CPPFLAGS += @XDR_CPPFLAGS@ - - libvmbackup_la_LDFLAGS = - libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAGS@ -@@ -27,6 +28,7 @@ libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAGS@ - libvmbackup_la_LIBADD = - libvmbackup_la_LIBADD += @GOBJECT_LIBS@ - libvmbackup_la_LIBADD += @VMTOOLS_LIBS@ -+libvmbackup_la_LIBADD += @XDR_LIBS@ - - libvmbackup_la_SOURCES = - libvmbackup_la_SOURCES += nullProvider.c -diff --git open-vm-tools-10.2.5-8068406.org/services/plugins/vmbackup/stateMachine.c open-vm-tools-10.2.5-8068406/services/plugins/vmbackup/stateMachine.c -index af226eb7..89a907ca 100644 ---- open-vm-tools-10.2.5-8068406.org/services/plugins/vmbackup/stateMachine.c -+++ open-vm-tools-10.2.5-8068406/services/plugins/vmbackup/stateMachine.c -@@ -35,7 +35,6 @@ - - #include "vmBackupInt.h" - --#include "dynxdr.h" - #include - #include - #include "guestApp.h" -diff --git open-vm-tools-10.2.5-8068406.org/toolbox/Makefile.am open-vm-tools-10.2.5-8068406/toolbox/Makefile.am -index 66d36ac6..75f81b2a 100644 ---- open-vm-tools-10.2.5-8068406.org/toolbox/Makefile.am -+++ open-vm-tools-10.2.5-8068406/toolbox/Makefile.am -@@ -1,5 +1,5 @@ - ################################################################################ --### Copyright (C) 2007-2016 VMware, Inc. All rights reserved. -+### Copyright (C) 2007-2018 VMware, Inc. All rights reserved. - ### - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of version 2 of the GNU General Public License as -@@ -20,9 +20,11 @@ bin_PROGRAMS = vmware-toolbox-cmd - vmware_toolbox_cmd_LDADD = - vmware_toolbox_cmd_LDADD += ../libguestlib/libguestlib.la - vmware_toolbox_cmd_LDADD += @VMTOOLS_LIBS@ -+vmware_toolbox_cmd_LDADD += @XDR_LIBS@ - - vmware_toolbox_cmd_CPPFLAGS = - vmware_toolbox_cmd_CPPFLAGS += @VMTOOLS_CPPFLAGS@ -+vmware_toolbox_cmd_CPPFLAGS += @XDR_CPPFLAGS@ - - vmware_toolbox_cmd_SOURCES = - vmware_toolbox_cmd_SOURCES += toolbox-cmd.c diff --git a/open-vm-tools-10.2.5-8068406.tar.gz b/open-vm-tools-10.2.5-8068406.tar.gz deleted file mode 100644 index d57f225..0000000 --- a/open-vm-tools-10.2.5-8068406.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d53be10cfa48bc4853e5fa8e16b416b11d01487d7bade226e8f79da7e9d1c2f3 -size 4818035 diff --git a/open-vm-tools-10.3.0-8931395.tar.gz b/open-vm-tools-10.3.0-8931395.tar.gz new file mode 100644 index 0000000..270dbba --- /dev/null +++ b/open-vm-tools-10.3.0-8931395.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca5bcd62a969803015bb4ca8e2610c376487be6b6b95e7500f6684d65813b161 +size 4638881 diff --git a/open-vm-tools.changes b/open-vm-tools.changes index 1157739..d8b0ac9 100644 --- a/open-vm-tools.changes +++ b/open-vm-tools.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Aug 10 16:23:27 UTC 2018 - kallan@suse.com + +- Remove vgauthd.service from the %pre and %post section in the spec file. + This allows vmtoolsd.service to enable vgauthd if needed which creates + the vmtoolsd.service.requires/vgauthd.service symlink. (bsc#1103868) + +- Add Requires: libxmlsec1-openssl1 to the spec file. This is needed when + using xmlsec1 rather than xml-ssecurity-c. + +------------------------------------------------------------------- +Mon Aug 6 19:52:34 UTC 2018 - kallan@suse.com + +- Update to 10.3.0 (build 8931395) + + Starting with 10.3.0, open-vm-tools builds with xmlsec1 by default (instead + of building with xml-security). To revert to the old behavior and build + with xml-security, use the option '--enable-xmlsecurity' for the + ./configure command. + + Add BuildRequires: libxml2-devel + + Add BuildRequires: pkgconfig(xmlsec1) for all openSUSE builds + + Use --enable-xmlsecurity when building for SLE + +- Drop unnecessary patches + - 100-libtirpc.patch + ------------------------------------------------------------------- Tue May 17 20:14:03 UTC 2018 - mlatimer@suse.com diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 2e1008c..cc38e14 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -64,8 +64,8 @@ Name: open-vm-tools %define subname open-vm-tools %define tarname open-vm-tools -%define bldnum 8068406 -Version: 10.2.5 +%define bldnum 8931395 +Version: 10.3.0 Release: 0 Summary: Open Virtual Machine Tools License: BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only @@ -114,8 +114,14 @@ BuildRequires: glibc >= 2.12 BuildRequires: xorg-x11-devel %endif %if %{with vgauth} -# vgauth requires xerces-c and xml-security-c +# vgauth requires xml2, xerces-c, and xml-security-c +BuildRequires: libxml2-devel +%if 0%{?suse_version } > 1320 || ( 0%{?is_opensuse} && 0%{?sle_version} >= 0120100 ) +# Use xmlsec1 instead of xml-security-c where available. +BuildRequires: pkgconfig(xmlsec1) +%else BuildRequires: xml-security-c-devel +%endif BuildRequires: pkgconfig(xerces-c) %endif # vmhgfs is always built so fuse is no longer optional @@ -130,6 +136,9 @@ Requires: libvmtools0 = %{version}-%{release} Requires: net-tools Requires: tar Requires: which +%if 0%{?suse_version } > 1320 || ( 0%{?is_opensuse} && 0%{?sle_version} >= 0120100 ) +Requires: libxmlsec1-openssl1 +%endif # open-vm-tools >= 10.0.0 do not require open-vm-tools-deploypkg # provided by VMware. That functionality is now available as part # of open-vm-tools package itself. @@ -137,7 +146,6 @@ Obsoletes: open-vm-tools-deploypkg <= 10.0.5 Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*) ExclusiveArch: %ix86 x86_64 #Upstream patches -Patch100: 100-libtirpc.patch %systemd_requires @@ -203,11 +211,22 @@ if you intend to create own plugins for vmtoolsd. %setup -q -n %{tarname}-%{version}-%{bldnum} # fix for an rpmlint warning regarding wrong line feeds sed -i -e "s/\r//" README -%if 0%{?suse_version} >= 1330 -%patch100 -p1 -%endif %build +%if %{with_X} + %define arg_x --with-x +%else + %define arg_x --without-x +%endif +%if ! %{with vgauth} + %define arg_xmlsecurity --without-xmlsecurity + %define arg_xerces --without-xerces +%else +%if !0%{?is_opensuse} + %define arg_xmlsecurity --enable-xmlsecurity +%endif +%endif + # 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 @@ -228,17 +247,11 @@ chmod 755 configure %configure \ --without-kernel-modules \ --without-root-privileges \ -%if %{with_X} - --with-x \ -%else - --without-x \ -%endif + %{?arg_x} \ --disable-dependency-tracking \ --with-gtk3 \ -%if ! %{with vgauth} - --without-xmlsecurity \ - --without-xerces \ -%endif + %{?arg_xmlsecurity} \ + %{?arg_xerces} \ --with-udev-rules-dir=%{_udevrulesdir} \ --enable-resolutionkms \ --disable-static @@ -306,16 +319,10 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.co %pre %service_add_pre vmtoolsd.service -%if %{with vgauth} -%service_add_pre vgauthd.service -%endif %post /sbin/ldconfig %service_add_post vmtoolsd.service -%if %{with vgauth} -%service_add_post vgauthd.service -%endif %if %{with_X}