diff -u open-vm-tools-2008.06.03-96374/debian/control open-vm-tools-2008.06.03-96374/debian/control --- open-vm-tools-2008.06.03-96374/debian/control +++ open-vm-tools-2008.06.03-96374/debian/control @@ -1,7 +1,8 @@ Source: open-vm-tools Section: contrib/admin Priority: extra -Maintainer: Daniel Baumann +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Daniel Baumann Build-Depends: debhelper (>= 7), autotools-dev, dpatch, bzip2, libdumbnet-dev, libgtk2.0-dev, libicu-dev, libpam0g-dev, libproc-dev, libx11-dev, libxinerama-dev, libxtst-dev Standards-Version: 3.8.0 Homepage: http://open-vm-tools.sourceforge.net/ @@ -9,7 +10,7 @@ Vcs-Git: git://git.debian.net/git/open-vm-tools.git Package: open-vm-tools -Architecture: amd64 i386 +Architecture: amd64 i386 lpia Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: open-vm-source, ethtool, xauth, xserver-xorg-input-vmmouse, xserver-xorg-video-vmware, zerofree Description: tools and components for VMware guest systems diff -u open-vm-tools-2008.06.03-96374/debian/changelog open-vm-tools-2008.06.03-96374/debian/changelog --- open-vm-tools-2008.06.03-96374/debian/changelog +++ open-vm-tools-2008.06.03-96374/debian/changelog @@ -1,3 +1,10 @@ +open-vm-tools (2008.06.03-96374-1ubuntu1) intrepid; urgency=low + + * Add ubuntu_toolchain_FTBFS.dpatch patch, fix FTBFS. + * Add lpia to open-vm-tools Architecture field in debian/control. + + -- Devid Filoni Fri, 25 Jul 2008 17:06:00 +0200 + open-vm-tools (2008.06.03-96374-1) unstable; urgency=medium * Updating rules file for upstream version 2008.06.03-96374. diff -u open-vm-tools-2008.06.03-96374/debian/patches/00list open-vm-tools-2008.06.03-96374/debian/patches/00list --- open-vm-tools-2008.06.03-96374/debian/patches/00list +++ open-vm-tools-2008.06.03-96374/debian/patches/00list @@ -3,0 +4 @@ +ubuntu_toolchain_FTBFS only in patch2: unchanged: --- open-vm-tools-2008.06.03-96374.orig/debian/patches/ubuntu_toolchain_FTBFS.dpatch +++ open-vm-tools-2008.06.03-96374/debian/patches/ubuntu_toolchain_FTBFS.dpatch @@ -0,0 +1,121 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu_toolchain_FTBFS.dpatch by Devid Filoni +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad open-vm-tools-2008.06.03-96374~/guestd/foundryToolsDaemon.c open-vm-tools-2008.06.03-96374/guestd/foundryToolsDaemon.c +--- open-vm-tools-2008.06.03-96374~/guestd/foundryToolsDaemon.c 2008-06-03 10:06:08.000000000 +0200 ++++ open-vm-tools-2008.06.03-96374/guestd/foundryToolsDaemon.c 2008-07-25 19:55:17.000000000 +0200 +@@ -1382,7 +1382,7 @@ + * from the contents of /etc/fstab, and invoke custom mount programs like the + * one needed for HGFS. + */ +- system("mount -a -t vmhgfs"); ++ if (system("mount -a -t vmhgfs")) { } + #endif + + /* +diff -urNad open-vm-tools-2008.06.03-96374~/guestd/main.c open-vm-tools-2008.06.03-96374/guestd/main.c +--- open-vm-tools-2008.06.03-96374~/guestd/main.c 2008-06-03 10:06:08.000000000 +0200 ++++ open-vm-tools-2008.06.03-96374/guestd/main.c 2008-07-25 19:55:17.000000000 +0200 +@@ -1222,7 +1222,7 @@ + + pidFile = fopen(pidFileName, "r"); + if (pidFile) { +- fscanf(pidFile, "%"FMTPID"\n", &pid); ++ if (fscanf(pidFile, "%"FMTPID"\n", &pid)) { } + fclose(pidFile); + + /* +diff -urNad open-vm-tools-2008.06.03-96374~/lib/guestInfo/guestInfoPerfMonLinux.c open-vm-tools-2008.06.03-96374/lib/guestInfo/guestInfoPerfMonLinux.c +--- open-vm-tools-2008.06.03-96374~/lib/guestInfo/guestInfoPerfMonLinux.c 2008-06-03 10:06:05.000000000 +0200 ++++ open-vm-tools-2008.06.03-96374/lib/guestInfo/guestInfoPerfMonLinux.c 2008-07-25 19:55:17.000000000 +0200 +@@ -180,7 +180,7 @@ + } + + while(!feof(fp)) { +- fscanf(fp, "%s %"FMT64"u", buf, &value); ++ if (fscanf(fp, "%s %"FMT64"u", buf, &value)) { } + if (StrUtil_StartsWith(buf, "MemTotal")) { + vmStats->memTotal = value; + } +diff -urNad open-vm-tools-2008.06.03-96374~/lib/guestInfo/guestInfoPosix.c open-vm-tools-2008.06.03-96374/lib/guestInfo/guestInfoPosix.c +--- open-vm-tools-2008.06.03-96374~/lib/guestInfo/guestInfoPosix.c 2008-06-03 10:06:05.000000000 +0200 ++++ open-vm-tools-2008.06.03-96374/lib/guestInfo/guestInfoPosix.c 2008-07-25 19:55:17.000000000 +0200 +@@ -200,7 +200,7 @@ + char macAddress[MAC_ADDR_SIZE]; + char ipAddress[IP_ADDR_SIZE_V2]; + +- Str_Sprintf(macAddress, sizeof macAddress, ++ Str_Sprintf(macAddress, sizeof macAddress, "%s\n", + addr_ntoa(&entry->intf_link_addr)); + nicEntryCur = GuestInfoAddNicEntry(nicInfo, macAddress); + if (nicEntryCur == NULL) { +diff -urNad open-vm-tools-2008.06.03-96374~/lib/panic/panic.c open-vm-tools-2008.06.03-96374/lib/panic/panic.c +--- open-vm-tools-2008.06.03-96374~/lib/panic/panic.c 2008-06-03 10:06:06.000000000 +0200 ++++ open-vm-tools-2008.06.03-96374/lib/panic/panic.c 2008-07-25 19:55:17.000000000 +0200 +@@ -469,7 +469,7 @@ + case 0: + break; + case 1: +- Log(buf); ++ Log(buf,"%s\n"); + Log("Panic loop\n"); + default: + fprintf(stderr, "Panic loop\n"); +@@ -482,7 +482,7 @@ + * the log file on exit. + */ + +- Log(buf); ++ Log(buf,"%s\n"); + Util_Backtrace(0); + Log_SetAlwaysKeep(TRUE); + +diff -urNad open-vm-tools-2008.06.03-96374~/lib/system/systemLinux.c open-vm-tools-2008.06.03-96374/lib/system/systemLinux.c +--- open-vm-tools-2008.06.03-96374~/lib/system/systemLinux.c 2008-06-03 10:06:05.000000000 +0200 ++++ open-vm-tools-2008.06.03-96374/lib/system/systemLinux.c 2008-07-25 19:55:17.000000000 +0200 +@@ -357,7 +357,7 @@ + cmd = "shutdown -h now"; + #endif + } +- system(cmd); ++ if (system(cmd)) { } + } + + +diff -urNad open-vm-tools-2008.06.03-96374~/vmware-user/foundryToolsDaemon.c open-vm-tools-2008.06.03-96374/vmware-user/foundryToolsDaemon.c +--- open-vm-tools-2008.06.03-96374~/vmware-user/foundryToolsDaemon.c 2008-06-03 10:06:08.000000000 +0200 ++++ open-vm-tools-2008.06.03-96374/vmware-user/foundryToolsDaemon.c 2008-07-25 19:55:17.000000000 +0200 +@@ -1382,7 +1382,7 @@ + * from the contents of /etc/fstab, and invoke custom mount programs like the + * one needed for HGFS. + */ +- system("mount -a -t vmhgfs"); ++ if (system("mount -a -t vmhgfs")) { } + #endif + + /* +diff -urNad open-vm-tools-2008.06.03-96374~/xferlogs/xferlogs.c open-vm-tools-2008.06.03-96374/xferlogs/xferlogs.c +--- open-vm-tools-2008.06.03-96374~/xferlogs/xferlogs.c 2008-06-03 10:06:09.000000000 +0200 ++++ open-vm-tools-2008.06.03-96374/xferlogs/xferlogs.c 2008-07-25 19:57:43.000000000 +0200 +@@ -125,7 +125,7 @@ + RpcVMX_Log("%s: %s: ver - %d", LOG_START_MARK, filename, LOG_VERSION); + while ((readLen = fread(buf, 1, sizeof buf, fp)) > 0 ) { + if (Base64_Encode(buf, readLen, base64Buf, sizeof base64B - 1, NULL)) { +- RpcVMX_Log(base64B); ++ RpcVMX_Log(base64B,"%s\n"); + } else { + Warning("Error in Base64_Encode\n"); + goto exit; +@@ -261,7 +261,7 @@ + usage(); + return -1; + } if (argc == 2) { +- RpcVMX_Log(argv[1]); ++ RpcVMX_Log(argv[1],"%s\n"); + return 0; + } +