rpms/xsupplicant/devel XSupplicant-2.1.8-ppc-fix.patch, NONE, 1.1 xsupplicant.spec, 1.44, 1.45

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/xsupplicant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13112

Modified Files:
	xsupplicant.spec 
Added Files:
	XSupplicant-2.1.8-ppc-fix.patch 
Log Message:
fix ppc, not run tested

XSupplicant-2.1.8-ppc-fix.patch:
 sigsegv.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

--- NEW FILE XSupplicant-2.1.8-ppc-fix.patch ---
diff -up XSupplicant-2.1.8-src/xsupplicant/lib/libcrashdump/sigsegv.c.ppc XSupplicant-2.1.8-src/xsupplicant/lib/libcrashdump/sigsegv.c
--- XSupplicant-2.1.8-src/xsupplicant/lib/libcrashdump/sigsegv.c.ppc	2009-05-26 19:16:26.000000000 -0400
+++ XSupplicant-2.1.8-src/xsupplicant/lib/libcrashdump/sigsegv.c	2009-09-02 17:57:26.857041963 -0400
@@ -81,7 +81,21 @@ static void signal_segv(int signum, sigi
     // NGREG not defined on Mac OS X...
 #ifndef __APPLE__
     for(i = 0; i < NGREG; i++)
+#if defined(__linux__)
+        #if defined(__powerpc__)
+        #if defined(__powerpc64__)
+        fprintf(fh, "reg[%02d]       = 0x" REGFORMAT "\n", i, ucontext->uc_mcontext.gp_regs[i]);
+        #else
+        fprintf(fh, "reg[%02d]       = 0x" REGFORMAT "\n", i, ucontext->uc_mcontext.uc_regs->gregs[i]);
+        #endif
+        #else
+        /* This is a bit of a lie, ia64 is also special, but I don't care. */
         fprintf(fh, "reg[%02d]       = 0x" REGFORMAT "\n", i, ucontext->uc_mcontext.gregs[i]);
+        #endif
+#else
+	/* This is probably not right for any OS besides Solaris x86. */
+	fprintf(fh, "reg[%02d]       = 0x" REGFORMAT "\n", i, ucontext->uc_mcontext.gregs[i]);
+#endif
 #else
     fprintf(fh, "NGREG Not available on Mac OS X.\n");
 #endif


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- xsupplicant.spec	2 Sep 2009 16:55:48 -0000	1.44
+++ xsupplicant.spec	3 Sep 2009 00:23:23 -0000	1.45
@@ -1,13 +1,14 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	2.1.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+ or BSD with advertising
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
 Source0:	http://download.sourceforge.net/open1x/XSupplicant-%{version}-src.tar.gz
 Source1:	XSupplicantUI.desktop
 Patch2:		xsupplicant-2.1.8-ui-Fedora.patch
+Patch3:		XSupplicant-2.1.8-ppc-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool, dos2unix, libxml2-devel, pcsc-lite-devel, libtnc-devel
 BuildRequires:	openssl-devel, wireless-tools-devel
@@ -41,6 +42,8 @@ QT User Interface for XSupplicant.
 %setup -q -n XSupplicant-%{version}-src
 # Find UI files in a sane system location
 %patch2 -p1 -b .Fedora
+# Fix PPC (enough to get it building, not run-tested)
+%patch3 -p1 -b .ppc
 cd xsupplicant
 autoreconf -vfis
 
@@ -122,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 
 %changelog
+* Wed Sep  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.8-2
+- duct tape fix for ppc/ppc64, not run-tested
+
 * Wed Sep  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1.8-1
 - update to 2.1.8