[satyr/f22] New upstream version 0.16
mmilata
mmilata at fedoraproject.org
Fri Feb 20 14:44:50 UTC 2015
commit ec9699b7766b830901e8fff61008713f352f15c9
Author: Martin Milata <mmilata at redhat.com>
Date: Fri Feb 20 12:36:21 2015 +0100
New upstream version 0.16
Add support for unwinding from core dump hook
Add support for Ruby uReports
Bugfixes
.gitignore | 1 +
...-Add-test-for-xorg-function-normalization.patch | 184 ------------------
0004-unwind-Append-threads-frames-in-O-1.patch | 84 ---------
...-unwind-throw-away-the-most-recent-frames.patch | 51 -----
...wind-lower-stacktrace-length-limit-to-256.patch | 28 ---
...koops-add-function-name-into-some-reasons.patch | 208 ---------------------
...e-don-t-link-against-libunwind-needlessly.patch | 48 -----
satyr.spec | 43 ++---
sources | 2 +-
test-fail-gcc5-x86_64.patch | 104 +++++++++++
10 files changed, 123 insertions(+), 630 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a4cba67..99ae55a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/satyr-0.13.tar.xz
/satyr-0.14.tar.xz
/satyr-0.15.tar.xz
+/satyr-0.16.tar.xz
diff --git a/satyr.spec b/satyr.spec
index 17db598..8194759 100644
--- a/satyr.spec
+++ b/satyr.spec
@@ -18,8 +18,8 @@
%endif
Name: satyr
-Version: 0.15
-Release: 2%{?dist}
+Version: 0.16
+Release: 1%{?dist}
Summary: Tools to create anonymous, machine-friendly problem reports
Group: System Environment/Libraries
License: GPLv2+
@@ -38,23 +38,7 @@ BuildRequires: gcc-c++
BuildRequires: python-sphinx
%endif
-# '%%autosetup -S git' -> git
-BuildRequires: git
-
-# git format-patch %%{Version} --topo-order -N -M;
-#
-# --topo-oder is needed because reversed chronological order produces a
-# different permutatoin after merging a very old patch
-#
-# i=0; for p in `ls 0*.patch`; do printf "Patch%04d: %s\n" $i $p; ((i++)); done
-#Patch0000: 0001-ruby-ruby-1.8-compatibility.patch
-#Patch0001: 0002-ruby-release-0.2.patch
-Patch0002: 0003-Add-test-for-xorg-function-normalization.patch
-Patch0003: 0004-unwind-Append-threads-frames-in-O-1.patch
-Patch0004: 0005-unwind-throw-away-the-most-recent-frames.patch
-Patch0005: 0006-unwind-lower-stacktrace-length-limit-to-256.patch
-Patch0006: 0007-koops-add-function-name-into-some-reasons.patch
-Patch0007: 0008-configure-don-t-link-against-libunwind-needlessly.patch
+Patch1: test-fail-gcc5-x86_64.patch
%description
Satyr is a library that can be used to create and process microreports.
@@ -82,12 +66,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Python bindings for %{name}.
%prep
-# http://www.rpm.org/wiki/PackagerDocs/Autosetup
-# Default '__scm_apply_git' is 'git apply && git commit' but this workflow
-# doesn't allow us to create a new file within a patch, so we have to use
-# 'git am' (see /usr/lib/rpm/macros for more details)
-%define __scm_apply_git(qp:m:) %{__git} am
-%autosetup -S git
+%setup -q
+%patch1 -p1
%build
%configure \
@@ -105,7 +85,12 @@ make install DESTDIR=%{buildroot}
find %{buildroot} -name "*.la" | xargs rm --
%check
-make check
+make check || {
+ # find and print the logs of failed test
+ # do not cat tests/testsuite.log because it contains a lot of bloat
+ find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \;
+ exit 1
+}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -130,6 +115,12 @@ make check
%endif
%changelog
+* Fri Feb 20 2015 Martin Milata <mmilata at redhat.com> 0.16-1
+- New upstream version
+ - Add support for unwinding from core dump hook
+ - Add support for Ruby uReports
+ - Bugfixes
+
* Fri Nov 07 2014 Jakub Filak <jfilak at redhat.com> 0.15-2
- Add function name into reason text for kernel page faults
diff --git a/sources b/sources
index 27d3882..19fb309 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91f268fed10295c8b1c3afce741e24eb satyr-0.15.tar.xz
+cf8783759f9e209835afca9085e2bd1b satyr-0.16.tar.xz
diff --git a/test-fail-gcc5-x86_64.patch b/test-fail-gcc5-x86_64.patch
new file mode 100644
index 0000000..1adf8bd
--- /dev/null
+++ b/test-fail-gcc5-x86_64.patch
@@ -0,0 +1,104 @@
+diff -ur satyr-0.16/tests/ruby_stacktrace.at satyr-0.16.1.gd339.dirty/tests/ruby_stacktrace.at
+--- satyr-0.16/tests/ruby_stacktrace.at 2015-02-18 14:04:56.000000000 +0100
++++ satyr-0.16.1.gd339.dirty/tests/ruby_stacktrace.at 2015-02-20 14:47:11.000000000 +0100
+@@ -261,6 +261,7 @@
+
+ AT_TESTFUN([sr_ruby_stacktrace_from_json],
+ [[
++#include "stacktrace.h"
+ #include "ruby/stacktrace.h"
+ #include "ruby/frame.h"
+ #include "utils.h"
+@@ -268,13 +269,14 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+
+ void
+ check(char *filename)
+ {
+ char *error_message = NULL;
+- const char *file_contents = sr_file_to_string(filename, &error_message);
+- const char *input = file_contents;
++ char *file_contents = sr_file_to_string(filename, &error_message);
++ char *input = file_contents;
+ struct sr_location location;
+ sr_location_init(&location);
+
+diff -ur satyr-0.16/tests/testsuite satyr-0.16.1.gd339.dirty/tests/testsuite
+--- satyr-0.16/tests/testsuite 2015-02-19 12:23:19.000000000 +0100
++++ satyr-0.16.1.gd339.dirty/tests/testsuite 2015-02-20 14:48:52.000000000 +0100
+@@ -1041,7 +1041,7 @@
+ # List of tests.
+ if $at_list_p; then
+ cat <<_ATEOF || at_write_fail=1
+-satyr 0.16 test suite test groups:
++satyr 0.16.1.gd339.dirty test suite test groups:
+
+ NUM: FILE-NAME:LINE TEST-GROUP-NAME
+ KEYWORDS
+@@ -1082,7 +1082,7 @@
+ exit $at_write_fail
+ fi
+ if $at_version_p; then
+- $as_echo "$as_me (satyr 0.16)" &&
++ $as_echo "$as_me (satyr 0.16.1.gd339.dirty)" &&
+ cat <<\_ATEOF || at_write_fail=1
+
+ Copyright (C) 2012 Free Software Foundation, Inc.
+@@ -1330,13 +1330,13 @@
+ exec 5>>"$at_suite_log"
+
+ # Banners and logs.
+-$as_echo "## ---------------------- ##
+-## satyr 0.16 test suite. ##
+-## ---------------------- ##"
+-{
+- $as_echo "## ---------------------- ##
+-## satyr 0.16 test suite. ##
+-## ---------------------- ##"
++$as_echo "## ------------------------------------ ##
++## satyr 0.16.1.gd339.dirty test suite. ##
++## ------------------------------------ ##"
++{
++ $as_echo "## ------------------------------------ ##
++## satyr 0.16.1.gd339.dirty test suite. ##
++## ------------------------------------ ##"
+ echo
+
+ $as_echo "$as_me: command line was:"
+@@ -2179,7 +2179,7 @@
+ $as_echo "Please send $at_msg and all information you think might help:
+
+ To: <crash-catcher at fedorahosted.org>
+- Subject: [satyr 0.16] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
++ Subject: [satyr 0.16.1.gd339.dirty] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+
+ You may investigate any problem if you feel able to do so, in which
+ case the test suite provides a good starting point. Its output may
+@@ -10995,6 +10995,7 @@
+
+ cat >sr_ruby_stacktrace_from_json.c <<'_ATEOF'
+
++#include "stacktrace.h"
+ #include "ruby/stacktrace.h"
+ #include "ruby/frame.h"
+ #include "utils.h"
+@@ -11002,13 +11003,14 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+
+ void
+ check(char *filename)
+ {
+ char *error_message = NULL;
+- const char *file_contents = sr_file_to_string(filename, &error_message);
+- const char *input = file_contents;
++ char *file_contents = sr_file_to_string(filename, &error_message);
++ char *input = file_contents;
+ struct sr_location location;
+ sr_location_init(&location);
+
More information about the scm-commits
mailing list