1 |
commit: 64f13b36dc62b8cf1a269b06c005cdc654c7f49d |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 17 06:13:56 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Nov 17 06:13:56 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=64f13b36 |
7 |
|
8 |
abrt, btparser, libreport: moved to gx86 |
9 |
|
10 |
--- |
11 |
app-admin/abrt/abrt-2.0.5.ebuild | 114 ---------- |
12 |
app-admin/abrt/files/abrt-2.0.5-conf | 15 -- |
13 |
app-admin/abrt/files/abrt-2.0.5-gentoo.patch | 236 -------------------- |
14 |
app-admin/abrt/files/abrt-2.0.5-init | 57 ----- |
15 |
dev-libs/btparser/btparser-0.13.ebuild | 29 --- |
16 |
.../libreport/files/libreport-2.0.6-gentoo.patch | 151 ------------- |
17 |
.../files/libreport-2.0.6-no-bugzilla.patch | 78 ------- |
18 |
.../files/libreport-2.0.6-not-reportable.patch | 218 ------------------ |
19 |
dev-libs/libreport/libreport-2.0.6.ebuild | 101 --------- |
20 |
9 files changed, 0 insertions(+), 999 deletions(-) |
21 |
|
22 |
diff --git a/app-admin/abrt/abrt-2.0.5.ebuild b/app-admin/abrt/abrt-2.0.5.ebuild |
23 |
deleted file mode 100644 |
24 |
index 2aed6f7..0000000 |
25 |
--- a/app-admin/abrt/abrt-2.0.5.ebuild |
26 |
+++ /dev/null |
27 |
@@ -1,114 +0,0 @@ |
28 |
-# Copyright 1999-2011 Gentoo Foundation |
29 |
-# Distributed under the terms of the GNU General Public License v2 |
30 |
-# $Header: $ |
31 |
- |
32 |
-PYTHON_DEPEND="2:2.6" |
33 |
-EAPI="4" |
34 |
- |
35 |
-# Need gnome2-utils for gnome2_icon_cache_update |
36 |
-inherit autotools eutils gnome2-utils python systemd |
37 |
- |
38 |
-DESCRIPTION="Automatic bug detection and reporting tool" |
39 |
-HOMEPAGE="https://fedorahosted.org/abrt/" |
40 |
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz" |
41 |
- |
42 |
-LICENSE="GPL-2" |
43 |
-SLOT="0" |
44 |
-KEYWORDS="~amd64" |
45 |
-IUSE="debug" |
46 |
- |
47 |
-COMMON_DEPEND="dev-libs/btparser |
48 |
- >=dev-libs/glib-2.21:2 |
49 |
- dev-libs/libreport |
50 |
- dev-libs/libxml2 |
51 |
- dev-libs/nss |
52 |
- sys-apps/dbus |
53 |
- sys-fs/inotify-tools |
54 |
- x11-libs/gtk+:2 |
55 |
- x11-libs/libnotify" |
56 |
-RDEPEND="${COMMON_DEPEND} |
57 |
- app-arch/cpio |
58 |
- dev-libs/elfutils |
59 |
- sys-devel/gdb" |
60 |
-DEPEND="${COMMON_DEPEND} |
61 |
- app-text/asciidoc |
62 |
- app-text/xmlto |
63 |
- >=dev-util/intltool-0.35.0 |
64 |
- >=dev-util/pkgconfig-0.9.0 |
65 |
- >=sys-devel/gettext-0.17" |
66 |
- |
67 |
-pkg_setup() { |
68 |
- python_set_active_version 2 |
69 |
- python_pkg_setup |
70 |
- |
71 |
- enewgroup abrt |
72 |
- enewuser abrt -1 -1 -1 abrt |
73 |
-} |
74 |
- |
75 |
-src_prepare() { |
76 |
- # Disable redhat-specific code not usable in gentoo, or that requires |
77 |
- # bugs.gentoo.org infra support. |
78 |
- epatch "${FILESDIR}/${PN}-2.0.5-gentoo.patch" |
79 |
- |
80 |
- # Building against libreport-2.0.6 fails with -Werror due to redefinition |
81 |
- # of kernel_tainted_short. |
82 |
- # XXX: Check if needed on next libreport release. |
83 |
- sed -e 's/-Werror\( \|$\)//g' \ |
84 |
- -i src/lib/Makefile.* src/daemon/Makefile.* src/applet/Makefile.* \ |
85 |
- src/gui-gtk/Makefile.* src/plugins/Makefile.* src/cli/Makefile.* || |
86 |
- die "sed failed" |
87 |
- |
88 |
- mkdir m4 |
89 |
- eautoreconf |
90 |
- |
91 |
- ln -sfn $(type -P true) py-compile |
92 |
- python_convert_shebangs -r 2 src |
93 |
-} |
94 |
- |
95 |
-src_configure() { |
96 |
- # Configure checks for python.pc; our python-2.7 installs python-2.7.pc, |
97 |
- # while python-2.6 does not install any pkgconfig file. |
98 |
- export PYTHON_CFLAGS=$(python-config --includes) |
99 |
- export PYTHON_LIBS=$(python-config --libs) |
100 |
- |
101 |
- myeconfargs=( "--localstatedir=${EPREFIX}/var" ) |
102 |
- # --disable-debug enables debug! |
103 |
- use debug && myeconfargs=( "${myeconfargs[@]}" --enable-debug ) |
104 |
- systemd_to_myeconfargs |
105 |
- econf "${myeconfargs[@]}" |
106 |
-} |
107 |
- |
108 |
-src_install() { |
109 |
- emake DESTDIR="${D}" install |
110 |
- dodoc ChangeLog README |
111 |
- |
112 |
- keepdir /var/run/abrt |
113 |
- # /var/spool/abrt is created by dev-libs/libreport |
114 |
- |
115 |
- diropts -m 700 -o abrt -g abrt |
116 |
- keepdir /var/spool/abrt-upload |
117 |
- |
118 |
- diropts -m 775 -o abrt -g abrt |
119 |
- keepdir /var/cache/abrt-di |
120 |
- |
121 |
- find "${D}" -name '*.la' -exec rm -f {} + || die |
122 |
- |
123 |
- newinitd "${FILESDIR}/${PN}-2.0.5-init" abrt |
124 |
- newconfd "${FILESDIR}/${PN}-2.0.5-conf" abrt |
125 |
-} |
126 |
- |
127 |
-pkg_preinst() { |
128 |
- gnome2_icon_savelist |
129 |
-} |
130 |
- |
131 |
-pkg_postinst() { |
132 |
- gnome2_icon_cache_update |
133 |
- python_mod_optimize abrt_exception_handler.py |
134 |
- elog "To start the bug detection service on an openrc-based system, do" |
135 |
- elog "# /etc/init.d/abrt start" |
136 |
-} |
137 |
- |
138 |
-pkg_postrm() { |
139 |
- gnome2_icon_cache_update |
140 |
- python_mod_cleanup abrt_exception_handler.py |
141 |
-} |
142 |
|
143 |
diff --git a/app-admin/abrt/files/abrt-2.0.5-conf b/app-admin/abrt/files/abrt-2.0.5-conf |
144 |
deleted file mode 100644 |
145 |
index e35958d..0000000 |
146 |
--- a/app-admin/abrt/files/abrt-2.0.5-conf |
147 |
+++ /dev/null |
148 |
@@ -1,15 +0,0 @@ |
149 |
-# abrtd command-line options |
150 |
-# Default: "" |
151 |
-ABRTD_OPTS="" |
152 |
- |
153 |
-# Run abrt-harvest-vmcore to make new kdump dumps available for abrtd |
154 |
-START_VMCORE="yes" |
155 |
- |
156 |
-# Install abrt-ccpp hook to watch for segfaults |
157 |
-START_CCPP="yes" |
158 |
- |
159 |
-# Start abrt-dump-oops to watch for kernel oops |
160 |
-START_OOPS="yes" |
161 |
-# abrt-dump-oops command-line options |
162 |
-# Default: "-rwxD /var/log/messages" |
163 |
-OOPS_OPTS="-rwxD /var/log/messages" |
164 |
|
165 |
diff --git a/app-admin/abrt/files/abrt-2.0.5-gentoo.patch b/app-admin/abrt/files/abrt-2.0.5-gentoo.patch |
166 |
deleted file mode 100644 |
167 |
index d65b701..0000000 |
168 |
--- a/app-admin/abrt/files/abrt-2.0.5-gentoo.patch |
169 |
+++ /dev/null |
170 |
@@ -1,236 +0,0 @@ |
171 |
-From 75d9c9a2cbb9f42922c8fb27219de0c4784fa255 Mon Sep 17 00:00:00 2001 |
172 |
-From: Alexandre Rostovtsev <tetromino@×××××.com> |
173 |
-Date: Sat, 8 Oct 2011 03:31:56 -0400 |
174 |
-Subject: [PATCH] Disable code relevant only for an RPM-based distro |
175 |
- |
176 |
---- |
177 |
- configure.ac | 1 - |
178 |
- src/daemon/Makefile.am | 29 +++-------------------------- |
179 |
- src/daemon/abrt_event.conf | 2 +- |
180 |
- src/plugins/Makefile.am | 16 ---------------- |
181 |
- src/plugins/abrt-action-list-dsos | 18 ++++-------------- |
182 |
- src/plugins/ccpp_event.conf | 7 +++---- |
183 |
- src/plugins/koops_event.conf | 4 ++-- |
184 |
- src/plugins/python_event.conf | 6 +++--- |
185 |
- 8 files changed, 16 insertions(+), 67 deletions(-) |
186 |
- |
187 |
-diff --git a/configure.ac b/configure.ac |
188 |
-index 8debc2d..abe8203 100644 |
189 |
---- a/configure.ac |
190 |
-+++ b/configure.ac |
191 |
-@@ -60,7 +60,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-2.0]) |
192 |
- PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21]) |
193 |
- PKG_CHECK_MODULES([DBUS], [dbus-1]) |
194 |
- PKG_CHECK_MODULES([LIBXML], [libxml-2.0]) |
195 |
--PKG_CHECK_MODULES([RPM], [rpm]) |
196 |
- PKG_CHECK_MODULES([LIBNOTIFY], [libnotify]) |
197 |
- PKG_CHECK_MODULES([NSS], [nss]) |
198 |
- PKG_CHECK_MODULES([BTPARSER], [btparser]) |
199 |
-diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am |
200 |
-index e6823bd..24468b7 100644 |
201 |
---- a/src/daemon/Makefile.am |
202 |
-+++ b/src/daemon/Makefile.am |
203 |
-@@ -8,9 +8,6 @@ dist_eventsconf_DATA = \ |
204 |
- bin_SCRIPTS = \ |
205 |
- abrt-handle-upload |
206 |
- |
207 |
--bin_PROGRAMS = \ |
208 |
-- abrt-action-save-package-data |
209 |
-- |
210 |
- sbin_PROGRAMS = \ |
211 |
- abrtd \ |
212 |
- abrt-server |
213 |
-@@ -62,45 +59,25 @@ abrt_handle_event_LDADD = \ |
214 |
- ../lib/libabrt.la \ |
215 |
- $(LIBREPORT_LIBS) |
216 |
- |
217 |
--abrt_action_save_package_data_SOURCES = \ |
218 |
-- rpm.h rpm.c \ |
219 |
-- abrt-action-save-package-data.c |
220 |
--abrt_action_save_package_data_CPPFLAGS = \ |
221 |
-- -I$(srcdir)/../include \ |
222 |
-- -I$(srcdir)/../lib \ |
223 |
-- -DCONF_DIR=\"$(CONF_DIR)\" \ |
224 |
-- $(GLIB_CFLAGS) \ |
225 |
-- $(LIBREPORT_CFLAGS) \ |
226 |
-- -D_GNU_SOURCE \ |
227 |
-- -Wall -Wwrite-strings -Werror |
228 |
--abrt_action_save_package_data_LDADD = \ |
229 |
-- $(RPM_LIBS) \ |
230 |
-- $(LIBREPORT_LIBS) \ |
231 |
-- ../lib/libabrt.la |
232 |
-- |
233 |
- dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/ |
234 |
- dist_dbusabrtconf_DATA = dbus-abrt.conf |
235 |
- |
236 |
- daemonconfdir = $(CONF_DIR) |
237 |
- dist_daemonconf_DATA = \ |
238 |
-- abrt.conf \ |
239 |
-- abrt-action-save-package-data.conf \ |
240 |
-- gpg_keys |
241 |
-+ abrt.conf |
242 |
- |
243 |
- comredhatabrtservicedir = ${datadir}/dbus-1/system-services |
244 |
- dist_comredhatabrtservice_DATA = com.redhat.abrt.service |
245 |
- |
246 |
- MAN_TXT = \ |
247 |
- abrt-handle-upload.txt \ |
248 |
-- abrt-action-save-package-data.txt \ |
249 |
-- abrt-action-save-package-data.conf.txt \ |
250 |
- abrt.conf.txt \ |
251 |
- abrtd.txt \ |
252 |
- abrt-server.txt |
253 |
- |
254 |
- # Manual pages are generated from .txt via Docbook |
255 |
--man1_MANS = abrt-handle-upload.1 abrt-server.1 abrt-action-save-package-data.1 |
256 |
--man5_MANS = abrt.conf.5 abrt-action-save-package-data.conf.5 |
257 |
-+man1_MANS = abrt-handle-upload.1 abrt-server.1 |
258 |
-+man5_MANS = abrt.conf.5 |
259 |
- man8_MANS = abrtd.8 |
260 |
- |
261 |
- %.1 %.5 %.8: %.xml |
262 |
-diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf |
263 |
-index bf053f7..8c1aacf 100644 |
264 |
---- a/src/daemon/abrt_event.conf |
265 |
-+++ b/src/daemon/abrt_event.conf |
266 |
-@@ -44,7 +44,7 @@ |
267 |
- |
268 |
- |
269 |
- # Determine in which package/component the crash happened (if not yet done): |
270 |
--EVENT=post-create component= |
271 |
-+#EVENT=post-create component= |
272 |
- abrt-action-save-package-data |
273 |
- |
274 |
- |
275 |
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am |
276 |
-index acd1a31..eb9e45a 100644 |
277 |
---- a/src/plugins/Makefile.am |
278 |
-+++ b/src/plugins/Makefile.am |
279 |
-@@ -1,7 +1,6 @@ |
280 |
- -include ../../config.mak |
281 |
- |
282 |
- bin_SCRIPTS = \ |
283 |
-- abrt-action-install-debuginfo \ |
284 |
- abrt-action-analyze-core \ |
285 |
- abrt-action-analyze-vmcore \ |
286 |
- abrt-action-list-dsos |
287 |
-@@ -16,8 +15,6 @@ bin_PROGRAMS = \ |
288 |
- abrt-action-analyze-backtrace \ |
289 |
- abrt-retrace-client |
290 |
- |
291 |
--libexec_PROGRAMS = abrt-action-install-debuginfo-to-abrt-cache |
292 |
-- |
293 |
- #dist_pluginsconf_DATA = Python.conf |
294 |
- |
295 |
- eventsdir = $(EVENTS_DIR) |
296 |
-@@ -70,7 +67,6 @@ man1_MANS = ${MAN_TXT:%.txt=%.1} |
297 |
- CLEANFILES = $(man1_MANS) |
298 |
- |
299 |
- PYTHON_FILES = \ |
300 |
-- abrt-action-install-debuginfo.in \ |
301 |
- abrt-action-list-dsos \ |
302 |
- abrt-action-analyze-core |
303 |
- |
304 |
-@@ -179,18 +175,6 @@ abrt_action_analyze_backtrace_LDADD = \ |
305 |
- $(LIBREPORT_LIBS) \ |
306 |
- $(BTPARSER_LIBS) |
307 |
- |
308 |
--abrt_action_install_debuginfo_to_abrt_cache_SOURCES = \ |
309 |
-- abrt-action-install-debuginfo-to-abrt-cache.c |
310 |
--abrt_action_install_debuginfo_to_abrt_cache_CPPFLAGS = \ |
311 |
-- -I$(srcdir)/../include \ |
312 |
-- -I$(srcdir)/../lib \ |
313 |
-- -D_GNU_SOURCE \ |
314 |
-- $(LIBREPORT_CFLAGS) \ |
315 |
-- -Wall -Wwrite-strings |
316 |
--abrt_action_install_debuginfo_to_abrt_cache_LDADD = \ |
317 |
-- $(LIBREPORT_LIBS) \ |
318 |
-- ../lib/libabrt.la |
319 |
-- |
320 |
- abrt_retrace_client_SOURCES = \ |
321 |
- abrt-retrace-client.c |
322 |
- abrt_retrace_client_CFLAGS = \ |
323 |
-diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos |
324 |
-index 81a9927..bf1491c 100644 |
325 |
---- a/src/plugins/abrt-action-list-dsos |
326 |
-+++ b/src/plugins/abrt-action-list-dsos |
327 |
-@@ -5,7 +5,6 @@ |
328 |
- import sys |
329 |
- import os |
330 |
- import getopt |
331 |
--import rpm |
332 |
- |
333 |
- def log(s): |
334 |
- sys.stderr.write("%s\n" % s) |
335 |
-@@ -68,19 +67,10 @@ if __name__ == "__main__": |
336 |
- try: |
337 |
- dso_paths = parse_maps(memfile) |
338 |
- for path in dso_paths: |
339 |
-- ts = rpm.TransactionSet() |
340 |
-- mi = ts.dbMatch('basenames', path) |
341 |
-- if len(mi): |
342 |
-- for h in mi: |
343 |
-- if outname: |
344 |
-- outfile = xopen(outname, "w") |
345 |
-- outname = None |
346 |
-- outfile.write("%s %s (%s) %s\n" % |
347 |
-- (path, |
348 |
-- h[rpm.RPMTAG_NEVRA], |
349 |
-- h[rpm.RPMTAG_VENDOR], |
350 |
-- h[rpm.RPMTAG_INSTALLTIME]) |
351 |
-- ) |
352 |
-+ if outname: |
353 |
-+ outfile = xopen(outname, "w") |
354 |
-+ outname = None |
355 |
-+ outfile.write(path) |
356 |
- |
357 |
- except Exception, ex: |
358 |
- error_msg_and_die("Can't get the DSO list: %s" % ex) |
359 |
-diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf |
360 |
-index 4071705..d8bf148 100644 |
361 |
---- a/src/plugins/ccpp_event.conf |
362 |
-+++ b/src/plugins/ccpp_event.conf |
363 |
-@@ -28,11 +28,10 @@ EVENT=collect_xsession_errors analyzer=CCpp dso_list~=.*/libX11.* |
364 |
- # or was this ability lost with move to python installer? |
365 |
- EVENT=analyze_LocalGDB analyzer=CCpp |
366 |
- abrt-action-analyze-core --core=coredump -o build_ids && |
367 |
-- /usr/libexec/abrt-action-install-debuginfo-to-abrt-cache --size_mb=4096 && |
368 |
- abrt-action-generate-backtrace && |
369 |
- abrt-action-analyze-backtrace |
370 |
- |
371 |
- # Bugzilla requires nonempty duphash |
372 |
--EVENT=report_Bugzilla analyzer=CCpp duphash!= |
373 |
-- test -f component || abrt-action-save-package-data |
374 |
-- reporter-bugzilla -b -c /etc/libreport/plugins/Bugzilla.conf |
375 |
-+# EVENT=report_Bugzilla analyzer=CCpp duphash!= |
376 |
-+# test -f component || abrt-action-save-package-data |
377 |
-+# reporter-bugzilla -b -c /etc/libreport/plugins/Bugzilla.conf |
378 |
-diff --git a/src/plugins/koops_event.conf b/src/plugins/koops_event.conf |
379 |
-index 3b80a1b..701e6ba 100644 |
380 |
---- a/src/plugins/koops_event.conf |
381 |
-+++ b/src/plugins/koops_event.conf |
382 |
-@@ -13,5 +13,5 @@ EVENT=post-create analyzer=Kerneloops |
383 |
- EVENT=report_Kerneloops analyzer=Kerneloops |
384 |
- reporter-kerneloops |
385 |
- |
386 |
--EVENT=report_Bugzilla analyzer=Kerneloops |
387 |
-- reporter-bugzilla -b |
388 |
-+# EVENT=report_Bugzilla analyzer=Kerneloops |
389 |
-+# reporter-bugzilla -b |
390 |
-diff --git a/src/plugins/python_event.conf b/src/plugins/python_event.conf |
391 |
-index 7a106b5..bc1533f 100644 |
392 |
---- a/src/plugins/python_event.conf |
393 |
-+++ b/src/plugins/python_event.conf |
394 |
-@@ -1,6 +1,6 @@ |
395 |
- EVENT=post-create analyzer=Python |
396 |
- abrt-action-analyze-python |
397 |
- |
398 |
--EVENT=report_Bugzilla analyzer=Python |
399 |
-- test -f component || abrt-action-save-package-data |
400 |
-- reporter-bugzilla -b -c /etc/libreport/plugins/Bugzilla.conf |
401 |
-+# EVENT=report_Bugzilla analyzer=Python |
402 |
-+# test -f component || abrt-action-save-package-data |
403 |
-+# reporter-bugzilla -b -c /etc/libreport/plugins/Bugzilla.conf |
404 |
--- |
405 |
-1.7.7 |
406 |
- |
407 |
|
408 |
diff --git a/app-admin/abrt/files/abrt-2.0.5-init b/app-admin/abrt/files/abrt-2.0.5-init |
409 |
deleted file mode 100755 |
410 |
index e1c6a9d..0000000 |
411 |
--- a/app-admin/abrt/files/abrt-2.0.5-init |
412 |
+++ /dev/null |
413 |
@@ -1,57 +0,0 @@ |
414 |
-#!/sbin/runscript |
415 |
-# Copyright 1999-2011 Gentoo Foundation |
416 |
-# Distributed under the terms of the GNU General Public License v2 |
417 |
-# $Header: $ |
418 |
- |
419 |
-description="Automated crash detection service" |
420 |
- |
421 |
-depend() { |
422 |
- need dbus logger |
423 |
-} |
424 |
- |
425 |
-start() { |
426 |
- ebegin "Starting abrtd" |
427 |
- start-stop-daemon --start --quiet --pidfile /var/run/abrtd.pid \ |
428 |
- --exec /usr/sbin/abrtd -- ${ABRTD_OPTS} |
429 |
- eend $? |
430 |
- |
431 |
- if [[ "${START_VMCORE}" = "yes" ]]; then |
432 |
- ebegin "Running abrt-harvest-vmcore" |
433 |
- /usr/sbin/abrt-harvest-vmcore |
434 |
- eend $? |
435 |
- fi |
436 |
- |
437 |
- if [[ "${START_CCPP}" = "yes" ]]; then |
438 |
- ebegin "Installing abrt-ccpp hook" |
439 |
- /usr/sbin/abrt-install-ccpp-hook install |
440 |
- eend $? |
441 |
- fi |
442 |
- |
443 |
- if [[ "${START_OOPS}" = "yes" ]]; then |
444 |
- ebegin "Starting abrt-dump-oops" |
445 |
- start-stop-daemon --start --quiet \ |
446 |
- --pidfile /var/run/abrt-dump-oops.pid \ |
447 |
- --make-pidfile --background \ |
448 |
- --exec /usr/bin/abrt-dump-oops -- ${OOPS_OPTS} |
449 |
- eend $? |
450 |
- fi |
451 |
-} |
452 |
- |
453 |
-stop() { |
454 |
- if [[ "${START_OOPS}" = "yes" ]]; then |
455 |
- ebegin "Stopping abrt-dump-oops" |
456 |
- start-stop-daemon --stop --quiet \ |
457 |
- --pidfile /var/run/abrt-dump-oops.pid |
458 |
- eend $? |
459 |
- fi |
460 |
- |
461 |
- if [[ "${START_CCPP}" = "yes" ]]; then |
462 |
- ebegin "Uninstalling abrt-ccpp hook" |
463 |
- /usr/sbin/abrt-install-ccpp-hook uninstall |
464 |
- eend $? |
465 |
- fi |
466 |
- |
467 |
- ebegin "Stopping abrtd" |
468 |
- start-stop-daemon --stop --quiet --pidfile /var/run/abrtd.pid |
469 |
- eend $? |
470 |
-} |
471 |
|
472 |
diff --git a/dev-libs/btparser/btparser-0.13.ebuild b/dev-libs/btparser/btparser-0.13.ebuild |
473 |
deleted file mode 100644 |
474 |
index 2c61eb6..0000000 |
475 |
--- a/dev-libs/btparser/btparser-0.13.ebuild |
476 |
+++ /dev/null |
477 |
@@ -1,29 +0,0 @@ |
478 |
-# Copyright 1999-2011 Gentoo Foundation |
479 |
-# Distributed under the terms of the GNU General Public License v2 |
480 |
-# $Header: $ |
481 |
- |
482 |
-EAPI="4" |
483 |
- |
484 |
-DESCRIPTION="Parser and analyzer for backtraces produced by gdb" |
485 |
-HOMEPAGE="https://fedorahosted.org/btparser/" |
486 |
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.xz" |
487 |
- |
488 |
-LICENSE="GPL-2" |
489 |
-SLOT="0" |
490 |
-KEYWORDS="~amd64" |
491 |
-IUSE="static-libs" |
492 |
- |
493 |
-RDEPEND="" |
494 |
-DEPEND="${RDEPEND} |
495 |
- app-arch/xz-utils" |
496 |
- |
497 |
-src_configure() { |
498 |
- econf \ |
499 |
- $(use_enable static-libs static) \ |
500 |
- --disable-maintainer-mode |
501 |
-} |
502 |
- |
503 |
-src_install() { |
504 |
- default |
505 |
- use static-libs || find "${D}" -name '*.la' -exec rm -f {} + |
506 |
-} |
507 |
|
508 |
diff --git a/dev-libs/libreport/files/libreport-2.0.6-gentoo.patch b/dev-libs/libreport/files/libreport-2.0.6-gentoo.patch |
509 |
deleted file mode 100644 |
510 |
index 8aca7b1..0000000 |
511 |
--- a/dev-libs/libreport/files/libreport-2.0.6-gentoo.patch |
512 |
+++ /dev/null |
513 |
@@ -1,151 +0,0 @@ |
514 |
-From 003f49be7c44ea85c1ae5826342749b11aac28ee Mon Sep 17 00:00:00 2001 |
515 |
-From: Alexandre Rostovtsev <tetromino@×××××.com> |
516 |
-Date: Fri, 7 Oct 2011 23:25:14 -0400 |
517 |
-Subject: [PATCH] Replace RedHat defaults with Gentoo ones |
518 |
- |
519 |
---- |
520 |
- src/plugins/Makefile.am | 34 +--------------------------------- |
521 |
- src/plugins/bugzilla.conf | 2 +- |
522 |
- src/plugins/report_Bugzilla.conf | 2 +- |
523 |
- src/plugins/report_Bugzilla.xml.in | 4 ++-- |
524 |
- src/plugins/reporter-bugzilla.txt | 2 +- |
525 |
- 5 files changed, 6 insertions(+), 38 deletions(-) |
526 |
- |
527 |
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am |
528 |
-index 19e53fc..607c1b9 100644 |
529 |
---- a/src/plugins/Makefile.am |
530 |
-+++ b/src/plugins/Makefile.am |
531 |
-@@ -4,7 +4,6 @@ pluginslibdir = $(PLUGINS_LIB_DIR) |
532 |
- |
533 |
- bin_PROGRAMS = \ |
534 |
- reporter-bugzilla \ |
535 |
-- reporter-rhtsupport \ |
536 |
- reporter-kerneloops \ |
537 |
- reporter-upload \ |
538 |
- reporter-mailx \ |
539 |
-@@ -16,8 +15,7 @@ pluginsconfdir = $(PLUGINS_CONF_DIR) |
540 |
- reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR) |
541 |
- |
542 |
- dist_reportpluginsconf_DATA = \ |
543 |
-- bugzilla.conf \ |
544 |
-- rhtsupport.conf |
545 |
-+ bugzilla.conf |
546 |
- |
547 |
- eventsdir = $(EVENTS_DIR) |
548 |
- |
549 |
-@@ -27,7 +25,6 @@ dist_events_DATA = \ |
550 |
- report_Logger.conf \ |
551 |
- report_Logger.xml \ |
552 |
- report_Mailx.xml \ |
553 |
-- report_RHTSupport.xml \ |
554 |
- report_Kerneloops.xml \ |
555 |
- report_Uploader.xml |
556 |
- |
557 |
-@@ -39,14 +36,12 @@ dist_eventsconf_DATA = \ |
558 |
- mailx_event.conf \ |
559 |
- print_event.conf \ |
560 |
- bugzilla_event.conf \ |
561 |
-- rhtsupport_event.conf \ |
562 |
- uploader_event.conf |
563 |
- |
564 |
- MAN_TXT = \ |
565 |
- reporter-print.txt \ |
566 |
- reporter-mailx.txt \ |
567 |
- reporter-bugzilla.txt \ |
568 |
-- reporter-rhtsupport.txt \ |
569 |
- reporter-kerneloops.txt \ |
570 |
- reporter-upload.txt \ |
571 |
- report.txt |
572 |
-@@ -71,7 +66,6 @@ EXTRA_DIST = \ |
573 |
- report_Logger.conf \ |
574 |
- report_Logger.xml.in \ |
575 |
- report_Mailx.xml.in \ |
576 |
-- report_RHTSupport.xml.in \ |
577 |
- report_Kerneloops.xml.in \ |
578 |
- report_Uploader.xml.in |
579 |
- |
580 |
-@@ -100,32 +94,6 @@ reporter_bugzilla_LDADD = \ |
581 |
- ../lib/libabrt_web.la \ |
582 |
- ../lib/libreport.la |
583 |
- |
584 |
--reporter_rhtsupport_SOURCES = \ |
585 |
-- abrt_rh_support.h abrt_rh_support.c \ |
586 |
-- reporter-rhtsupport.c |
587 |
--reporter_rhtsupport_CPPFLAGS = \ |
588 |
-- -I$(srcdir)/../include \ |
589 |
-- -I$(srcdir)/../lib \ |
590 |
-- -DBIN_DIR=\"$(bindir)\" \ |
591 |
-- -DVAR_RUN=\"$(VAR_RUN)\" \ |
592 |
-- -DCONF_DIR=\"$(CONF_DIR)\" \ |
593 |
-- -DLOCALSTATEDIR='"$(localstatedir)"' \ |
594 |
-- -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ |
595 |
-- -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ |
596 |
-- -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ |
597 |
-- -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \ |
598 |
-- $(GLIB_CFLAGS) \ |
599 |
-- $(LIBREPORT_CFLAGS) \ |
600 |
-- $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \ |
601 |
-- -D_GNU_SOURCE \ |
602 |
-- -Wall -Wwrite-strings -Werror |
603 |
--reporter_rhtsupport_LDFLAGS = -ltar |
604 |
--reporter_rhtsupport_LDADD = \ |
605 |
-- $(GLIB_LIBS) \ |
606 |
-- $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \ |
607 |
-- ../lib/libabrt_web.la \ |
608 |
-- ../lib/libreport.la |
609 |
-- |
610 |
- reporter_upload_SOURCES = \ |
611 |
- reporter-upload.c |
612 |
- reporter_upload_CPPFLAGS = \ |
613 |
-diff --git a/src/plugins/bugzilla.conf b/src/plugins/bugzilla.conf |
614 |
-index 18eba5a..f5afe6f 100644 |
615 |
---- a/src/plugins/bugzilla.conf |
616 |
-+++ b/src/plugins/bugzilla.conf |
617 |
-@@ -1,5 +1,5 @@ |
618 |
- # Bugzilla URL |
619 |
--BugzillaURL = https://bugzilla.redhat.com/ |
620 |
-+BugzillaURL = https://bugs.gentoo.org/ |
621 |
- # yes means that ssl certificates will be checked |
622 |
- SSLVerify = yes |
623 |
- # your login has to exist, if you don have any, please create one |
624 |
-diff --git a/src/plugins/report_Bugzilla.conf b/src/plugins/report_Bugzilla.conf |
625 |
-index f1a77f5..9e9c7d0 100644 |
626 |
---- a/src/plugins/report_Bugzilla.conf |
627 |
-+++ b/src/plugins/report_Bugzilla.conf |
628 |
-@@ -1,4 +1,4 @@ |
629 |
--Bugzilla_BugzillaURL = https://bugzilla.redhat.com |
630 |
-+Bugzilla_BugzillaURL = https://bugs.gentoo.org |
631 |
- Bugzilla_Login = |
632 |
- Bugzilla_Password = |
633 |
- Bugzilla_SSLVerify = yes |
634 |
-diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in |
635 |
-index f8dac8f..e91115f 100644 |
636 |
---- a/src/plugins/report_Bugzilla.xml.in |
637 |
-+++ b/src/plugins/report_Bugzilla.xml.in |
638 |
-@@ -15,8 +15,8 @@ |
639 |
- <_label>Bugzilla URL</_label> |
640 |
- <allow-empty>no</allow-empty> |
641 |
- <_description>Address of Bugzilla server</_description> |
642 |
-- <default-value>https://bugzilla.redhat.com</default-value> |
643 |
-- <_note-html>You can create bugzilla.redhat.com account <a href="https://bugzilla.redhat.com/createaccount.cgi">here</a></_note-html> |
644 |
-+ <default-value>https://bugs.gentoo.org</default-value> |
645 |
-+ <_note-html>You can create a Gentoo Bugzilla account <a href="https://bugs.gentoo.org/createaccount.cgi">here</a></_note-html> |
646 |
- </option> |
647 |
- <option type="text" name="Bugzilla_Login"> |
648 |
- <_label>User name</_label> |
649 |
-diff --git a/src/plugins/reporter-bugzilla.txt b/src/plugins/reporter-bugzilla.txt |
650 |
-index 4285600..29c45ce 100644 |
651 |
---- a/src/plugins/reporter-bugzilla.txt |
652 |
-+++ b/src/plugins/reporter-bugzilla.txt |
653 |
-@@ -41,7 +41,7 @@ Configuration file lines should have 'PARAM = VALUE' format. The parameters are: |
654 |
- Password to Bugzilla account. |
655 |
- |
656 |
- 'BugzillaURL':: |
657 |
-- Bugzilla HTTP(S) address. (default: https://bugzilla.redhat.com) |
658 |
-+ Bugzilla HTTP(S) address. (default: https://bugs.gentoo.org) |
659 |
- |
660 |
- 'SSLVerify':: |
661 |
- Use yes/true/on/1 to verify server's SSL certificate. (default: yes) |
662 |
--- |
663 |
-1.7.7 |
664 |
- |
665 |
|
666 |
diff --git a/dev-libs/libreport/files/libreport-2.0.6-no-bugzilla.patch b/dev-libs/libreport/files/libreport-2.0.6-no-bugzilla.patch |
667 |
deleted file mode 100644 |
668 |
index 4a11c7f..0000000 |
669 |
--- a/dev-libs/libreport/files/libreport-2.0.6-no-bugzilla.patch |
670 |
+++ /dev/null |
671 |
@@ -1,78 +0,0 @@ |
672 |
-From 4cbdd212a9cb77ae586aa76936a6af8e4aaa1344 Mon Sep 17 00:00:00 2001 |
673 |
-From: Alexandre Rostovtsev <tetromino@×××××.com> |
674 |
-Date: Sat, 8 Oct 2011 00:26:15 -0400 |
675 |
-Subject: [PATCH] Disable bugzilla plugin (requires Gentoo infrastructure |
676 |
- changes) |
677 |
- |
678 |
---- |
679 |
- src/plugins/Makefile.am | 28 +--------------------------- |
680 |
- 1 files changed, 1 insertions(+), 27 deletions(-) |
681 |
- |
682 |
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am |
683 |
-index 607c1b9..5addc10 100644 |
684 |
---- a/src/plugins/Makefile.am |
685 |
-+++ b/src/plugins/Makefile.am |
686 |
-@@ -3,7 +3,6 @@ |
687 |
- pluginslibdir = $(PLUGINS_LIB_DIR) |
688 |
- |
689 |
- bin_PROGRAMS = \ |
690 |
-- reporter-bugzilla \ |
691 |
- reporter-kerneloops \ |
692 |
- reporter-upload \ |
693 |
- reporter-mailx \ |
694 |
-@@ -14,8 +13,7 @@ pluginsconfdir = $(PLUGINS_CONF_DIR) |
695 |
- |
696 |
- reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR) |
697 |
- |
698 |
--dist_reportpluginsconf_DATA = \ |
699 |
-- bugzilla.conf |
700 |
-+dist_reportpluginsconf_DATA = |
701 |
- |
702 |
- eventsdir = $(EVENTS_DIR) |
703 |
- |
704 |
-@@ -35,13 +33,11 @@ eventsconfdir = $(EVENTS_CONF_DIR) |
705 |
- dist_eventsconf_DATA = \ |
706 |
- mailx_event.conf \ |
707 |
- print_event.conf \ |
708 |
-- bugzilla_event.conf \ |
709 |
- uploader_event.conf |
710 |
- |
711 |
- MAN_TXT = \ |
712 |
- reporter-print.txt \ |
713 |
- reporter-mailx.txt \ |
714 |
-- reporter-bugzilla.txt \ |
715 |
- reporter-kerneloops.txt \ |
716 |
- reporter-upload.txt \ |
717 |
- report.txt |
718 |
-@@ -72,28 +68,6 @@ EXTRA_DIST = \ |
719 |
- $(DESTDIR)/$(DEBUG_INFO_DIR): |
720 |
- $(mkdir_p) '$@' |
721 |
- |
722 |
--reporter_bugzilla_SOURCES = \ |
723 |
-- reporter-bugzilla.c rhbz.c rhbz.h |
724 |
--reporter_bugzilla_CPPFLAGS = \ |
725 |
-- -I$(srcdir)/../include \ |
726 |
-- -I$(srcdir)/../lib \ |
727 |
-- -DBIN_DIR=\"$(bindir)\" \ |
728 |
-- -DVAR_RUN=\"$(VAR_RUN)\" \ |
729 |
-- -DCONF_DIR=\"$(CONF_DIR)\" \ |
730 |
-- -DLOCALSTATEDIR='"$(localstatedir)"' \ |
731 |
-- -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ |
732 |
-- -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \ |
733 |
-- -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ |
734 |
-- -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \ |
735 |
-- $(GLIB_CFLAGS) \ |
736 |
-- $(LIBREPORT_CFLAGS) \ |
737 |
-- -D_GNU_SOURCE \ |
738 |
-- -Wall -Wwrite-strings |
739 |
--reporter_bugzilla_LDADD = \ |
740 |
-- $(GLIB_LIBS) \ |
741 |
-- ../lib/libabrt_web.la \ |
742 |
-- ../lib/libreport.la |
743 |
-- |
744 |
- reporter_upload_SOURCES = \ |
745 |
- reporter-upload.c |
746 |
- reporter_upload_CPPFLAGS = \ |
747 |
--- |
748 |
-1.7.7 |
749 |
- |
750 |
|
751 |
diff --git a/dev-libs/libreport/files/libreport-2.0.6-not-reportable.patch b/dev-libs/libreport/files/libreport-2.0.6-not-reportable.patch |
752 |
deleted file mode 100644 |
753 |
index e1e1ae4..0000000 |
754 |
--- a/dev-libs/libreport/files/libreport-2.0.6-not-reportable.patch |
755 |
+++ /dev/null |
756 |
@@ -1,218 +0,0 @@ |
757 |
-commit fbcf816140baa534e390fc7d4124189a3d406659 |
758 |
-Author: Nikola Pajkovsky <npajkovs@××××××.com> |
759 |
-Date: Wed Oct 5 15:50:20 2011 +0200 |
760 |
- |
761 |
- refuse reporting when *not-reportable* file exist |
762 |
- |
763 |
- Signed-off-by: Nikola Pajkovsky <npajkovs@××××××.com> |
764 |
- |
765 |
-diff --git a/src/cli/cli-report.c b/src/cli/cli-report.c |
766 |
-index 0011ebc..c8fa672 100644 |
767 |
---- a/src/cli/cli-report.c |
768 |
-+++ b/src/cli/cli-report.c |
769 |
-@@ -750,6 +750,26 @@ int report(const char *dump_dir_name, int flags) |
770 |
- if (!dd) |
771 |
- return -1; |
772 |
- |
773 |
-+ char *not_reportable = dd_load_text_ext(dd, FILENAME_NOT_REPORTABLE, 0 |
774 |
-+ | DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE |
775 |
-+ | DD_FAIL_QUIETLY_ENOENT |
776 |
-+ | DD_FAIL_QUIETLY_EACCES); |
777 |
-+ |
778 |
-+ if (not_reportable) |
779 |
-+ { |
780 |
-+ char *reason = dd_load_text_ext(dd, FILENAME_REASON, 0 |
781 |
-+ | DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE); |
782 |
-+ char *t = xasprintf("%s%s%s", |
783 |
-+ not_reportable ?: "", |
784 |
-+ not_reportable ? ": " : "", |
785 |
-+ reason ?: _("(no description)")); |
786 |
-+ |
787 |
-+ dd_close(dd); |
788 |
-+ error_msg("%s", t); |
789 |
-+ free(t); |
790 |
-+ xfunc_die(); |
791 |
-+ } |
792 |
-+ |
793 |
- if (!(flags & CLI_REPORT_ONLY)) |
794 |
- { |
795 |
- char *analyze_events_as_lines = list_possible_events(dd, NULL, "analyze"); |
796 |
-diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c |
797 |
-index 0279f83..8bdc8d1 100644 |
798 |
---- a/src/gui-wizard-gtk/wizard.c |
799 |
-+++ b/src/gui-wizard-gtk/wizard.c |
800 |
-@@ -1032,7 +1032,16 @@ void update_gui_state_from_problem_data(void) |
801 |
- gtk_window_set_title(GTK_WINDOW(g_assistant), g_dump_dir_name); |
802 |
- |
803 |
- const char *reason = get_problem_item_content_or_NULL(g_cd, FILENAME_REASON); |
804 |
-- gtk_label_set_text(g_lbl_cd_reason, reason ? reason : _("(no description)")); |
805 |
-+ const char *not_reportable = get_problem_item_content_or_NULL(g_cd, |
806 |
-+ FILENAME_NOT_REPORTABLE); |
807 |
-+ |
808 |
-+ char *t = xasprintf("%s%s%s", |
809 |
-+ not_reportable ?: "", |
810 |
-+ not_reportable ? ": " : "", |
811 |
-+ reason ?: _("(no description)")); |
812 |
-+ |
813 |
-+ gtk_label_set_text(g_lbl_cd_reason, t); |
814 |
-+ free(t); |
815 |
- |
816 |
- gtk_list_store_clear(g_ls_details); |
817 |
- struct cd_stats stats = { 0 }; |
818 |
-@@ -2281,12 +2290,21 @@ static void add_pages() |
819 |
- error_msg_and_die("Can't load %s: %s", g_glade_file, error->message); |
820 |
- } |
821 |
- |
822 |
-+ struct dump_dir *dd = dd_opendir(g_dump_dir_name, DD_OPEN_READONLY | DD_FAIL_QUIETLY_EACCES); |
823 |
-+ if (!dd) |
824 |
-+ return; |
825 |
-+ char *not_reportable = dd_load_text_ext(dd, FILENAME_NOT_REPORTABLE, 0 |
826 |
-+ | DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE |
827 |
-+ | DD_FAIL_QUIETLY_ENOENT |
828 |
-+ | DD_FAIL_QUIETLY_EACCES); |
829 |
-+ dd_close(dd); |
830 |
-+ |
831 |
- int i; |
832 |
- int page_no = 0; |
833 |
- for (i = 0; page_names[i] != NULL; i++) |
834 |
- { |
835 |
- char *delim = strrchr(page_names[i], '_'); |
836 |
-- if (delim != NULL) |
837 |
-+ if (!not_reportable && delim) |
838 |
- { |
839 |
- if (g_report_only && (strncmp(delim + 1, "report", strlen("report"))) != 0) |
840 |
- { |
841 |
-@@ -2308,10 +2326,14 @@ static void add_pages() |
842 |
- gtk_assistant_set_page_complete(g_assistant, page, true); |
843 |
- |
844 |
- gtk_assistant_set_page_title(g_assistant, page, pages[i].title); |
845 |
-- gtk_assistant_set_page_type(g_assistant, page, pages[i].type); |
846 |
-+ if (not_reportable && i == 0) |
847 |
-+ gtk_assistant_set_page_type(g_assistant, pages[i].page_widget, GTK_ASSISTANT_PAGE_SUMMARY); |
848 |
-+ else |
849 |
-+ gtk_assistant_set_page_type(g_assistant, page, pages[i].type); |
850 |
- |
851 |
- VERB1 log("added page: %s", page_names[i]); |
852 |
- } |
853 |
-+ free(not_reportable); |
854 |
- |
855 |
- /* Set pointers to objects we might need to work with */ |
856 |
- g_lbl_cd_reason = GTK_LABEL( gtk_builder_get_object(builder, "lbl_cd_reason")); |
857 |
-@@ -2369,10 +2391,14 @@ static void add_pages() |
858 |
- |
859 |
- /* Add "Close" button */ |
860 |
- GtkWidget *w; |
861 |
-- w = gtk_button_new_from_stock(GTK_STOCK_CLOSE); |
862 |
-- g_signal_connect(w, "clicked", G_CALLBACK(gtk_main_quit), NULL); |
863 |
-- gtk_widget_show(w); |
864 |
-- gtk_assistant_add_action_widget(g_assistant, w); |
865 |
-+ if (!not_reportable) |
866 |
-+ { |
867 |
-+ w = gtk_button_new_from_stock(GTK_STOCK_CLOSE); |
868 |
-+ g_signal_connect(w, "clicked", G_CALLBACK(gtk_main_quit), NULL); |
869 |
-+ gtk_widget_show(w); |
870 |
-+ gtk_assistant_add_action_widget(g_assistant, w); |
871 |
-+ } |
872 |
-+ |
873 |
- /* and hide "Cancel" button - "Close" is a better name for what we want */ |
874 |
- gtk_assistant_commit(g_assistant); |
875 |
- |
876 |
-diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h |
877 |
-index 67a7ea3..5fc09c3 100644 |
878 |
---- a/src/include/internal_libreport.h |
879 |
-+++ b/src/include/internal_libreport.h |
880 |
-@@ -581,7 +581,7 @@ int delete_dump_dir_possibly_using_abrtd(const char *dump_dir_name); |
881 |
- struct dump_dir *steal_directory(const char *base_dir, const char *dump_dir_name); |
882 |
- |
883 |
- #define kernel_tainted_short libreport_kernel_tainted_short |
884 |
--char *kernel_tainted_short(unsigned tainted); |
885 |
-+char *kernel_tainted_short(const char *kernel_bt); |
886 |
- #define kernel_tainted_long libreport_kernel_tainted_long |
887 |
- GList *kernel_tainted_long(unsigned tainted); |
888 |
- |
889 |
-@@ -635,6 +635,7 @@ GList *kernel_tainted_long(unsigned tainted); |
890 |
- */ |
891 |
- #define FILENAME_REPORTED_TO "reported_to" |
892 |
- #define FILENAME_EVENT_LOG "event_log" |
893 |
-+#define FILENAME_NOT_REPORTABLE "not-reportable" |
894 |
- |
895 |
- // Not stored as files, added "on the fly": |
896 |
- #define CD_DUMPDIR "Directory" |
897 |
-diff --git a/src/lib/kernel-tainted.c b/src/lib/kernel-tainted.c |
898 |
-index 3595408..217587c 100644 |
899 |
---- a/src/lib/kernel-tainted.c |
900 |
-+++ b/src/lib/kernel-tainted.c |
901 |
-@@ -18,6 +18,12 @@ |
902 |
- */ |
903 |
- #include "internal_libreport.h" |
904 |
- |
905 |
-+/* reading /proc/sys/kernel/tainted file after an oops is ALWAYS going |
906 |
-+ * to show it as tainted. |
907 |
-+ * |
908 |
-+ * https://bugzilla.redhat.com/show_bug.cgi?id=724838 |
909 |
-+ */ |
910 |
-+ |
911 |
- /* From RHEL6 kernel/panic.c: */ |
912 |
- static const int tnts_short[] = { |
913 |
- 'P' , |
914 |
-@@ -106,21 +112,16 @@ static const char *const tnts_long[] = { |
915 |
- "Tech_preview", |
916 |
- }; |
917 |
- |
918 |
--char *kernel_tainted_short(unsigned tainted) |
919 |
-+char *kernel_tainted_short(const char *kernel_bt) |
920 |
- { |
921 |
-- char *tnt = xzalloc(ARRAY_SIZE(tnts_short) + 1); |
922 |
-- int i = 0; |
923 |
-- while (tainted) |
924 |
-- { |
925 |
-- if (0x1 & tainted) |
926 |
-- tnt[i] = tnts_short[i]; |
927 |
-- else |
928 |
-- tnt[i] = '-'; |
929 |
- |
930 |
-- ++i; |
931 |
-- tainted >>= 1; |
932 |
-- } |
933 |
-+ /* example of flags: |G B | */ |
934 |
-+ char *tainted = strstr(kernel_bt, "Tainted: "); |
935 |
-+ if (!tainted) |
936 |
-+ return NULL; |
937 |
- |
938 |
-+ /* 12 == count of flags */ |
939 |
-+ char *tnt = xstrndup(tainted + strlen("Tainted: "), 12); |
940 |
- return tnt; |
941 |
- } |
942 |
- |
943 |
-diff --git a/src/report-newt/report-newt.c b/src/report-newt/report-newt.c |
944 |
-index b8dddbc..02f75c8 100644 |
945 |
---- a/src/report-newt/report-newt.c |
946 |
-+++ b/src/report-newt/report-newt.c |
947 |
-@@ -318,6 +318,27 @@ static int report(const char *dump_dir_name) |
948 |
- if (!(dd = dd_opendir(dump_dir_name, 0))) |
949 |
- return -1; |
950 |
- events_as_lines = list_possible_events(dd, NULL, "report"); |
951 |
-+ |
952 |
-+ char *not_reportable = dd_load_text_ext(dd, FILENAME_NOT_REPORTABLE, 0 |
953 |
-+ | DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE |
954 |
-+ | DD_FAIL_QUIETLY_ENOENT |
955 |
-+ | DD_FAIL_QUIETLY_EACCES); |
956 |
-+ |
957 |
-+ if (not_reportable) |
958 |
-+ { |
959 |
-+ char *reason = dd_load_text_ext(dd, FILENAME_REASON, 0 |
960 |
-+ | DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE); |
961 |
-+ char *t = xasprintf("%s%s%s", |
962 |
-+ not_reportable ?: "", |
963 |
-+ not_reportable ? ": " : "", |
964 |
-+ reason ?: _("(no description)")); |
965 |
-+ |
966 |
-+ dd_close(dd); |
967 |
-+ newtWinMessage(_("Error"), _("Ok"), "%s", t); |
968 |
-+ free(t); |
969 |
-+ return -1; |
970 |
-+ } |
971 |
-+ |
972 |
- dd_close(dd); |
973 |
- |
974 |
- reporters = get_available_reporters(events_as_lines); |
975 |
|
976 |
diff --git a/dev-libs/libreport/libreport-2.0.6.ebuild b/dev-libs/libreport/libreport-2.0.6.ebuild |
977 |
deleted file mode 100644 |
978 |
index 72bb2cf..0000000 |
979 |
--- a/dev-libs/libreport/libreport-2.0.6.ebuild |
980 |
+++ /dev/null |
981 |
@@ -1,101 +0,0 @@ |
982 |
-# Copyright 1999-2011 Gentoo Foundation |
983 |
-# Distributed under the terms of the GNU General Public License v2 |
984 |
-# $Header: $ |
985 |
- |
986 |
-EAPI="4" |
987 |
-PYTHON_DEPEND="2:2.6" |
988 |
- |
989 |
-inherit autotools eutils python |
990 |
- |
991 |
-DESCRIPTION="Generic library for reporting various problems" |
992 |
-HOMEPAGE="https://fedorahosted.org/abrt/" |
993 |
-SRC_URI="https://fedorahosted.org/released/abrt/${P}.tar.gz" |
994 |
- |
995 |
-LICENSE="GPL-2" |
996 |
-SLOT="0" |
997 |
-KEYWORDS="~amd64" |
998 |
-IUSE="debug" |
999 |
- |
1000 |
-RDEPEND=">=dev-libs/glib-2.21:2 |
1001 |
- dev-libs/newt |
1002 |
- dev-libs/nss |
1003 |
- dev-libs/libtar |
1004 |
- dev-libs/libxml2 |
1005 |
- dev-libs/xmlrpc-c |
1006 |
- gnome-base/gnome-keyring |
1007 |
- net-misc/curl[ssl] |
1008 |
- sys-apps/dbus |
1009 |
- x11-libs/gtk+:2" |
1010 |
-DEPEND="${RDEPEND} |
1011 |
- app-text/asciidoc |
1012 |
- app-text/xmlto |
1013 |
- >=dev-util/intltool-0.3.50 |
1014 |
- >=dev-util/pkgconfig-0.9.0 |
1015 |
- >=sys-devel/gettext-0.17" |
1016 |
- |
1017 |
-# Tests require python-meh, which is highly redhat-specific. |
1018 |
-RESTRICT="tests" |
1019 |
- |
1020 |
-pkg_setup() { |
1021 |
- python_set_active_version 2 |
1022 |
- python_pkg_setup |
1023 |
- |
1024 |
- enewgroup abrt |
1025 |
- enewuser abrt -1 -1 -1 abrt |
1026 |
-} |
1027 |
- |
1028 |
-src_prepare() { |
1029 |
- # Replace redhat-specific defaults with gentoo ones |
1030 |
- epatch "${FILESDIR}/${PN}-2.0.6-gentoo.patch" |
1031 |
- |
1032 |
- # Disable bugzilla plugin for now (requires bugs.gentoo.org infra support) |
1033 |
- epatch "${FILESDIR}/${PN}-2.0.6-no-bugzilla.patch" |
1034 |
- |
1035 |
- # Needed for abrt-2.0.5, will be in next release |
1036 |
- epatch "${FILESDIR}/${P}-not-reportable.patch" |
1037 |
- |
1038 |
- # Wizard does not build with -Werror under gcc-4.6 (fails format-security |
1039 |
- # in gtk_message_dialog_new() calls) |
1040 |
- sed -e "s/ -Werror$//" -i src/gui-wizard-gtk/Makefile.* || die |
1041 |
- |
1042 |
- mkdir m4 |
1043 |
- eautoreconf |
1044 |
- ln -sfn $(type -P true) py-compile |
1045 |
-} |
1046 |
- |
1047 |
-src_configure() { |
1048 |
- # Gentoo's xmlrpc-c does not provide a pkgconfig file |
1049 |
- # XXX: this is probably cross-compile-unfriendly |
1050 |
- export XMLRPC_CFLAGS=$(xmlrpc-c-config --cflags) |
1051 |
- export XMLRPC_LIBS=$(xmlrpc-c-config --libs) |
1052 |
- export XMLRPC_CLIENT_CFLAGS=$(xmlrpc-c-config client --cflags) |
1053 |
- export XMLRPC_CLIENT_LIBS=$(xmlrpc-c-config client --libs) |
1054 |
- # Configure checks for python.pc; our python-2.7 installs python-2.7.pc, |
1055 |
- # while python-2.6 does not install any pkgconfig file. |
1056 |
- export PYTHON_CFLAGS=$(python-config --includes) |
1057 |
- export PYTHON_LIBS=$(python-config --libs) |
1058 |
- |
1059 |
- ECONF="--localstatedir=${EPREFIX}/var" |
1060 |
- # --disable-debug enables debug! |
1061 |
- use debug && ECONF="${ECONF} --enable-debug" |
1062 |
- econf ${ECONF} |
1063 |
-} |
1064 |
- |
1065 |
-src_install() { |
1066 |
- emake DESTDIR="${D}" install |
1067 |
- dodoc README |
1068 |
- |
1069 |
- # Need to set correct ownership for use by app-admin/abrt |
1070 |
- diropts -o abrt -g abrt |
1071 |
- keepdir /var/spool/abrt |
1072 |
- |
1073 |
- find "${D}" -name '*.la' -exec rm -f {} + || die |
1074 |
-} |
1075 |
- |
1076 |
-pkg_postinst() { |
1077 |
- python_mod_optimize report reportclient |
1078 |
-} |
1079 |
- |
1080 |
-pkg_postrm() { |
1081 |
- python_mod_cleanup report reportclient |
1082 |
-} |