Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2015-06-30 10:44:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-vm-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools-KMP.changes 2015-06-06 09:54:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new/open-vm-tools-KMP.changes 2015-06-30 10:44:46.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 28 10:56:24 UTC 2015 - [email protected] + +- Fix compilation issues with GCC 5: + * Add toolboxcmd-fix-logic.patch + * Add asm_x86.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2015-06-06 09:54:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new/open-vm-tools.changes 2015-06-30 10:44:46.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 28 10:56:24 UTC 2015 - [email protected] + +- Fix compilation issues with GCC 5: + * Add toolboxcmd-fix-logic.patch + * Add asm_x86.patch + +------------------------------------------------------------------- New: ---- asm_x86.patch toolboxcmd-fix-logic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools-KMP.spec ++++++ --- /var/tmp/diff_new_pack.KRzW80/_old 2015-06-30 10:44:47.000000000 +0200 +++ /var/tmp/diff_new_pack.KRzW80/_new 2015-06-30 10:44:47.000000000 +0200 @@ -130,6 +130,10 @@ Patch3: 0002-Fix-d_alias-to-d_u.d_alias-for-kernel-3.18.patch Patch4: 0003-Fix-f_dentry-msghdr-kernel-3.19.patch Patch5: 0004-vmhgfs-bdi-kernel-4.0.patch +# PATCH-FIX-UPSTREAM toolboxcmd-fix-logic.patch -- fix build with gcc5 (from Fedora) +Patch6: toolboxcmd-fix-logic.patch +# PATCH-FIX-UPSTREAM asm_x86.patch -- fix build with gcc 5 on i586 (from Fedora) +Patch7: asm_x86.patch %if %{KMP} %suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um @@ -236,6 +240,8 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build %if ! %{KMP} open-vm-tools.spec: same change ++++++ asm_x86.patch ++++++ --- open-vm-tools-9.10.0-2476743/lib/include/vm_basic_asm_x86.h.orig 2015-04-30 20:27:54.197056616 -0700 +++ open-vm-tools-9.10.0-2476743/lib/include/vm_basic_asm_x86.h 2015-04-30 20:47:22.916480187 -0700 @@ -352,7 +352,9 @@ *----------------------------------------------------------------------------- */ -#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 4) && !defined(MUL64_NO_ASM) +#if defined(__GNUC__) && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && \ + !defined(MUL64_NO_ASM) static INLINE uint64 Mul64x3264(uint64 multiplicand, uint32 multiplier, uint32 shift) @@ -457,7 +459,9 @@ *----------------------------------------------------------------------------- */ -#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 4) && !defined(MUL64_NO_ASM) +#if defined(__GNUC__) && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && \ + !defined(MUL64_NO_ASM) static INLINE int64 Muls64x32s64(int64 multiplicand, uint32 multiplier, uint32 shift) ++++++ toolboxcmd-fix-logic.patch ++++++ --- open-vm-tools-9.10.0-2476743.orig/toolbox/toolboxcmd-shrink.c 2015-03-19 15:53:25.000000000 -0700 +++ open-vm-tools-9.10.0-2476743/toolbox/toolboxcmd-shrink.c 2015-04-29 17:35:12.190392096 -0700 @@ -391,7 +391,7 @@ * Verify that wiping/shrinking are permitted before going through with the * wiping operation. */ - if (!ShrinkGetWiperState() == WIPER_ENABLED && !Wiper_IsWipeSupported(part)) { + if (ShrinkGetWiperState() != WIPER_ENABLED && !Wiper_IsWipeSupported(part)) { g_debug("%s cannot be wiped / shrunk\n", mountPoint); ToolsCmd_PrintErr("%s", SU_(disk.shrink.disabled, SHRINK_DISABLED_ERR));
