From 9b64947560865c49b4ce80195e695b1e627cd9b0 Mon Sep 17 00:00:00 2001
From: William Eden Cohen <wcohen@fedoraproject.org>
Date: Thu, 21 Feb 2008 16:10:49 +0000
Subject: [PATCH] Correct some patch names

---
 systemtap-0.6.1-elfi.patch  | 15 ++++++++
 systemtap-0.6.1-gcc43.patch | 71 +++++++++++++++++++++++++++++++++++++
 systemtap.spec              |  6 ++--
 3 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 systemtap-0.6.1-elfi.patch
 create mode 100644 systemtap-0.6.1-gcc43.patch

diff --git a/systemtap-0.6.1-elfi.patch b/systemtap-0.6.1-elfi.patch
new file mode 100644
index 0000000..4ccf3c9
--- /dev/null
+++ b/systemtap-0.6.1-elfi.patch
@@ -0,0 +1,15 @@
+Index: runtime/stack-i386.c
+===================================================================
+RCS file: /cvs/systemtap/src/runtime/stack-i386.c,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -U2 -u -r1.6 -r1.7
+--- runtime/stack-i386.c	18 Jan 2008 08:47:31 -0000	1.6
++++ runtime/stack-i386.c	27 Jan 2008 18:27:40 -0000	1.7
+@@ -24,5 +24,5 @@
+                 #ifdef STAPCONF_X86_UNIREGS
+                 unsigned long ebp = regs->bp;
+-                #elif
++                #else
+ 		unsigned long ebp = regs->ebp;
+ 		#endif
diff --git a/systemtap-0.6.1-gcc43.patch b/systemtap-0.6.1-gcc43.patch
new file mode 100644
index 0000000..9691391
--- /dev/null
+++ b/systemtap-0.6.1-gcc43.patch
@@ -0,0 +1,71 @@
+diff -up systemtap-0.6.1/staptree.cxx.orig systemtap-0.6.1/staptree.cxx
+--- systemtap-0.6.1/staptree.cxx.orig	2008-01-17 21:53:20.000000000 -0500
++++ systemtap-0.6.1/staptree.cxx	2008-02-12 11:16:00.000000000 -0500
+@@ -2370,3 +2370,30 @@ deep_copy_visitor::deep_copy (expression
+   require <expression*> (&v, &n, s);
+   return n;
+ }
++
++template <> void
++require <indexable *> (deep_copy_visitor* v, indexable** dst, indexable* src)
++{
++  if (src != NULL)
++    {
++      symbol *array_src=NULL, *array_dst=NULL;
++      hist_op *hist_src=NULL, *hist_dst=NULL;
++
++      classify_indexable(src, array_src, hist_src);
++
++      *dst = NULL;
++
++      if (array_src)
++	{
++	  require <symbol*> (v, &array_dst, array_src);
++	  *dst = array_dst;
++	}
++      else
++	{
++	  require <hist_op*> (v, &hist_dst, hist_src);
++	  *dst = hist_dst;
++	}
++      assert (*dst);
++    }
++}
++
+diff -up systemtap-0.6.1/staptree.h.orig systemtap-0.6.1/staptree.h
+--- systemtap-0.6.1/staptree.h.orig	2008-01-17 21:53:20.000000000 -0500
++++ systemtap-0.6.1/staptree.h	2008-02-12 11:16:00.000000000 -0500
+@@ -846,31 +846,8 @@ require (deep_copy_visitor* v, T* dst, T
+     }
+ }
+ 
+-template <> static void
+-require <indexable *> (deep_copy_visitor* v, indexable** dst, indexable* src)
+-{
+-  if (src != NULL)
+-    {
+-      symbol *array_src=NULL, *array_dst=NULL;
+-      hist_op *hist_src=NULL, *hist_dst=NULL;
+-
+-      classify_indexable(src, array_src, hist_src);
+-
+-      *dst = NULL;
+-
+-      if (array_src)
+-	{
+-	  require <symbol*> (v, &array_dst, array_src);
+-	  *dst = array_dst;
+-	}
+-      else
+-	{
+-	  require <hist_op*> (v, &hist_dst, hist_src);
+-	  *dst = hist_dst;
+-	}
+-      assert (*dst);
+-    }
+-}
++template <> void
++require <indexable *> (deep_copy_visitor* v, indexable** dst, indexable* src);
+ 
+ template <typename T> void
+ provide (deep_copy_visitor* v, T src)
diff --git a/systemtap.spec b/systemtap.spec
index 6958eaa..d60957f 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -1,5 +1,5 @@
 # Release number for rpm build.  Stays at 1 for new PACKAGE_VERSION increases.
-%define release 5
+%define release 6
 # Version number of oldest elfutils release that works with systemtap.
 %define elfutils_version 0.131
 
@@ -45,8 +45,8 @@ Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz
-Patch100: systemtap-0.6.1-gcc43.diff
-Patch101: systemtap-0.6.1-elfi.diff
+Patch100: systemtap-0.6.1-gcc43.patch
+Patch101: systemtap-0.6.1-elfi.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)