[packages/systemtap] - fix format string errors on x32

[baggins]

commit 1a30c95473c54a62473a5e72a4bed16f1716847f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Dec 31 20:04:02 2014 +0000

    - fix format string errors on x32

 format-security.patch | 26 ++++++++++++++++++++++++++
 systemtap.spec        |  2 ++
 2 files changed, 28 insertions(+)
---
diff --git a/systemtap.spec b/systemtap.spec
index f9e179a..fffba1e 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -27,6 +27,7 @@ Patch0:		%{name}-configure.patch
 Patch1:		%{name}-build.patch
 Patch2:		%{name}-rpm5-support.patch
 Patch3:		%{name}-dtrace-flexibility.patch
+Patch4:		format-security.patch
 URL:		http://sourceware.org/systemtap/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
@@ -222,6 +223,7 @@ dtrace, który przetwarza pliki .d na pliki nagłówkowe .h z makrami
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
 %if "%{_rpmversion}" >= "5.0"
 %patch2 -p1
 %endif
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..1f37dfb
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,26 @@
+--- systemtap-2.6/cache.cxx~	2014-09-05 21:33:21.000000000 +0000
++++ systemtap-2.6/cache.cxx	2014-12-31 20:01:49.768965553 +0000
+@@ -294,7 +294,11 @@
+         {
+           //interval not passed, don't continue
+           if (s.verbose > 1)
++#ifdef __ILP32__
++            clog << _F("Cache cleaning skipped, interval not reached %llu s / %lu s.",
++#else
+             clog << _F("Cache cleaning skipped, interval not reached %lu s / %lu s.",
++#endif
+                        (current_time.tv_sec-sb.st_mtime), cache_clean_interval)  << endl;
+           return;
+         }
+@@ -302,7 +306,11 @@
+         {
+           //interval reached, continue
+           if (s.verbose > 1)
++#ifdef __ILP32__
++            clog << _F("Cleaning cache, interval reached %llu s > %lu s.",
++#else
+             clog << _F("Cleaning cache, interval reached %lu s > %lu s.",
++#endif
+                        (current_time.tv_sec-sb.st_mtime), cache_clean_interval)  << endl;
+         }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/systemtap.git/commitdiff/1a30c95473c54a62473a5e72a4bed16f1716847f