rpms/hddtemp/EL-6 hddtemp-0.3-beta15-reg-eip.patch, NONE, 1.1 hddtemp.spec, 1.29, 1.30

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/hddtemp/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18072

Modified Files:
	hddtemp.spec 
Added Files:
	hddtemp-0.3-beta15-reg-eip.patch 
Log Message:
* Sun Feb 14 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.20.beta15
- Patch to fix ix86 build if sys/ucontext.h is pulled in by signal.h (#564857).


hddtemp-0.3-beta15-reg-eip.patch:
 backtrace.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE hddtemp-0.3-beta15-reg-eip.patch ---
__USE_GNU needs to be in effect when including sys/ucontext.h,
and signal.h pulls it in in some setups.

diff -up hddtemp-0.3-beta15/src/backtrace.c~ hddtemp-0.3-beta15/src/backtrace.c
--- hddtemp-0.3-beta15/src/backtrace.c~	2006-04-19 05:38:14.000000000 +0300
+++ hddtemp-0.3-beta15/src/backtrace.c	2010-02-14 21:59:47.000000000 +0200
@@ -27,13 +27,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <linux/ptrace.h>
+#define __USE_GNU
+#include <ucontext.h>
 #include <signal.h>
 #include <bits/sigcontext.h>
 #include <sys/param.h>
 
-#define __USE_GNU
-#include <ucontext.h>
-
 #define MAX_BTSIZE 64
 
 void backtrace_handler(int n, siginfo_t *ist, void *extra) {


Index: hddtemp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hddtemp/EL-6/hddtemp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- hddtemp.spec	20 Aug 2009 14:16:23 -0000	1.29
+++ hddtemp.spec	1 Jun 2010 19:48:14 -0000	1.30
@@ -2,7 +2,7 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.19.%{beta}%{?dist}
+Release:        0.20.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -16,6 +16,8 @@ Source4:        %{name}.pam
 Source5:        %{name}.consoleapp
 Patch0:         %{name}-db.patch
 Patch1:         http://ftp.debian.org/debian/pool/main/h/hddtemp/hddtemp_0.3-beta15-45.diff.gz
+# http://savannah.nongnu.org/bugs/index.php?28896
+Patch2:         %{name}-0.3-beta15-reg-eip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -32,6 +34,7 @@ reading S.M.A.R.T. information.
 cp -p %{SOURCE1} ./hddtemp.db
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 sed -i -e s/Celius/Celsius/g src/hddtemp.c po/*.po*
 sed -i -e 's|/etc/hddtemp.db|/usr/share/misc/hddtemp.db|' doc/hddtemp.8
 sed -e 's|__ETCDIR__|%{_sysconfdir}|g' \
@@ -93,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 14 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.20.beta15
+- Patch to fix ix86 build if sys/ucontext.h is pulled in by signal.h (#564857).
+
 * Thu Aug 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.19.beta15
 - Try to start daemon for all disks if none are specified in sysconfig.
 - Update URLs.