From 8e935ffee9f8f9b2af9d25e44a9c3f9529bc5bab Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Tue, 30 Mar 2010 12:39:32 +0000
Subject: [PATCH] Backport of TERM=dumb patch from upstream.

---
 ...emon-Set-TERM-dumb-inside-the-daemon.patch | 36 +++++++++++++++++++
 libguestfs.spec                               |  9 ++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 libguestfs-1.0.88-daemon-Set-TERM-dumb-inside-the-daemon.patch

diff --git a/libguestfs-1.0.88-daemon-Set-TERM-dumb-inside-the-daemon.patch b/libguestfs-1.0.88-daemon-Set-TERM-dumb-inside-the-daemon.patch
new file mode 100644
index 0000000..7a8787e
--- /dev/null
+++ b/libguestfs-1.0.88-daemon-Set-TERM-dumb-inside-the-daemon.patch
@@ -0,0 +1,36 @@
+From 641e8275b3b63b68c82ef80735bb55f9da05ef2c Mon Sep 17 00:00:00 2001
+From: Richard Jones <rjones@redhat.com>
+Date: Tue, 30 Mar 2010 13:34:16 +0100
+Subject: [PATCH] daemon: Set TERM=dumb inside the daemon.
+
+Since commit 977edb3185fe8f we have been passing TERM from the
+library into the appliance (for the benefit of virt-rescue).
+However this changes the output of parted, which I would argue
+is a bug in parted:
+
+ TERM=xterm /sbin/parted -m -- /dev/sda unit b print 2>&1 | hexdump -C
+ 00000000  1b 5b 3f 31 30 33 34 68  42 59 54 3b 0a 2f 64 65  |.[?1034hBYT;./de|
+
+Notice the escape-sequence junk before the official "BYT;"
+header.
+
+By setting TERM=dumb we avoid this.
+---
+ daemon/guestfsd.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
+index 1518438..69baf9e 100644
+--- a/daemon/guestfsd.c
++++ b/daemon/guestfsd.c
+@@ -227,6 +227,7 @@ main (int argc, char *argv[])
+   setenv ("PATH", "/sbin:/usr/sbin:/bin:/usr/bin", 1);
+   setenv ("SHELL", "/bin/sh", 1);
+   setenv ("LC_ALL", "C", 1);
++  setenv ("TERM", "dumb", 1);
+ 
+ #ifndef WIN32
+   /* We document that umask defaults to 022 (it should be this anyway). */
+-- 
+1.6.6.1
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 48074db..d65bb2b 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -42,7 +42,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.0.88
-Release:       5%{?dist}
+Release:       6%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -52,6 +52,9 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.0.79-no-fuse-test.patch
 
+# Backport of TERM=dumb patch from upstream.
+Patch1:        libguestfs-1.0.88-daemon-Set-TERM-dumb-inside-the-daemon.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -381,6 +384,7 @@ Requires:      jpackage-utils
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -680,6 +684,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 30 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.88-6
+- Backport of TERM=dumb patch from upstream.
+
 * Tue Mar 30 2010 Richard W.M. Jones <rjones@redhat.com> - 1:1.0.88-5
 - Attempted workaround for RHBZ#563103, so we can reenable tests.