diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-11-16 07:44:24 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-11-16 07:44:24 +0000 |
commit | f2956d122dcf94a9a87370ab5be2824e72527bc3 (patch) | |
tree | 92b2b32d6c1e0306118819a0c233379942d6fc66 /app-admin/abrt | |
parent | Add bug reporting library from the gnome overlay; needed for abrt. (diff) | |
download | historical-f2956d122dcf94a9a87370ab5be2824e72527bc3.tar.gz historical-f2956d122dcf94a9a87370ab5be2824e72527bc3.tar.bz2 historical-f2956d122dcf94a9a87370ab5be2824e72527bc3.zip |
Add Fedora's automatic crash reporter tool from the gnome overlay.
Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64
Diffstat (limited to 'app-admin/abrt')
-rw-r--r-- | app-admin/abrt/ChangeLog | 12 | ||||
-rw-r--r-- | app-admin/abrt/Manifest | 19 | ||||
-rw-r--r-- | app-admin/abrt/abrt-2.0.6.ebuild | 117 | ||||
-rw-r--r-- | app-admin/abrt/files/abrt-2.0.5-conf | 15 | ||||
-rwxr-xr-x | app-admin/abrt/files/abrt-2.0.5-init | 57 | ||||
-rw-r--r-- | app-admin/abrt/files/abrt-2.0.6-format-security.patch | 27 | ||||
-rw-r--r-- | app-admin/abrt/files/abrt-2.0.6-gentoo.patch | 239 | ||||
-rw-r--r-- | app-admin/abrt/files/abrt-2.0.6-glib-2.31.patch | 72 | ||||
-rw-r--r-- | app-admin/abrt/metadata.xml | 5 |
9 files changed, 563 insertions, 0 deletions
diff --git a/app-admin/abrt/ChangeLog b/app-admin/abrt/ChangeLog new file mode 100644 index 000000000000..e357875a19fb --- /dev/null +++ b/app-admin/abrt/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for app-admin/abrt +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/ChangeLog,v 1.1 2011/11/16 07:44:24 tetromino Exp $ + +*abrt-2.0.6 (16 Nov 2011) + + 16 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> + +files/abrt-2.0.5-conf, +files/abrt-2.0.5-init, +abrt-2.0.6.ebuild, + +files/abrt-2.0.6-format-security.patch, +files/abrt-2.0.6-gentoo.patch, + +files/abrt-2.0.6-glib-2.31.patch, +metadata.xml: + Add Fedora's automatic crash reporter tool from the gnome overlay. + diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest new file mode 100644 index 000000000000..5ea24be08875 --- /dev/null +++ b/app-admin/abrt/Manifest @@ -0,0 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX abrt-2.0.5-conf 390 RMD160 b1944276652b643420e66b43575f9ac72f51c725 SHA1 48ebccf411e0af19aaa10fdb71a5aa1ec4714d93 SHA256 1730ac3e69309bcff1ba3c599da1d19e7ca4ac623504613e928d4de0cd8640ec +AUX abrt-2.0.5-init 1408 RMD160 55bbad48fd1c2b5c2d9efb64ccf28a8609b911e3 SHA1 4798067960acdab6abf3d0c3ad469c1105a01a6f SHA256 2894a7b5c98c142ba1318679c48a3679885549b36ca218a79cbb2fe5eb7aecba +AUX abrt-2.0.6-format-security.patch 911 RMD160 e1b545edc5ddf903fde7c32c1019a6d3ef534f94 SHA1 848776a60c08df904643c2b18685fea350688141 SHA256 23059d8bfc28ed3277828493dc267801baa1351e5a8a70c4879fbac3742f5ec8 +AUX abrt-2.0.6-gentoo.patch 8192 RMD160 a7cd1c4fb38c0670df4922b6275c08aa5c117263 SHA1 6c3fd4dad4ee5b89296744183a7706eae762b50e SHA256 47ab22b09079fa9420d5dd179ade4fd78ff68373170b925be2d084ff8d377200 +AUX abrt-2.0.6-glib-2.31.patch 2388 RMD160 5a58a75acdacb2c7a253422b2782ccd6c81eec8d SHA1 b10c0f5920d7c26fc5aeb1c185e2aeeebfdc1ccd SHA256 89b3bd2abb06f3eae45f1252a32ff88223e42cf980e30cb5fa7af36d22df70be +DIST abrt-2.0.6.tar.gz 996676 RMD160 a3a048e9223cbe9bbecca9469937812debafd43f SHA1 5f3863b4ea10a23f813f439213c3379a228c5063 SHA256 0413a6b6143d0e667bb9c2c34a8ddfdb82d0dff04050acd254eb86943dd181a1 +EBUILD abrt-2.0.6.ebuild 2989 RMD160 5067681a1f3d0eb360cface5fe2b0d52004b567d SHA1 5f5522984ca377cc7e7163a022127997da75b937 SHA256 596391b75de3bf6bd989eb0889a9a11f174a6a87572fbb9af12f69245fd15a61 +MISC ChangeLog 557 RMD160 5f07559b6b8c5f2f6c6fe1eb739450ed1c020ddb SHA1 25fd8bd038f4e7f8b2b29eaa5cf2ac4f193d3875 SHA256 84b7efed9d4cec9644f798aa98c4152b72fd50006a423df534a2a924bf242894 +MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk7Dad0ACgkQdjK8w9WeBnD2CQD+LTZpQAwJiRdpNln4jIVFjoN4 +hSgg+UkChgmx32Kl4iIA/3AU9l/u114Px2AuDfAwNei3KHM5UETn39VyzTx8BXyx +=fyl1 +-----END PGP SIGNATURE----- diff --git a/app-admin/abrt/abrt-2.0.6.ebuild b/app-admin/abrt/abrt-2.0.6.ebuild new file mode 100644 index 000000000000..1444e3fb9621 --- /dev/null +++ b/app-admin/abrt/abrt-2.0.6.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/abrt-2.0.6.ebuild,v 1.1 2011/11/16 07:44:24 tetromino Exp $ + +PYTHON_DEPEND="2:2.6" +EAPI="4" + +# Need gnome2-utils for gnome2_icon_cache_update +inherit autotools eutils gnome2-utils python systemd + +DESCRIPTION="Automatic bug detection and reporting tool" +HOMEPAGE="https://fedorahosted.org/abrt/" +SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +COMMON_DEPEND="dev-libs/btparser + >=dev-libs/glib-2.21:2 + dev-libs/libreport + dev-libs/libxml2 + dev-libs/nss + sys-apps/dbus + sys-fs/inotify-tools + x11-libs/gtk+:2 + x11-libs/libnotify" +RDEPEND="${COMMON_DEPEND} + app-arch/cpio + dev-libs/elfutils + sys-devel/gdb" +DEPEND="${COMMON_DEPEND} + app-text/asciidoc + app-text/xmlto + >=dev-util/intltool-0.35.0 + >=dev-util/pkgconfig-0.9.0 + >=sys-devel/gettext-0.17" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup + + enewgroup abrt + enewuser abrt -1 -1 -1 abrt +} + +src_prepare() { + # Disable redhat-specific code not usable in gentoo, or that requires + # bugs.gentoo.org infra support. + epatch "${FILESDIR}/${PN}-2.0.6-gentoo.patch" + + # Using a server response as a format string is a bad idea + epatch "${FILESDIR}/${PN}-2.0.6-format-security.patch" + + # Fixes building with glib-2.31, will be in next release + epatch "${FILESDIR}/${P}-glib-2.31.patch" + + # -Werror should not be used by default + sed -e 's/-Werror\( \|$\)//g' \ + -i src/applet/Makefile.* src/cli/Makefile.* src/daemon/Makefile.* \ + src/gui-gtk/Makefile.* src/hooks/Makefile.* src/lib/Makefile.* \ + src/plugins/Makefile.* || die "sed failed" + + mkdir m4 + eautoreconf + + ln -sfn $(type -P true) py-compile + python_convert_shebangs -r 2 src +} + +src_configure() { + # Configure checks for python.pc; our python-2.7 installs python-2.7.pc, + # while python-2.6 does not install any pkgconfig file. + export PYTHON_CFLAGS=$(python-config --includes) + export PYTHON_LIBS=$(python-config --libs) + + myeconfargs=( "--localstatedir=${EPREFIX}/var" ) + # --disable-debug enables debug! + use debug && myeconfargs=( "${myeconfargs[@]}" --enable-debug ) + systemd_to_myeconfargs + econf "${myeconfargs[@]}" +} + +src_install() { + default + + keepdir /var/run/abrt + # /var/spool/abrt is created by dev-libs/libreport + + diropts -m 700 -o abrt -g abrt + keepdir /var/spool/abrt-upload + + diropts -m 775 -o abrt -g abrt + keepdir /var/cache/abrt-di + + find "${D}" -name '*.la' -exec rm -f {} + || die + + newinitd "${FILESDIR}/${PN}-2.0.5-init" abrt + newconfd "${FILESDIR}/${PN}-2.0.5-conf" abrt +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + python_mod_optimize abrt_exception_handler.py + elog "To start the bug detection service on an openrc-based system, do" + elog "# /etc/init.d/abrt start" +} + +pkg_postrm() { + gnome2_icon_cache_update + python_mod_cleanup abrt_exception_handler.py +} diff --git a/app-admin/abrt/files/abrt-2.0.5-conf b/app-admin/abrt/files/abrt-2.0.5-conf new file mode 100644 index 000000000000..e35958def408 --- /dev/null +++ b/app-admin/abrt/files/abrt-2.0.5-conf @@ -0,0 +1,15 @@ +# abrtd command-line options +# Default: "" +ABRTD_OPTS="" + +# Run abrt-harvest-vmcore to make new kdump dumps available for abrtd +START_VMCORE="yes" + +# Install abrt-ccpp hook to watch for segfaults +START_CCPP="yes" + +# Start abrt-dump-oops to watch for kernel oops +START_OOPS="yes" +# abrt-dump-oops command-line options +# Default: "-rwxD /var/log/messages" +OOPS_OPTS="-rwxD /var/log/messages" diff --git a/app-admin/abrt/files/abrt-2.0.5-init b/app-admin/abrt/files/abrt-2.0.5-init new file mode 100755 index 000000000000..25769df28619 --- /dev/null +++ b/app-admin/abrt/files/abrt-2.0.5-init @@ -0,0 +1,57 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/files/abrt-2.0.5-init,v 1.1 2011/11/16 07:44:24 tetromino Exp $ + +description="Automated crash detection service" + +depend() { + need dbus logger +} + +start() { + ebegin "Starting abrtd" + start-stop-daemon --start --quiet --pidfile /var/run/abrtd.pid \ + --exec /usr/sbin/abrtd -- ${ABRTD_OPTS} + eend $? + + if [[ "${START_VMCORE}" = "yes" ]]; then + ebegin "Running abrt-harvest-vmcore" + /usr/sbin/abrt-harvest-vmcore + eend $? + fi + + if [[ "${START_CCPP}" = "yes" ]]; then + ebegin "Installing abrt-ccpp hook" + /usr/sbin/abrt-install-ccpp-hook install + eend $? + fi + + if [[ "${START_OOPS}" = "yes" ]]; then + ebegin "Starting abrt-dump-oops" + start-stop-daemon --start --quiet \ + --pidfile /var/run/abrt-dump-oops.pid \ + --make-pidfile --background \ + --exec /usr/bin/abrt-dump-oops -- ${OOPS_OPTS} + eend $? + fi +} + +stop() { + if [[ "${START_OOPS}" = "yes" ]]; then + ebegin "Stopping abrt-dump-oops" + start-stop-daemon --stop --quiet \ + --pidfile /var/run/abrt-dump-oops.pid + eend $? + fi + + if [[ "${START_CCPP}" = "yes" ]]; then + ebegin "Uninstalling abrt-ccpp hook" + /usr/sbin/abrt-install-ccpp-hook uninstall + eend $? + fi + + ebegin "Stopping abrtd" + start-stop-daemon --stop --quiet --pidfile /var/run/abrtd.pid + eend $? +} diff --git a/app-admin/abrt/files/abrt-2.0.6-format-security.patch b/app-admin/abrt/files/abrt-2.0.6-format-security.patch new file mode 100644 index 000000000000..6b5c8d0e3721 --- /dev/null +++ b/app-admin/abrt/files/abrt-2.0.6-format-security.patch @@ -0,0 +1,27 @@ +From d0d7954713541df4612ab5b54b2808aae9a3d6f0 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Wed, 16 Nov 2011 00:41:10 -0500 +Subject: [PATCH] Don't use server response as a format string + +It's bad practice even for trusted servers, and makes gcc complain about +format-security. +--- + src/plugins/abrt-retrace-client.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/plugins/abrt-retrace-client.c b/src/plugins/abrt-retrace-client.c +index 0fb17a3..4c30334 100644 +--- a/src/plugins/abrt-retrace-client.c ++++ b/src/plugins/abrt-retrace-client.c +@@ -958,7 +958,7 @@ static int create(bool delete_temp_archive, + 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) + { +-- +1.7.8.rc1 + diff --git a/app-admin/abrt/files/abrt-2.0.6-gentoo.patch b/app-admin/abrt/files/abrt-2.0.6-gentoo.patch new file mode 100644 index 000000000000..62904f2f541a --- /dev/null +++ b/app-admin/abrt/files/abrt-2.0.6-gentoo.patch @@ -0,0 +1,239 @@ +From bbcd5fc8782a1a26fdbf60563b9973093e171ebf Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gmail.com> +Date: Sat, 8 Oct 2011 03:31:56 -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. +--- + configure.ac | 1 - + doc/Makefile.am | 2 -- + src/daemon/Makefile.am | 23 +---------------------- + src/daemon/abrt_event.conf | 2 +- + src/plugins/Makefile.am | 16 ---------------- + src/plugins/abrt-action-list-dsos | 18 ++++-------------- + src/plugins/ccpp_event.conf | 7 +++---- + src/plugins/koops_event.conf | 4 ++-- + src/plugins/python_event.conf | 6 +++--- + 9 files changed, 14 insertions(+), 65 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6b0732c..a340b55 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -60,7 +60,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-2.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 551bc65..51fc97d 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -11,12 +11,10 @@ MAN1_TXT += abrt-action-list-dsos.txt + MAN1_TXT += abrt-retrace-client.txt + MAN1_TXT += abrt-handle-upload.txt + MAN1_TXT += abrt-server.txt +-MAN1_TXT += abrt-action-save-package-data.txt + MAN1_TXT += abrt-install-ccpp-hook.txt + + MAN5_TXT = + MAN5_TXT += abrt.conf.txt +-MAN5_TXT += abrt-action-save-package-data.conf.txt + + MAN8_TXT = + MAN8_TXT += abrtd.txt +diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am +index 82ba93b..07ff6c0 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 +@@ -60,30 +57,12 @@ abrt_handle_event_LDADD = \ + ../lib/libabrt.la \ + $(LIBREPORT_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 \ +- -Wall -Wwrite-strings -Werror +-abrt_action_save_package_data_LDADD = \ +- $(RPM_LIBS) \ +- $(LIBREPORT_LIBS) \ +- ../lib/libabrt.la +- + dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/ + dist_dbusabrtconf_DATA = dbus-abrt.conf + + daemonconfdir = $(CONF_DIR) + dist_daemonconf_DATA = \ +- abrt.conf \ +- abrt-action-save-package-data.conf \ +- gpg_keys ++ abrt.conf + + comredhatabrtservicedir = ${datadir}/dbus-1/system-services + dist_comredhatabrtservice_DATA = com.redhat.abrt.service +diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf +index dec0f0e..d2e48ff 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 + + +diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am +index 9a26877..ac0033d 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,8 +15,6 @@ bin_PROGRAMS = \ + abrt-action-analyze-backtrace \ + abrt-retrace-client + +-libexec_PROGRAMS = abrt-action-install-debuginfo-to-abrt-cache +- + #dist_pluginsconf_DATA = Python.conf + + eventsdir = $(EVENTS_DIR) +@@ -49,7 +46,6 @@ dist_eventsconf_DATA = \ + + + PYTHON_FILES = \ +- abrt-action-install-debuginfo.in \ + abrt-action-list-dsos \ + abrt-action-analyze-core + +@@ -157,18 +153,6 @@ 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 + abrt_retrace_client_CFLAGS = \ +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 7d0d78c..5d4fa74 100644 +--- a/src/plugins/ccpp_event.conf ++++ b/src/plugins/ccpp_event.conf +@@ -28,11 +28,10 @@ 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 + + # Bugzilla requires nonempty duphash +-EVENT=report_Bugzilla analyzer=CCpp duphash!= +- test -f component || abrt-action-save-package-data +- reporter-bugzilla -f -b -c /etc/libreport/plugins/Bugzilla.conf ++# EVENT=report_Bugzilla analyzer=CCpp duphash!= ++# test -f component || abrt-action-save-package-data ++# reporter-bugzilla -f -b -c /etc/libreport/plugins/Bugzilla.conf +diff --git a/src/plugins/koops_event.conf b/src/plugins/koops_event.conf +index d203e1a..83842f9 100644 +--- a/src/plugins/koops_event.conf ++++ b/src/plugins/koops_event.conf +@@ -13,5 +13,5 @@ EVENT=post-create analyzer=Kerneloops + EVENT=report_Kerneloops analyzer=Kerneloops + reporter-kerneloops + +-EVENT=report_Bugzilla analyzer=Kerneloops +- reporter-bugzilla -f -b ++# EVENT=report_Bugzilla analyzer=Kerneloops ++# reporter-bugzilla -f -b +diff --git a/src/plugins/python_event.conf b/src/plugins/python_event.conf +index 16508c1..0cd10c6 100644 +--- a/src/plugins/python_event.conf ++++ b/src/plugins/python_event.conf +@@ -1,6 +1,6 @@ + EVENT=post-create analyzer=Python + abrt-action-analyze-python + +-EVENT=report_Bugzilla analyzer=Python +- test -f component || abrt-action-save-package-data +- reporter-bugzilla -f -b -c /etc/libreport/plugins/Bugzilla.conf ++# EVENT=report_Bugzilla analyzer=Python ++# test -f component || abrt-action-save-package-data ++# reporter-bugzilla -f -b -c /etc/libreport/plugins/Bugzilla.conf +-- +1.7.8.rc1 + diff --git a/app-admin/abrt/files/abrt-2.0.6-glib-2.31.patch b/app-admin/abrt/files/abrt-2.0.6-glib-2.31.patch new file mode 100644 index 000000000000..2d3670f415cd --- /dev/null +++ b/app-admin/abrt/files/abrt-2.0.6-glib-2.31.patch @@ -0,0 +1,72 @@ +From ecfc461fd979aeb2d3ce4b9d811e4bf4a7730532 Mon Sep 17 00:00:00 2001 +From: Jiri Moskovcak <jmoskovc@redhat.com> +Date: Sat, 5 Nov 2011 18:04:54 +0100 +Subject: [PATCH] - glib 2.31 build fixes + +--- + src/applet/applet.c | 14 +++++++++++++- + src/gui-gtk/main.c | 4 ++-- + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/src/applet/applet.c b/src/applet/applet.c +index 95b7091..bead61f 100644 +--- a/src/applet/applet.c ++++ b/src/applet/applet.c +@@ -766,10 +766,20 @@ int main(int argc, char** argv) + textdomain(PACKAGE); + #endif + ++ /* Glib 2.31: ++ * Major changes to threading and synchronisation ++ - threading is now always enabled in GLib ++ - support for custom thread implementations (including our own internal ++ - support for errorcheck mutexes) has been removed ++ */ ++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31) ++ //can't use log(), because g_verbose is not set yet ++ g_print("abrt-applet: glib < 2.31 - init threading\n"); + /* Need to be thread safe */ + g_thread_init(NULL); + gdk_threads_init(); + gdk_threads_enter(); ++#endif + + gtk_init(&argc, &argv); + +@@ -869,8 +879,10 @@ int main(int argc, char** argv) + + /* Enter main loop */ + gtk_main(); +- ++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31) + gdk_threads_leave(); ++#endif ++ + if (notify_is_initted()) + notify_uninit(); + +diff --git a/src/gui-gtk/main.c b/src/gui-gtk/main.c +index b31509b..a24745a 100644 +--- a/src/gui-gtk/main.c ++++ b/src/gui-gtk/main.c +@@ -912,7 +912,7 @@ static gboolean handle_signal_pipe(GIOChannel *gio, GIOCondition condition, gpoi + */ + gchar buf[16]; + gsize bytes_read; +- g_io_channel_read(gio, buf, sizeof(buf), &bytes_read); ++ g_io_channel_read_chars(gio, buf, sizeof(buf), &bytes_read, NULL); + + /* Destroy zombies */ + while (safe_waitpid(-1, NULL, WNOHANG) > 0) +@@ -975,7 +975,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin + /* We read inotify events, but don't analyze them */ + gchar buf[sizeof(struct inotify_event) + PATH_MAX + 64]; + gsize bytes_read; +- while (g_io_channel_read(gio, buf, sizeof(buf), &bytes_read) == G_IO_ERROR_NONE ++ while (g_io_channel_read_chars(gio, buf, sizeof(buf), &bytes_read, NULL) == G_IO_STATUS_NORMAL + && bytes_read > 0 + ) { + continue; +-- +1.7.8.rc1 + diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml new file mode 100644 index 000000000000..da6fd63d0085 --- /dev/null +++ b/app-admin/abrt/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>gnome</herd> +</pkgmetadata> |