From 560500a41ffc8053dfb59b927abf8fa922d40b08 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 31 Dec 2023 20:30:31 +0100
Subject: [PATCH] - rediffed patches

---
 systemtap-configure.patch | 11 ++++++-----
 systemtap-no-werror.patch | 34 ++++++++++++++++++----------------
 systemtap.spec            |  2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/systemtap-configure.patch b/systemtap-configure.patch
index 13e9b3a..b6310e5 100644
--- a/systemtap-configure.patch
+++ b/systemtap-configure.patch
@@ -1,8 +1,9 @@
---- systemtap-1.4/configure.ac~	2011-01-17 12:31:41.000000000 +0100
-+++ systemtap-1.4/configure.ac	2011-05-17 11:16:21.590000069 +0200
-@@ -548,6 +548,9 @@
-   AC_CHECK_HEADERS([elfutils/version.h])
- fi
+diff -urNp -x '*.orig' systemtap-3.3.org/configure.ac systemtap-3.3/configure.ac
+--- systemtap-3.3.org/configure.ac	2018-06-09 00:28:59.000000000 +0200
++++ systemtap-3.3/configure.ac	2023-12-31 20:29:34.779094763 +0100
+@@ -957,6 +957,9 @@ AS_IF([test "x$have_http_support" = "xye
+ 	    [Define to 1 if the base client code is needed.])
+ ])
  
 +CPPFLAGS="${CPPFLAGS} -I/usr/include/rpm"
 +LIBS="${LIBS} -lrpmdb"
diff --git a/systemtap-no-werror.patch b/systemtap-no-werror.patch
index c5d94ff..f88e273 100644
--- a/systemtap-no-werror.patch
+++ b/systemtap-no-werror.patch
@@ -1,6 +1,21 @@
---- systemtap-3.0/configure.ac.orig	2016-04-05 20:34:37.752195113 +0200
-+++ systemtap-3.0/configure.ac	2016-04-05 20:44:11.672171031 +0200
-@@ -93,8 +93,8 @@
+diff -urNp -x '*.orig' systemtap-3.3.org/Makefile.am systemtap-3.3/Makefile.am
+--- systemtap-3.3.org/Makefile.am	2023-12-31 20:30:07.434486586 +0100
++++ systemtap-3.3/Makefile.am	2023-12-31 20:30:07.645489118 +0100
+@@ -17,8 +17,8 @@ AM_CPPFLAGS = -DBINDIR='"$(bindir)"' \
+               -DPY3EXECDIR='"$(py3execdir)"' \
+ 	      -I$(srcdir)/includes -I$(builddir)/includes/sys
+ 
+-AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Wextra -Werror -Wunused -Wformat=2 -W
+-AM_CXXFLAGS = -Wall -Wextra -Werror
++AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Wextra -Wunused -Wformat=2 -W
++AM_CXXFLAGS = -Wall -Wextra
+ 
+ bin_SCRIPTS = stap-report
+ pkglibexec_SCRIPTS = stap-env
+diff -urNp -x '*.orig' systemtap-3.3.org/configure.ac systemtap-3.3/configure.ac
+--- systemtap-3.3.org/configure.ac	2023-12-31 20:30:07.436486610 +0100
++++ systemtap-3.3/configure.ac	2023-12-31 20:30:07.645489118 +0100
+@@ -191,8 +191,8 @@ AC_ARG_ENABLE([ssp],
  AS_IF([test "x$enable_ssp" != xno],[
     save_CFLAGS="$CFLAGS"
     save_CXXFLAGS="$CXXFLAGS"
@@ -11,16 +26,3 @@
     AC_COMPILE_IFELSE([AC_LANG_SOURCE([int something ();])], [
         AC_MSG_NOTICE([Compiling with gcc -fstack-protector-all et al.])
  	CFLAGS="$save_CFLAGS -fstack-protector-all -D_FORTIFY_SOURCE=2"
---- systemtap-3.0/Makefile.am.orig	2016-04-05 20:44:51.275502703 +0200
-+++ systemtap-3.0/Makefile.am	2016-04-05 20:51:00.125487222 +0200
-@@ -14,8 +14,8 @@
- 	      -DLOCALEDIR='"$(localedir)"' \
- 	      -I$(srcdir)/includes -I$(builddir)/includes/sys
- 
--AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Wextra -Werror -Wunused -Wformat=2 -W
--AM_CXXFLAGS = -Wall -Wextra -Werror
-+AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Wextra -Wunused -Wformat=2 -W
-+AM_CXXFLAGS = -Wall -Wextra
- 
- bin_SCRIPTS = stap-report
- pkglibexec_SCRIPTS = stap-env
diff --git a/systemtap.spec b/systemtap.spec
index ae889e1..04c911e 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -18,7 +18,7 @@ Summary:	Instrumentation System
 Summary(pl.UTF-8):	System oprzyrządowania
 Name:		systemtap
 Version:	3.3
-Release:	5
+Release:	6
 License:	GPL v2+
 Group:		Base
 Source0:	http://sourceware.org/systemtap/ftp/releases/%{name}-%{version}.tar.gz
-- 
2.44.0