Remove upstream patch.

This commit is contained in:
Richard W.M. Jones 2012-09-26 12:14:07 +01:00
parent 7d92d58f38
commit 94cc99afd1
2 changed files with 1 additions and 37 deletions

View File

@ -1,31 +0,0 @@
From 7fc838cca334ccf3d388c5598ff7fae88dbe4513 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 25 Sep 2012 12:15:19 +0100
Subject: [PATCH] test-launch-race: Add SELinux label to $TMPDIR.
This is a temporary workaround for
https://bugzilla.redhat.com/show_bug.cgi?id=860235
which can be removed once this bug is fixed.
---
tests/protocol/test-launch-race.pl | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tests/protocol/test-launch-race.pl b/tests/protocol/test-launch-race.pl
index f933bfe..7e1330b 100755
--- a/tests/protocol/test-launch-race.pl
+++ b/tests/protocol/test-launch-race.pl
@@ -32,6 +32,11 @@ exit 77 if $ENV{SKIP_TEST_LAUNCH_RACE_PL};
my $tmpdir = tempdir (CLEANUP => 1);
$ENV{TMPDIR} = $tmpdir;
+# Temporary workaround for RHBZ#860235 which can be removed
+# once that bug is fixed.
+system ("chcon system_u:object_r:tmp_t:s0 $tmpdir") == 0
+ or warn "chcon: $tmpdir: $!";
+
my $pid = fork();
die ("fork failed: $!") if ($pid < 0);
--
1.7.10.4

View File

@ -43,10 +43,6 @@ Patch2: libguestfs-1.19.2-remove-udev-from-packagelist.patch
# on i386 only. This works around a bug in 32-bit qemu (RHBZ#857026). # on i386 only. This works around a bug in 32-bit qemu (RHBZ#857026).
Patch3: 0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch Patch3: 0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch
# Upstream patch to label the custom $TMPDIR used in test-launch-race.
# (Can be removed when 1.19.45 released and/or RHBZ#860235 is fixed).
Patch4: 0001-test-launch-race-Add-SELinux-label-to-TMPDIR.patch
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%endif %endif
@ -294,7 +290,7 @@ Requires: fuse
# For libvirt attach method. # For libvirt attach method.
Requires: libvirt-daemon-qemu >= 0.10.2-3 Requires: libvirt-daemon-qemu >= 0.10.2-3
Requires: selinux-policy >= 3.11.1-23 Requires: selinux-policy >= 3.11.1-25
# Provide our own custom requires for the supermin appliance. # Provide our own custom requires for the supermin appliance.
Source1: libguestfs-find-requires.sh Source1: libguestfs-find-requires.sh
@ -700,7 +696,6 @@ autoreconf -i
%endif %endif
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
mkdir -p daemon/m4 mkdir -p daemon/m4