diff --git a/.cvsignore b/.cvsignore index 5b788f7..adbd9d4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libguestfs-1.0.88.tar.gz +libguestfs-1.0.89.tar.gz 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 deleted file mode 100644 index 7a8787e..0000000 --- a/libguestfs-1.0.88-daemon-Set-TERM-dumb-inside-the-daemon.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 641e8275b3b63b68c82ef80735bb55f9da05ef2c Mon Sep 17 00:00:00 2001 -From: Richard Jones -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 a40a83b..8a0d051 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,8 +41,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.0.88 -Release: 7%{?dist} +Version: 1.0.89 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -52,14 +52,11 @@ 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 BuildRequires: febootstrap >= 2.6 -BuildRequires: hivex-devel >= 1.2.0 +BuildRequires: hivex-devel >= 1.2.1 BuildRequires: augeas-devel >= 0.5.0 BuildRequires: readline-devel BuildRequires: genisoimage @@ -219,7 +216,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: guestfish Requires: perl-Sys-Virt Requires: perl-XML-Writer -Requires: hivex +Requires: hivex >= 1.2.1 # Obsolete and replace earlier packages. Provides: virt-cat = %{epoch}:%{version}-%{release} @@ -384,7 +381,6 @@ Requires: jpackage-utils %setup -q %patch0 -p1 -%patch1 -p1 mkdir -p daemon/m4 @@ -693,6 +689,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 30 2010 Richard W.M. Jones - 1:1.0.89-1 +- New upstream version 1.0.89. +- Improved version of virt-win-reg. +- Many smaller bugfixes. +- Requires hivex >= 1.2.1. +- Remove TERM=dumb patch which is now upstream. + * Tue Mar 30 2010 Richard W.M. Jones - 1:1.0.88-7 - Backport of TERM=dumb patch from upstream. - Workaround failure caused by RHBZ#575734. diff --git a/sources b/sources index 18a1148..e25c2de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cae9d58f7da06d7ab3aa9957c9498cd0 libguestfs-1.0.88.tar.gz +eaf62f7d2b242910d51f033166c67ae3 libguestfs-1.0.89.tar.gz