[libguestfs/f14/master] - Fix for libguestfs: missing disk format specifier when adding a disk (RHBZ#642934, CVE-2010-3851

[Richard W.M. Jones]

commit f4c2545f4c243d32c36497987fa9439fe010796d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat Oct 23 07:29:56 2010 +0100

    - Fix for libguestfs: missing disk format specifier when adding a disk
      (RHBZ#642934, CVE-2010-3851).

 .gitignore                                    |    1 +
 libguestfs-1.5.21-skip-test-copy.patch        |   31 -------------------------
 libguestfs-1.5.21-skip-test-virt-resize.patch |   29 -----------------------
 libguestfs.spec                               |   14 +++++------
 sources                                       |    2 +-
 5 files changed, 8 insertions(+), 69 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96e4f69..e60a3af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ libguestfs-1.5.2.tar.gz
 /libguestfs-1.5.17.tar.gz
 /libguestfs-1.5.18.tar.gz
 /libguestfs-1.5.21.tar.gz
+/libguestfs-1.5.23.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index c2b5e16..2a863f3 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.5.21
-Release:       1%{?dist}.4
+Version:       1.5.23
+Release:       1
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -52,10 +52,6 @@ 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
 
-# Upstream patches to skip problematic tests in some circumstances.
-Patch1:        libguestfs-1.5.21-skip-test-copy.patch
-Patch2:        libguestfs-1.5.21-skip-test-virt-resize.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -414,8 +410,6 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 mkdir -p daemon/m4
 
@@ -745,6 +739,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 23 2010 Richard Jones <rjones at redhat.com> - 1:1.5.23-1
+- Fix for libguestfs: missing disk format specifier when adding a disk
+  (RHBZ#642934, CVE-2010-3851).
+
 * Sat Oct  9 2010 Richard Jones <rjones at redhat.com> - 1:1.5.21-1.fc14.4
 - guestfish no longer requires virt-inspector.
 
diff --git a/sources b/sources
index d6cb1c7..5c91a63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-549166bb9093cefc3e2c42452444bd2d  libguestfs-1.5.21.tar.gz
+cfa4485737583cbf7991840d2441b0d6  libguestfs-1.5.23.tar.gz