New upstream version 1.21.12.

- Remove patch, now upstream.
This commit is contained in:
Richard W.M. Jones 2013-02-19 19:29:29 +00:00
parent 95a41e67df
commit f8e07a976d
3 changed files with 5 additions and 39 deletions

View File

@ -1,34 +0,0 @@
From c598e14052399f19d36d7874d7133cba779bd3c2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 14 Feb 2013 22:15:25 +0000
Subject: [PATCH] appliance: Use a glibc trick to try to display a stack trace
if a program in the appliance segfaults.
---
appliance/init | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/appliance/init b/appliance/init
index dee4efc..e7e59da 100755
--- a/appliance/init
+++ b/appliance/init
@@ -10,6 +10,16 @@ RUNLEVEL=S
PREVLEVEL=N
export RUNLEVEL PREVLEVEL
+# Try to print a stack trace for segfaults inside the appliance.
+for d in /lib64 /lib; do
+ f=$d/libSegFault.so
+ if [ -f "$f" ]; then
+ LD_PRELOAD=$f
+ export LD_PRELOAD
+ break
+ fi
+done
+
mkdir -p /sysroot
if [ ! -d /proc ]; then rm -f /proc; fi
--
1.8.1.2

View File

@ -33,8 +33,6 @@ Patch1: ruby-1.9-vendor-not-site.patch
BuildRequires: autoconf, automake, libtool, gettext-devel
%endif
Patch2: 0001-appliance-Use-a-glibc-trick-to-try-to-display-a-stac.patch
# Basic build requirements:
BuildRequires: perl(Pod::Simple)
BuildRequires: perl(Pod::Man)
@ -686,8 +684,6 @@ fi
autoreconf -i
%endif
%patch2 -p1
mkdir -p daemon/m4
# Replace developer-centric README that ships with libguestfs, with
@ -1036,6 +1032,10 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
%changelog
* Tue Feb 19 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.12-1
- New upstream version 1.21.12.
- Remove patch, now upstream.
* Thu Feb 14 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.11-2
- New upstream version 1.21.11.
- Add experimental patch to capture stack trace of segfaults in the appliance.

View File

@ -1 +1 @@
85bad8071ad14c610e0f77edc4f8c04f libguestfs-1.21.11.tar.gz
de96dc499fbb752d0a29e43148ba7103 libguestfs-1.21.12.tar.gz