rpms
/
libguestfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Another 'make check' patch.

This commit is contained in:
Richard W.M. Jones 2011-12-23 08:29:57 +00:00
parent f35b1f468a
commit a57c52f877
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-fish-Fix-test-guestfish-events.sh-so-it-works-when-L.patch Normal file
View File

@ -0,0 +1,41 @@
From b5f90793026832889cae3d4997810cb34777cf9a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 23 Dec 2011 08:28:26 +0000
Subject: [PATCH] fish: Fix test-guestfish-events.sh so it works when
LIBGUESTFS_DEBUG=1 is set.
Various messages were added and changed when this variable was set
while tests were running.
---
fish/test-guestfish-events.sh | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/fish/test-guestfish-events.sh b/fish/test-guestfish-events.sh
index ad6fefe..4d301b0 100755
--- a/fish/test-guestfish-events.sh
+++ b/fish/test-guestfish-events.sh
@@ -22,7 +22,7 @@ set -e
rm -f test.out
-../fish/guestfish -a /dev/null <<'EOF' > test.out
+../fish/guestfish -a /dev/null <<'EOF' | grep -v get_verbose | grep -v get_trace | grep -v 'library .*0x' > test.out
trace true
event ev1 * "echo $EVENT $@"
@@ -53,12 +53,6 @@ if [ "$(cat test.out)" != '"ev1" (0): *: echo $EVENT $@
"ev1" (1): *: echo $EVENT $@
"ev2" (2): *: echo $EVENT $@
"ev2" (2): *: echo $EVENT $@
-enter get_verbose
-trace get_verbose
-trace get_verbose = 0
-enter get_trace
-trace get_trace
-trace get_trace = 1
enter get_autosync
trace get_autosync
trace get_autosync = 1
--
1.7.6

8
libguestfs.spec
View File

@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.15.13
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -40,6 +40,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# Upstream patches:
Patch0: 0001-tests-protocol-Contains-a-Perl-test-so-we-must-set-P.patch
Patch1: 0001-tests-lvm-Contains-a-Perl-test-so-we-must-set-PERL5L.patch
Patch2: 0001-fish-Fix-test-guestfish-events.sh-so-it-works-when-L.patch
BuildRequires: automake
%if 0%{?rhel} >= 7
@ -595,6 +596,7 @@ for %{name}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
automake
mkdir -p daemon/m4
@ -972,11 +974,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Dec 22 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.13-3
* Thu Dec 22 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.13-4
- New upstream version 1.15.13.
- Fixes Security: Mitigate possible privilege escalation via SG_IO ioctl
(CVE-2011-4127, RHBZ#757071).
- Add two upstream patches to fix 'make check'.
- Add three upstream patches to fix 'make check'.
* Thu Dec 22 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.12-1
- New upstream version 1.15.12.