[packages/abrt] - updated to 2.0.15
baggins
baggins at pld-linux.org
Sun Oct 14 23:17:54 CEST 2012
commit 4209ffa79df3aa1741194f0ac6ec32bcb9b1e255
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Oct 14 23:02:54 2012 +0200
- updated to 2.0.15
abrt-pld.patch | 10 ----------
abrt.spec | 18 +++++++++---------
format_security.patch | 11 +++++++++++
rpmkey-pld.patch | 4 ++--
4 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/abrt.spec b/abrt.spec
index 4552a59..e58a357 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -1,18 +1,16 @@
-# TODO
-# - fixes to get working with jbj rpm
Summary: Automatic bug detection and reporting tool
Name: abrt
-Version: 1.0.9
-Release: 0.3
+Version: 2.0.15
+Release: 0.1
License: GPL v2+
Group: Applications/System
URL: https://fedorahosted.org/abrt/
Source0: https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz
-# Source0-md5: aaa31f787ae7c144c57837928d26fdc9
+# Source0-md5: 0ac147b6e43ca873e6b1927601ec22a4
Source1: %{name}.init
-Patch0: %{name}-rpm.patch
-Patch1: %{name}-pld.patch
+Patch0: %{name}-rpm5.patch
Patch2: rpmkey-pld.patch
+Patch3: format_security.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@@ -251,8 +249,8 @@ environments.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
@@ -260,7 +258,9 @@ environments.
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+%configure \
+ --with-systemdsystemunitdir=%{systemdunitdir}
+
%{__make}
%install
diff --git a/abrt-pld.patch b/abrt-pld.patch
deleted file mode 100644
index 27532f5..0000000
--- a/abrt-pld.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- abrt-1.0.9/lib/Utils/DebugDump.cpp~ 2010-04-02 12:53:59.000000000 +0300
-+++ abrt-1.0.9/lib/Utils/DebugDump.cpp 2010-04-08 23:04:27.265361307 +0300
-@@ -331,6 +331,7 @@
- SaveText(FILENAME_ARCHITECTURE, buf.machine);
- std::string release;
- LoadTextFile("/etc/redhat-release", release);
-+ LoadTextFile("/etc/pld-release", release);
- const char *release_ptr = release.c_str();
- unsigned len_1st_str = strchrnul(release_ptr, '\n') - release_ptr;
- release.erase(len_1st_str); /* usually simply removes trailing '\n' */
diff --git a/format_security.patch b/format_security.patch
new file mode 100644
index 0000000..5d3d889
--- /dev/null
+++ b/format_security.patch
@@ -0,0 +1,11 @@
+--- abrt-2.0.8/src/plugins/abrt-retrace-client.c.str_fmt~ 2012-03-11 21:23:29.615896279 +0100
++++ abrt-2.0.8/src/plugins/abrt-retrace-client.c 2012-03-11 21:23:52.795907834 +0100
+@@ -613,7 +613,7 @@ static int create(bool delete_temp_archi
+ if (response_code == 500 || response_code == 507)
+ {
+ alert_server_error();
+- error_msg_and_die(http_body);
++ error_msg_and_die("%s", http_body);
+ }
+ else if (response_code == 403)
+ {
diff --git a/rpmkey-pld.patch b/rpmkey-pld.patch
index ef7988a..d101716 100644
--- a/rpmkey-pld.patch
+++ b/rpmkey-pld.patch
@@ -1,5 +1,5 @@
---- abrt-1.0.8/src/Daemon/gpg_keys~ 2010-02-12 00:52:28.000000000 +0200
-+++ abrt-1.0.8/src/Daemon/gpg_keys 2010-03-24 12:47:24.745636712 +0200
+--- abrt-1.0.8/src/daemon/gpg_keys~ 2010-02-12 00:52:28.000000000 +0200
++++ abrt-1.0.8/src/daemon/gpg_keys 2010-03-24 12:47:24.745636712 +0200
@@ -1 +1,2 @@
-/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+/etc/pki/rpm-gpg/PLD-2.0-Ac-GPG-key.asc
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/abrt.git/commitdiff/608b599415cd8aca91ec23eeadb3367d9a146c5f
More information about the pld-cvs-commit
mailing list