1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
|
From 1f56956ade3bd28ef192fba675e798db58b3ae40 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sat, 22 Sep 2012 05:45:28 -0400
Subject: [PATCH] Disable code not relevant for Gentoo
Disable code that is only relevant for an RPM-based distro or that
requires additional bugs.gentoo.org infrastructure support. Ensure that
crashes still get analyzed even if they cannot be assigned to any
package (since we lack any way of doing that at the moment).
---
configure.ac | 1 -
doc/Makefile.am | 2 --
src/daemon/Makefile.am | 18 ----------
src/daemon/abrt_event.conf | 14 +++++---
src/plugins/Makefile.am | 71 +------------------------------------
src/plugins/abrt-action-list-dsos | 18 +++-------
src/plugins/ccpp_event.conf | 29 +--------------
src/plugins/ccpp_retrace_event.conf | 8 +----
src/plugins/koops_event.conf | 15 --------
src/plugins/python_event.conf | 16 ---------
src/plugins/xorg_event.conf | 2 +-
11 files changed, 17 insertions(+), 177 deletions(-)
diff --git a/configure.ac b/configure.ac
index bb2b986..a78d9f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-3.0])
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21])
PKG_CHECK_MODULES([DBUS], [dbus-1])
PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
-PKG_CHECK_MODULES([RPM], [rpm])
PKG_CHECK_MODULES([LIBNOTIFY], [libnotify])
PKG_CHECK_MODULES([NSS], [nss])
PKG_CHECK_MODULES([BTPARSER], [btparser])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0a829d4..33cc8e6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,11 +16,9 @@ MAN1_TXT += abrt-cli.txt
MAN1_TXT += abrt-action-save-package-data.txt
MAN1_TXT += abrt-install-ccpp-hook.txt
MAN1_TXT += abrt-action-analyze-vmcore.txt
-MAN1_TXT += abrt-bodhi.txt
MAN5_TXT =
MAN5_TXT += abrt.conf.txt
-MAN5_TXT += abrt-action-save-package-data.conf.txt
MAN8_TXT =
MAN8_TXT += abrtd.txt abrt-dbus.txt
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 2e24403..777dfc4 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -6,9 +6,6 @@ dist_eventsconf_DATA = \
bin_SCRIPTS = \
abrt-handle-upload
-bin_PROGRAMS = \
- abrt-action-save-package-data
-
sbin_PROGRAMS = \
abrtd \
abrt-server
@@ -55,21 +52,6 @@ abrt_handle_event_LDADD = \
$(LIBREPORT_LIBS) \
$(BTPARSER_LIBS)
-abrt_action_save_package_data_SOURCES = \
- rpm.h rpm.c \
- abrt-action-save-package-data.c
-abrt_action_save_package_data_CPPFLAGS = \
- -I$(srcdir)/../include \
- -I$(srcdir)/../lib \
- -DCONF_DIR=\"$(CONF_DIR)\" \
- $(GLIB_CFLAGS) \
- $(LIBREPORT_CFLAGS) \
- -D_GNU_SOURCE
-abrt_action_save_package_data_LDADD = \
- $(RPM_LIBS) \
- $(LIBREPORT_LIBS) \
- ../lib/libabrt.la
-
daemonconfdir = $(CONF_DIR)
dist_daemonconf_DATA = \
abrt.conf \
diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf
index a1411e4..aab7dc0 100644
--- a/src/daemon/abrt_event.conf
+++ b/src/daemon/abrt_event.conf
@@ -44,7 +44,7 @@
# Determine in which package/component the crash happened (if not yet done):
-EVENT=post-create component= remote!=1
+#EVENT=post-create component= remote!=1
abrt-action-save-package-data
@@ -60,19 +60,19 @@ EVENT=post-create
if [ -f uid ]; then getent passwd "`cat uid`" | cut -d: -f1 >username; fi
-EVENT=notify package!= uid!=
+EVENT=notify uid!=
dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
-EVENT=notify package!= uid=
+EVENT=notify uid=
dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
string:"`cat package`" string:"$DUMP_DIR"
-EVENT=notify-dup package!= uid!=
+EVENT=notify-dup uid!=
dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
-EVENT=notify-dup package!= uid=
+EVENT=notify-dup uid=
dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
string:"`cat package`" string:"$DUMP_DIR"
@@ -108,6 +108,10 @@ EVENT=notify-dup package!= uid=
#EVENT=post-create
reporter-upload -u scp://user:password@server.name/var/spool/abrt-upload || :
+#report-gui event is used for reporting by abrt-applet and abrt-gui
+
+EVENT=report-gui analyzer=CCpp
+ report-gtk -e analyze_LocalGDB -e report_Logger -- "$DUMP_DIR"
#open-gui event is used by abrt-gui's "Edit"->"Open problem data"
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 10ab579..f0248b1 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,7 +1,6 @@
-include ../../config.mak
bin_SCRIPTS = \
- abrt-action-install-debuginfo \
abrt-action-analyze-core \
abrt-action-analyze-vmcore \
abrt-action-list-dsos
@@ -16,12 +15,7 @@ bin_PROGRAMS = \
abrt-action-trim-files \
abrt-action-generate-backtrace \
abrt-action-generate-core-backtrace \
- abrt-action-analyze-backtrace \
- abrt-retrace-client \
- abrt-dedup-client \
- abrt-bodhi
-
-libexec_PROGRAMS = abrt-action-install-debuginfo-to-abrt-cache
+ abrt-action-analyze-backtrace
#dist_pluginsconf_DATA = Python.conf
@@ -44,7 +38,6 @@ eventsconfdir = $(EVENTS_CONF_DIR)
dist_eventsconf_DATA = \
ccpp_event.conf \
- ccpp_retrace_event.conf \
koops_event.conf \
xorg_event.conf \
vmcore_event.conf \
@@ -56,7 +49,6 @@ dist_eventsconf_DATA = \
PYTHON_FILES = \
- abrt-action-install-debuginfo.in \
abrt-action-list-dsos \
abrt-action-analyze-core \
abrt-action-analyze-vmcore.in
@@ -69,7 +61,6 @@ EXTRA_DIST = \
collect_vimrc_user.xml.in \
collect_vimrc_system.xml.in \
analyze_LocalGDB.xml.in \
- analyze_RetraceServer.xml.in \
analyze_VMcore.xml.in \
abrt-action-analyze-vmcore \
https-utils.h \
@@ -204,64 +195,4 @@ abrt_action_analyze_backtrace_LDADD = \
$(LIBREPORT_LIBS) \
$(BTPARSER_LIBS)
-abrt_action_install_debuginfo_to_abrt_cache_SOURCES = \
- abrt-action-install-debuginfo-to-abrt-cache.c
-abrt_action_install_debuginfo_to_abrt_cache_CPPFLAGS = \
- -I$(srcdir)/../include \
- -I$(srcdir)/../lib \
- -D_GNU_SOURCE \
- $(LIBREPORT_CFLAGS) \
- -Wall -Wwrite-strings
-abrt_action_install_debuginfo_to_abrt_cache_LDADD = \
- $(LIBREPORT_LIBS) \
- ../lib/libabrt.la
-
-abrt_retrace_client_SOURCES = \
- abrt-retrace-client.c \
- https-utils.c
- abrt_retrace_client_CFLAGS = \
- -I$(srcdir)/../include \
- -I$(srcdir)/../lib \
- $(NSS_CFLAGS) \
- $(GLIB_CFLAGS) \
- -D_GNU_SOURCE \
- $(LIBREPORT_CFLAGS)
- abrt_retrace_client_LDADD = \
- $(LIBREPORT_LIBS) \
- $(BTPARSER_LIBS) \
- $(NSS_LIBS)
-
-abrt_dedup_client_SOURCES = \
- abrt-dedup-client.c \
- https-utils.c
- abrt_dedup_client_CFLAGS = \
- -I$(srcdir)/../include \
- -I$(srcdir)/../lib \
- $(NSS_CFLAGS) \
- $(GLIB_CFLAGS) \
- -D_GNU_SOURCE \
- $(LIBREPORT_CFLAGS)
- abrt_dedup_client_LDADD = \
- $(LIBREPORT_LIBS) \
- $(BTPARSER_LIBS) \
- $(NSS_LIBS)
-
-abrt_bodhi_SOURCES = \
- bodhi.c
- abrt_bodhi_CPPFLAGS = \
- -I$(srcdir)/../include \
- -I$(srcdir)/../lib \
- $(GLIB_CFLAGS) \
- $(LIBREPORT_CFLAGS) \
- $(LIBREPORT_WEB_CFLAGS) \
- $(JSON_C_CFLAGS) \
- $(RPM_CFLAGS) \
- -D_GNU_SOURCE
- abrt_bodhi_LDADD = \
- $(JSON_C_LIBS) \
- $(RPM_LIBS) \
- $(LIBREPORT_LIBS) \
- $(LIBREPORT_WEB_LIBS)
-
-
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos
index 81a9927..bf1491c 100644
--- a/src/plugins/abrt-action-list-dsos
+++ b/src/plugins/abrt-action-list-dsos
@@ -5,7 +5,6 @@
import sys
import os
import getopt
-import rpm
def log(s):
sys.stderr.write("%s\n" % s)
@@ -68,19 +67,10 @@ if __name__ == "__main__":
try:
dso_paths = parse_maps(memfile)
for path in dso_paths:
- ts = rpm.TransactionSet()
- mi = ts.dbMatch('basenames', path)
- if len(mi):
- for h in mi:
- if outname:
- outfile = xopen(outname, "w")
- outname = None
- outfile.write("%s %s (%s) %s\n" %
- (path,
- h[rpm.RPMTAG_NEVRA],
- h[rpm.RPMTAG_VENDOR],
- h[rpm.RPMTAG_INSTALLTIME])
- )
+ if outname:
+ outfile = xopen(outname, "w")
+ outname = None
+ outfile.write(path)
except Exception, ex:
error_msg_and_die("Can't get the DSO list: %s" % ex)
diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf
index 81b14d2..cda0b7d 100644
--- a/src/plugins/ccpp_event.conf
+++ b/src/plugins/ccpp_event.conf
@@ -31,31 +31,4 @@ EVENT=collect_xsession_errors analyzer=CCpp dso_list~=.*/libX11.*
# or was this ability lost with move to python installer?
EVENT=analyze_LocalGDB analyzer=CCpp
abrt-action-analyze-core --core=coredump -o build_ids &&
- /usr/libexec/abrt-action-install-debuginfo-to-abrt-cache --size_mb=4096 &&
- abrt-action-generate-backtrace &&
- abrt-action-analyze-backtrace &&
- (
- bug_id=$(reporter-bugzilla -h `cat duphash`) &&
- if test -n "$bug_id"; then
- abrt-bodhi -r -b $bug_id
- fi
- )
-
-
-# Bugzilla requires nonempty duphash
-EVENT=report_Bugzilla analyzer=CCpp duphash!=
- abrt-dedup-client
- test -f component || abrt-action-save-package-data
- reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
-
-# Send micro report
-EVENT=report_uReport analyzer=CCpp
- reporter-ureport
-
-# update ABRT database after successful report to bugzilla
-EVENT=post_report analyzer=CCpp
- reporter-ureport -r
-
-# Reporting of C/Cpp problems
-EVENT=report-gui analyzer=CCpp
- report-gtk -e report_uReport -e analyze_RetraceServer -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+ abrt-action-generate-backtrace
diff --git a/src/plugins/ccpp_retrace_event.conf b/src/plugins/ccpp_retrace_event.conf
index 60e53d7..893502f 100644
--- a/src/plugins/ccpp_retrace_event.conf
+++ b/src/plugins/ccpp_retrace_event.conf
@@ -1,9 +1,3 @@
EVENT=analyze_RetraceServer analyzer=CCpp
abrt-retrace-client batch --dir "$DUMP_DIR" --status-delay 10 &&
- abrt-action-analyze-backtrace &&
- (
- bug_id=$(reporter-bugzilla -h `cat duphash`) &&
- if test -n "$bug_id"; then
- abrt-bodhi -r -b $bug_id
- fi
- )
+ abrt-action-analyze-backtrace
diff --git a/src/plugins/koops_event.conf b/src/plugins/koops_event.conf
index 91759b1..41708df 100644
--- a/src/plugins/koops_event.conf
+++ b/src/plugins/koops_event.conf
@@ -14,18 +14,3 @@ EVENT=post-create analyzer=Kerneloops
# report
#EVENT=report_Kerneloops analyzer=Kerneloops
reporter-kerneloops
-
-EVENT=report_Bugzilla analyzer=Kerneloops
- reporter-bugzilla -b
-
-# Send micro report
-EVENT=report_uReport analyzer=Kerneloops
- reporter-ureport
-
-# update ABRT database after successful report to bugzilla
-EVENT=post_report analyzer=Kerneloops
- reporter-ureport -r
-
-# Reporting of kernel oopses
-EVENT=report-gui analyzer=Kerneloops
- report-gtk -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
diff --git a/src/plugins/python_event.conf b/src/plugins/python_event.conf
index e60df11..66b41f2 100644
--- a/src/plugins/python_event.conf
+++ b/src/plugins/python_event.conf
@@ -1,19 +1,3 @@
EVENT=post-create analyzer=Python
abrt-action-analyze-python
abrt-action-generate-core-backtrace
-
-EVENT=report_Bugzilla analyzer=Python
- test -f component || abrt-action-save-package-data
- reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
-
-# Send micro report
-EVENT=report_uReport analyzer=Python
- reporter-ureport
-
-# update ABRT database after successful report to bugzilla
-EVENT=post_report analyzer=Python
- reporter-ureport -r
-
-# Reporting of python exceptions
-EVENT=report-gui analyzer=Python
- report-gtk -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
diff --git a/src/plugins/xorg_event.conf b/src/plugins/xorg_event.conf
index b974a6b..5476230 100644
--- a/src/plugins/xorg_event.conf
+++ b/src/plugins/xorg_event.conf
@@ -33,4 +33,4 @@ EVENT=report_Bugzilla analyzer=xorg
# Reporting of xorg problems
EVENT=report-gui analyzer=xorg
- report-gtk -e report_Bugzilla -- "$DUMP_DIR"
+ report-gtk -e report_Logger -- "$DUMP_DIR"
--
1.7.12
|
