[libguestfs] Upstream patch: tests/protocol: Contains a Perl test so we must set PERL5LIB.
Richard W.M. Jones
rjones at fedoraproject.org
Thu Dec 22 19:15:29 UTC 2011
commit a4ba2f6ba956f0c11711caf49ecc831231ca25be
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Thu Dec 22 19:15:14 2011 +0000
Upstream patch: tests/protocol: Contains a Perl test so we must set PERL5LIB.
...col-Contains-a-Perl-test-so-we-must-set-P.patch | 28 ++++++++++++++++++++
libguestfs.spec | 12 +++++++-
2 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/0001-tests-protocol-Contains-a-Perl-test-so-we-must-set-P.patch b/0001-tests-protocol-Contains-a-Perl-test-so-we-must-set-P.patch
new file mode 100644
index 0000000..bc31cb9
--- /dev/null
+++ b/0001-tests-protocol-Contains-a-Perl-test-so-we-must-set-P.patch
@@ -0,0 +1,28 @@
+From 37aba887d7494a8d970a860e190bd77765d6b440 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Thu, 22 Dec 2011 19:12:14 +0000
+Subject: [PATCH] tests/protocol: Contains a Perl test so we must set
+ PERL5LIB.
+
+This fixes commit 498758faee6be7e989869bf7feba5e1026a1bb65.
+---
+ tests/protocol/Makefile.am | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/tests/protocol/Makefile.am b/tests/protocol/Makefile.am
+index 0d899dd..ce9282e 100644
+--- a/tests/protocol/Makefile.am
++++ b/tests/protocol/Makefile.am
+@@ -32,7 +32,8 @@ TESTS_ENVIRONMENT = \
+ MALLOC_PERTURB_=$(random_val) \
+ LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+- TMPDIR=$(top_builddir)
++ TMPDIR=$(top_builddir) \
++ PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
+
+ EXTRA_DIST = \
+ $(TESTS)
+--
+1.7.6
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 3354e5c..793f68b 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,13 +30,17 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.15.13
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
Source0: http://libguestfs.org/download/1.15-development/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# Upstream patch: tests/protocol: Contains a Perl test so we must set PERL5LIB.
+Patch0: 0001-tests-protocol-Contains-a-Perl-test-so-we-must-set-P.patch
+BuildRequires: automake
+
%if 0%{?rhel} >= 7
ExclusiveArch: x86_64
%endif
@@ -588,6 +592,9 @@ for %{name}.
%prep
%setup -q
+%patch0 -p1
+automake
+
mkdir -p daemon/m4
# Replace developer-specific README that ships with libguestfs, with
@@ -963,10 +970,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Thu Dec 22 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.15.13-1
+* Thu Dec 22 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.15.13-2
- New upstream version 1.15.13.
- Fixes Security: Mitigate possible privilege escalation via SG_IO ioctl
(CVE-2011-4127, RHBZ#757071).
+- Upstream patch: tests/protocol: Contains a Perl test so we must set PERL5LIB.
* Thu Dec 22 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.15.12-1
- New upstream version 1.15.12.
More information about the scm-commits
mailing list