Tue Oct 2 03:23:10 UTC 2007

Author: mclasen

Update of /cvs/extras/rpms/bug-buddy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9942

Modified Files:
	bug-buddy.spec 
Added Files:
	email-check.patch gnome-breakpad-fixes.patch 
	gnome-breakpad-libversion.patch 
	google-breakpad-conditional.patch google-breakpad-r216.patch 
Removed Files:
	bug-buddy-2.10.0-gmenu.patch bug-buddy-2.12.0-dupe.patch 
	bug-buddy-2.12.0-save.patch bug-buddy-2.12.0-title.patch 
	bug-buddy-2.13.0-save.patch bug-buddy-2.16.0-sysinfo.patch 
	bug-buddy-2.18.0-dupe-apps.patch 
Log Message:
Incorporate upstream fixes


email-check.patch:

--- NEW FILE email-check.patch ---
--- trunk/src/bug-buddy.c	2007/09/22 07:35:45	2429
+++ trunk/src/bug-buddy.c	2007/09/25 15:55:33	2430
@@ -823,12 +823,9 @@
 		return FALSE;
 
 	for (character = local_part; *character; character++) {
-		/* If character is alphanumeric it is valid. */
-		if (g_ascii_isalnum (*character))
-			continue;
-
-		/* If character is "-", "_" or "." it is valid. */
-		if (*character == '-' || *character == '_' || *character == '.')
+		/* RFC 3696 says *any* printable ASCII character can
+		 * appear in local-part, subject to quoting rules. */
+		if (g_ascii_isprint (*character))
 			continue;
 
 		/* Not valid character, not valid local part. */
@@ -903,21 +900,25 @@
 {
 	char *local_part;
 	char *domain;
-	char **parts;
+	char *at_sign;
 	gboolean is_valid;
 
-	parts = g_strsplit (address, "@", 2);
+	/* Split on the *last* '@' character: */
+	at_sign = strrchr (address, '@');
 
-	/* Check we have the 2 parts */
-	if (!(local_part = parts[0]) || !(domain = parts[1])) {
-		g_strfreev (parts);
+	if (at_sign == NULL) 
 		return FALSE;
-	}
 
+	local_part = g_strndup (address, at_sign - address);
+	domain = g_strdup (at_sign + 1);
+
+	/* Check each part is valid */
 	is_valid = email_local_part_is_valid (local_part)
 		&& email_domain_is_valid (domain);
 
-	g_strfreev (parts);
+	g_free (local_part);
+	g_free (domain);
+
 	return is_valid;
 }
 

gnome-breakpad-fixes.patch:

--- NEW FILE gnome-breakpad-fixes.patch ---
diff -up bug-buddy-2.20.0/gnome-breakpad/gnome-breakpad.cc.swt-fix bug-buddy-2.20.0/gnome-breakpad/gnome-breakpad.cc
--- bug-buddy-2.20.0/gnome-breakpad/gnome-breakpad.cc.swt-fix	2007-10-01 22:56:15.000000000 -0400
+++ bug-buddy-2.20.0/gnome-breakpad/gnome-breakpad.cc	2007-10-01 22:57:03.000000000 -0400
@@ -23,10 +23,11 @@
 
 #include <config.h>
 
-
+#ifdef ENABLE_GOOGLE_BREAKPAD
 #include "client/linux/handler/exception_handler.h"
 
 using namespace google_breakpad;
+#endif
 
 extern "C" int gtk_module_init (int *argc, char** argv[]);
 static bool    run_bug_buddy   (const gchar *appname, pid_t pid, const gchar *minidump_path);
@@ -105,6 +106,8 @@ find_in_debug_path (const char *filename
 	tries[1] = g_build_filename (dir, ".debug", debug_filename, NULL);
 	tries[2] = g_build_filename ("/usr", "lib", "debug", dir, debug_filename, NULL);
 
+	g_free (dir);
+
 	for (i = 0; i < N_TRIES; ++i) {
 		if (g_file_test (tries[i], G_FILE_TEST_EXISTS))
 			return true;
@@ -291,22 +294,59 @@ gtk_module_init (int *argc, char** argv[
 	
 	if (bugbuddy && !g_getenv ("GNOME_DISABLE_CRASH_DIALOG")) {
 #ifdef ENABLE_GOOGLE_BREAKPAD
+        	static struct sigaction old_action;
+
+		sigaction(SIGSEGV, NULL, &old_action);
+		if (old_action.sa_handler != SIG_DFL)
+			return 0;
+
+                sigaction(SIGABRT, NULL, &old_action);
+		if (old_action.sa_handler != SIG_DFL)
+			return 0;
+
+                sigaction(SIGTRAP, NULL, &old_action);
+		if (old_action.sa_handler != SIG_DFL)
+			return 0;
+
+                sigaction(SIGFPE, NULL, &old_action);
+		if (old_action.sa_handler != SIG_DFL)
+			return 0;
+
+                sigaction(SIGBUS, NULL, &old_action);
+		if (old_action.sa_handler != SIG_DFL)
+			return 0;
+
   		static ExceptionHandler handler("/tmp", check_if_gdb,
 						MinidumpCallback, NULL, true);
 #else
         	static struct sigaction *setptr;
+        	static struct sigaction old_action;
         	struct sigaction sa;
                 memset(&sa, 0, sizeof(sa));
                 setptr = &sa;
 
                 sa.sa_handler = bugbuddy_segv_handle;
 
-                sigaction(SIGSEGV, setptr, NULL);
-                sigaction(SIGABRT, setptr, NULL);
-                sigaction(SIGTRAP, setptr, NULL);
-                sigaction(SIGFPE, setptr, NULL);
-                sigaction(SIGBUS, setptr, NULL);
+                sigaction(SIGSEGV, NULL, &old_action);
+		if (old_action.sa_handler == SIG_DFL)
+                	sigaction(SIGSEGV, setptr, NULL);
+
+                sigaction(SIGABRT, NULL, &old_action);
+		if (old_action.sa_handler == SIG_DFL)
+                	sigaction(SIGABRT, setptr, NULL);
+
+                sigaction(SIGTRAP, NULL, &old_action);
+		if (old_action.sa_handler == SIG_DFL)
+                	sigaction(SIGTRAP, setptr, NULL);
+
+                sigaction(SIGFPE, NULL, &old_action);
+		if (old_action.sa_handler == SIG_DFL)
+                	sigaction(SIGFPE, setptr, NULL);
+
+                sigaction(SIGBUS, NULL, &old_action);
+		if (old_action.sa_handler == SIG_DFL)
+                	sigaction(SIGBUS, setptr, NULL);
 #endif
 	}
-  
+	return 0;
 }

gnome-breakpad-libversion.patch:

--- NEW FILE gnome-breakpad-libversion.patch ---
--- trunk/configure.in	2007/09/25 16:09:26	2433
+++ trunk/configure.in	2007/09/25 16:32:04	2434
@@ -12,6 +12,7 @@
 
 AM_MAINTAINER_MODE
 IT_PROG_INTLTOOL([0.35.0])
+AM_DISABLE_STATIC
 
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 AM_GCONF_SOURCE_2
--- trunk/gnome-breakpad/Makefile.am	2007/09/25 16:09:26	2433
+++ trunk/gnome-breakpad/Makefile.am	2007/09/25 16:32:04	2434
@@ -23,5 +23,4 @@
 
 libgnomebreakpad_la_LIBADD = $(GOOGLE_BREAKPAD_LIBS) $(GNOME_BREAKPAD_LIBS)
 
-
-
+libgnomebreakpad_la_LDFLAGS = -rpath $(moduledir) -module -avoid-version @LDFLAGS@

google-breakpad-conditional.patch:

--- NEW FILE google-breakpad-conditional.patch ---
Index: configure.in
===================================================================
--- configure.in	(revision 2439)
+++ configure.in	(revision 2441)
@@ -80,9 +80,14 @@
 AC_CONFIG_SUBDIRS(google-breakpad)
 GOOGLE_BREAKPAD_SUPPORTED_OS="no"
 case $target_os in
-    solaris*) ;;
+    solaris*)
+	solaris=yes
+	GOOGLE_BREAKPAD_SUPPORTED_OS="yes"
+	;;
     linux*)
-       GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
+	linux=yes
+	GOOGLE_BREAKPAD_SUPPORTED_OS="yes"
+	;;
 esac
 
 GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
@@ -100,6 +105,8 @@
 fi
 
 AM_CONDITIONAL(USE_GOOGLE_BREAKPAD, test x$use_google_breakpad = xyes)
+AM_CONDITIONAL(BREAKPAD_SOLARIS, test x$solaris = xyes)
+AM_CONDITIONAL(BREAKPAD_LINUX, test x$linux = xyes)
 
 GDK_REQUIRED="gdk-2.0 >= 2.9"
 PKG_CHECK_MODULES(GNOME_BREAKPAD,
Index: gnome-breakpad/Makefile.am
===================================================================
--- gnome-breakpad/Makefile.am	(revision 2439)
+++ gnome-breakpad/Makefile.am	(revision 2441)
@@ -1,26 +1,41 @@
 INCLUDES = -I. -I$(top_srcdir)/google-breakpad/src -DNDEBUG -D_REENTRANT $(GNOME_BREAKPAD_CFLAGS)
+
+
 if USE_GOOGLE_BREAKPAD
-GOOGLE_BREAPAD_CC_SOURCES = 	\
-	$(top_srcdir)/google-breakpad/src/client/linux/handler/exception_handler.cc \
+
+if BREAKPAD_SOLARIS
+dir = solaris
+GOOGLE_BREAKPAD_CC_EXTRA = \
+	$(top_srcdir)/google-breakpad/src/client/solaris/handler/solaris_lwp.cc
+endif 
+
+if BREAKPAD_LINUX
+dir = linux
+GOOGLE_BREAKPAD_CC_EXTRA = \
 	$(top_srcdir)/google-breakpad/src/client/linux/handler/linux_thread.cc \
+	$(top_srcdir)/google-breakpad/src/common/linux/md5.c
+endif
+
+
+GOOGLE_BREAKPAD_CC = 	\
+	$(top_srcdir)/google-breakpad/src/client/$(dir)/handler/exception_handler.cc \
+	$(top_srcdir)/google-breakpad/src/client/$(dir)/handler/minidump_generator.cc \
+	$(top_srcdir)/google-breakpad/src/common/$(dir)/file_id.cc \
+	$(top_srcdir)/google-breakpad/src/common/$(dir)/guid_creator.cc \
 	$(top_srcdir)/google-breakpad/src/client/minidump_file_writer.cc  \
-	$(top_srcdir)/google-breakpad/src/client/linux/handler/minidump_generator.cc \
 	$(top_srcdir)/google-breakpad/src/common/string_conversion.cc \
 	$(top_srcdir)/google-breakpad/src/common/convert_UTF.c \
-	$(top_srcdir)/google-breakpad/src/common/linux/guid_creator.cc \
-	$(top_srcdir)/google-breakpad/src/common/linux/file_id.cc \
-	$(top_srcdir)/google-breakpad/src/common/linux/md5.c
+	$(GOOGLE_BREAKPAD_CC_EXTRA)
+
 GOOGLE_BREAKPAD_LIBS = $(top_builddir)/google-breakpad/src/libbreakpad.la -lpthread
 endif
 
-cc_sources = gnome-breakpad.cc $(GOOGLE_BREAPAD_CC_SOURCES)
 
+
 module_LTLIBRARIES = libgnomebreakpad.la
 
 moduledir = $(libdir)/gtk-2.0/modules
 
-libgnomebreakpad_la_SOURCES = $(cc_sources)
-
+libgnomebreakpad_la_SOURCES = gnome-breakpad.cc $(GOOGLE_BREAKPAD_CC)
 libgnomebreakpad_la_LIBADD = $(GOOGLE_BREAKPAD_LIBS) $(GNOME_BREAKPAD_LIBS)
-
 libgnomebreakpad_la_LDFLAGS = -rpath $(moduledir) -module -avoid-version @LDFLAGS@

google-breakpad-r216.patch:

--- NEW FILE google-breakpad-r216.patch ---
Index: google-breakpad/src/processor/postfix_evaluator-inl.h
===================================================================
--- google-breakpad/src/processor/postfix_evaluator-inl.h	(revision 2437)
+++ google-breakpad/src/processor/postfix_evaluator-inl.h	(revision 2438)
@@ -1,16 +1,31 @@
-// Copyright (C) 2006 Google Inc.
+// Copyright (c) 2006, Google Inc.
+// All rights reserved.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // postfix_evaluator-inl.h: Postfix (reverse Polish) notation expression
 // evaluator.
Index: google-breakpad/src/processor/stackwalker.cc
===================================================================
--- google-breakpad/src/processor/stackwalker.cc	(revision 2437)
+++ google-breakpad/src/processor/stackwalker.cc	(revision 2438)
@@ -49,6 +49,7 @@
 #include "processor/scoped_ptr.h"
 #include "processor/stack_frame_info.h"
 #include "processor/stackwalker_ppc.h"
+#include "processor/stackwalker_sparc.h"
 #include "processor/stackwalker_x86.h"
 
 namespace google_breakpad {
@@ -163,6 +164,13 @@
                                            memory, modules, supplier,
                                            resolver);
       break;
+  
+    case MD_CONTEXT_SPARC:
+      cpu_stackwalker = new StackwalkerSPARC(system_info,
+                                             context->GetContextSPARC(),
+                                             memory, modules, supplier,
+                                             resolver);
+      break;
   }
 
   BPLOG_IF(ERROR, !cpu_stackwalker) << "Unknown CPU type " << HexString(cpu) <<
Index: google-breakpad/src/processor/stackwalker_selftest_sol.s
===================================================================
--- google-breakpad/src/processor/stackwalker_selftest_sol.s	(revision 0)
+++ google-breakpad/src/processor/stackwalker_selftest_sol.s	(revision 2438)
@@ -0,0 +1,222 @@
+/* Copyright (c) 2007, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* stackwalker_selftest_sol.s
+ * On Solaris, the recommeded compiler is CC, so we can not use gcc inline
+ * asm, use this method instead.
+ *
+ * How to compile: as -P -L -D_ASM -D_STDC -K PIC -o \
+ *                 src/processor/stackwalker_selftest_sol.o \
+ *                 src/processor/stackwalker_selftest_sol.s
+ *
+ * Author: Michael Shang
+ */
+
+#include <sys/asm_linkage.h>
+
+#if defined(__i386)
+
+
+ENTRY(GetEBP) 
+      pushl    %ebp
+      movl     %esp,%ebp
+      subl     $0x00000004,%esp
+      movl     0x00000000(%ebp),%eax
+      movl     %eax,0xfffffffc(%ebp)
+      movl     0xfffffffc(%ebp),%eax
+      leave    
+      ret      
+SET_SIZE(GetEBP)
+
+ENTRY(GetEIP) 
+      pushl    %ebp
+      movl     %esp,%ebp
+      subl     $0x00000004,%esp
+      movl     0x00000004(%ebp),%eax
+      movl     %eax,0xfffffffc(%ebp)
+      movl     0xfffffffc(%ebp),%eax
+      leave    
+      ret      
+SET_SIZE(GetEIP)
+
+ENTRY(GetESP) 
+      pushl    %ebp
+      movl     %esp,%ebp
+      subl     $0x00000004,%esp
+      movl     %ebp,%eax
+      movl     %eax,0xfffffffc(%ebp)
+      movl     0xfffffffc(%ebp),%eax
+      addl     $0x00000008,%eax
+      leave    
+      ret      
+SET_SIZE(GetESP)
+
+
+#elif defined(__sparc)
+
+
+ENTRY(GetPC)
+      save     %sp, -120, %sp
+      mov      %i7, %i4
+      inccc    8, %i4
+      mov      %i4, %i0
+      ret      
+      restore  
+SET_SIZE(GetPC)
+
+ENTRY(GetSP)
+      save     %sp, -120, %sp
+      mov      %fp, %i4
+      mov      %i4, %i0
+      ret      
+      restore  
+SET_SIZE(GetSP)
+
+ENTRY(GetFP)
+      save     %sp, -120, %sp
+      ld       [%fp + 56], %g1
+      mov      %g1, %i0
+      ret      
+      restore  
+SET_SIZE(GetFP)
+
+
+#endif  // __i386 || __sparc
+/* Copyright (c) 2007, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
[...7249 lines suppressed...]
+	src/client/solaris/handler/solaris_lwp.h \
 	src/client/windows/breakpad_client.sln \
 	src/client/windows/handler/exception_handler.cc \
 	src/client/windows/handler/exception_handler.h \
@@ -254,6 +284,16 @@
 	src/client/linux/handler/linux_thread.h \
 	src/common/convert_UTF.c \
 	src/common/convert_UTF.h \
+	src/common/linux/dump_symbols.cc \
+	src/common/linux/dump_symbols.h \
+	src/common/linux/file_id.cc \
+	src/common/linux/file_id.h \
+	src/common/linux/guid_creator.cc \
+	src/common/linux/guid_creator.h \
+	src/common/linux/http_upload.cc \
+	src/common/linux/http_upload.h \
+	src/common/linux/md5.c \
+	src/common/linux/md5.h \
 	src/common/mac/HTTPMultipartUpload.h \
 	src/common/mac/HTTPMultipartUpload.m \
 	src/common/mac/dump_syms.h \
@@ -262,10 +302,17 @@
 	src/common/mac/file_id.h \
 	src/common/mac/macho_id.cc \
 	src/common/mac/macho_id.h \
+	src/common/mac/macho_utilities.cc \
+	src/common/mac/macho_utilities.h \
 	src/common/mac/macho_walker.cc \
 	src/common/mac/macho_walker.h \
 	src/common/mac/string_utilities.cc \
 	src/common/mac/string_utilities.h \
+	src/common/solaris/file_id.cc \
+	src/common/solaris/file_id.h \
+	src/common/solaris/guid_creator.cc \
+	src/common/solaris/guid_creator.h \
+	src/common/solaris/message_output.h \
 	src/common/string_conversion.cc \
 	src/common/string_conversion.h \
 	src/common/windows/guid_string.cc \
@@ -279,6 +326,14 @@
 	src/common/linux/guid_creator.h \
 	src/common/linux/file_id.h \
 	src/common/linux/md5.h \
+ 	src/tools/linux/dump_syms/Makefile \
+ 	src/tools/linux/dump_syms/dump_syms.cc \
+ 	src/tools/linux/symupload/Makefile \
+ 	src/tools/linux/symupload/minidump_upload.cc \
+ 	src/tools/linux/symupload/sym_upload.cc \
+  	src/tools/mac/crash_report/crash_report.mm \
+  	src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj \
+  	src/tools/mac/crash_report/on_demand_symbol_supplier.h \
 	src/tools/mac/crash_report/crash_report.mm \
 	src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj \
 	src/tools/mac/crash_report/on_demand_symbol_supplier.h \
diff -up google-breakpad/src/processor/stackwalker_sparc.cc.update-fixup google-breakpad/src/processor/stackwalker_sparc.cc
--- google-breakpad/src/processor/stackwalker_sparc.cc.update-fixup	2007-10-01 23:18:44.000000000 -0400
+++ google-breakpad/src/processor/stackwalker_sparc.cc	2007-10-01 23:19:07.000000000 -0400
@@ -137,142 +137,3 @@ StackFrame* StackwalkerSPARC::GetCallerF
 
 
 }  // namespace google_breakpad
-// Copyright (c) 2007, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// stackwalker_sparc.cc: sparc-specific stackwalker.
-//
-// See stackwalker_sparc.h for documentation.
-//
-// Author: Michael Shang
-
-
-#include "google_breakpad/processor/call_stack.h"
-#include "google_breakpad/processor/memory_region.h"
-#include "google_breakpad/processor/stack_frame_cpu.h"
-#include "processor/logging.h"
-#include "processor/stackwalker_sparc.h"
-
-namespace google_breakpad {
-
-
-StackwalkerSPARC::StackwalkerSPARC(const SystemInfo *system_info,
-                                   const MDRawContextSPARC *context,
-                                   MemoryRegion *memory,
-                                   const CodeModules *modules,
-                                   SymbolSupplier *supplier,
-                                   SourceLineResolverInterface *resolver)
-    : Stackwalker(system_info, memory, modules, supplier, resolver),
-      context_(context) {
-}
-
-
-StackFrame* StackwalkerSPARC::GetContextFrame() {
-  if (!context_ || !memory_) {
-    BPLOG(ERROR) << "Can't get context frame without context or memory";
-    return NULL;
-  }
-
-  StackFrameSPARC *frame = new StackFrameSPARC();
-
-  // The instruction pointer is stored directly in a register, so pull it
-  // straight out of the CPU context structure.
-  frame->context = *context_;
-  frame->context_validity = StackFrameSPARC::CONTEXT_VALID_ALL;
-  frame->instruction = frame->context.pc;
-
-  return frame;
-}
-
-
-StackFrame* StackwalkerSPARC::GetCallerFrame(
-    const CallStack *stack,
-    const vector< linked_ptr<StackFrameInfo> > &stack_frame_info) {
-  if (!memory_ || !stack) {
-    BPLOG(ERROR) << "Can't get caller frame without memory or stack";
-    return NULL;
-  }
-
-  StackFrameSPARC *last_frame = static_cast<StackFrameSPARC*>(
-      stack->frames()->back());
-
-  // new: caller
-  // old: callee
-  // %fp, %i6 and g_r[30] is the same, see minidump_format.h
-  // %sp, %o6 and g_r[14] is the same, see minidump_format.h
-  // %sp_new = %fp_old
-  // %fp_new = *(%fp_old + 32 + 32 - 8), where the callee's %i6 
-  // %pc_new = *(%fp_old + 32 + 32 - 4) + 8
-  // which is callee's %i7 plus 8
-
-  // A caller frame must reside higher in memory than its callee frames.
-  // Anything else is an error, or an indication that we've reached the
-  // end of the stack.
-  u_int32_t stack_pointer = last_frame->context.g_r[30];
-  if (stack_pointer <= last_frame->context.g_r[14]) {
-    return NULL;
-  }
-
-  u_int32_t instruction;
-  if (!memory_->GetMemoryAtAddress(stack_pointer + 60,
-                     &instruction) || instruction <= 1) {
-    return NULL;
-  }
-
-  u_int32_t stack_base;
-  if (!memory_->GetMemoryAtAddress(stack_pointer + 56,
-                     &stack_base) || stack_base <= 1) {
-    return NULL;
-  }
-
-  StackFrameSPARC *frame = new StackFrameSPARC();
-
-  frame->context = last_frame->context;
-  frame->context.g_r[14] = stack_pointer;
-  frame->context.g_r[30] = stack_base;
-  
-  // frame->context.pc is the return address, which is 2 instruction
-  // past the branch that caused us to arrive at the callee, which are 
-  // a CALL instruction then a NOP instruction.
-  // frame_ppc->instruction to 8 less than that.  Since all sparc
-  // instructions are 4 bytes wide, this is the address of the branch
-  // instruction.  This allows source line information to match up with the
-  // line that contains a function call.  Callers that require the exact
-  // return address value may access the %i7/g_r[31] field of StackFrameSPARC.
-  frame->context.pc = instruction + 8;
-  frame->instruction = instruction;
-  frame->context_validity = StackFrameSPARC::CONTEXT_VALID_PC |
-                            StackFrameSPARC::CONTEXT_VALID_SP |
-                            StackFrameSPARC::CONTEXT_VALID_FP;
-                            
-  return frame;
-}
-
-
-}  // namespace google_breakpad


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/extras/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- bug-buddy.spec	18 Sep 2007 04:07:17 -0000	1.83
+++ bug-buddy.spec	2 Oct 2007 03:22:35 -0000	1.84
@@ -6,13 +6,18 @@
 
 Name: bug-buddy
 Version: 2.20.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Summary: A bug reporting utility for GNOME
 License: GPLv2 and BSD
 Group: Applications/System
 URL: http://www.gnome.org
 Source: http://download.gnome.org/sources/bug-buddy/2.20/%{name}-%{version}.tar.bz2
+Patch0: email-check.patch
+Patch1: gnome-breakpad-fixes.patch
+Patch2: gnome-breakpad-libversion.patch
+Patch3: google-breakpad-r216.patch
+Patch4: google-breakpad-conditional.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,6 +64,11 @@
 
 %prep
 %setup -q 
+%patch0 -p1 -b .email-check
+%patch1 -p1 -b .gnome-breakpad-fixes
+%patch2 -p1 -b .gnome-breakpad-libversion
+%patch3 -p0 -b .google-breakpad-r216
+%patch4 -p0 -b .google-breakpad-conditional
 
 %build
 %configure --disable-scrollkeeper
@@ -133,6 +143,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Oct  1 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-2
+- Incorporate upstream fixes (#314861)
+
 * Tue Sep 18 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-1
 - Update to 2.20.0
 


--- bug-buddy-2.10.0-gmenu.patch DELETED ---


--- bug-buddy-2.12.0-dupe.patch DELETED ---


--- bug-buddy-2.12.0-save.patch DELETED ---


--- bug-buddy-2.12.0-title.patch DELETED ---


--- bug-buddy-2.13.0-save.patch DELETED ---


--- bug-buddy-2.16.0-sysinfo.patch DELETED ---


--- bug-buddy-2.18.0-dupe-apps.patch DELETED ---


