summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2013-09-12 03:48:23 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2013-09-12 03:48:23 +0000
commite8c738985e71f9103a726203c5c6ff9e23d90f77 (patch)
tree0e545ad716eb40850ef3007173c65a3d2d10d4ef /app-admin/abrt
parentInitial import, ebuild by me (diff)
downloadgentoo-2-e8c738985e71f9103a726203c5c6ff9e23d90f77.tar.gz
gentoo-2-e8c738985e71f9103a726203c5c6ff9e23d90f77.tar.bz2
gentoo-2-e8c738985e71f9103a726203c5c6ff9e23d90f77.zip
Drop old.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'app-admin/abrt')
-rw-r--r--app-admin/abrt/ChangeLog8
-rw-r--r--app-admin/abrt/abrt-2.0.8.ebuild132
-rw-r--r--app-admin/abrt/files/abrt-2.0.5-conf15
-rwxr-xr-xapp-admin/abrt/files/abrt-2.0.5-init57
-rw-r--r--app-admin/abrt/files/abrt-2.0.6-gentoo.patch239
-rw-r--r--app-admin/abrt/files/abrt-2.0.6-glib-2.31.patch72
-rw-r--r--app-admin/abrt/files/abrt-2.0.8-gentoo.patch275
7 files changed, 7 insertions, 791 deletions
diff --git a/app-admin/abrt/ChangeLog b/app-admin/abrt/ChangeLog
index bb493587c402..7e3dc8338a3d 100644
--- a/app-admin/abrt/ChangeLog
+++ b/app-admin/abrt/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/abrt
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/ChangeLog,v 1.19 2013/09/11 08:59:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/ChangeLog,v 1.20 2013/09/12 03:48:23 tetromino Exp $
+
+ 12 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -abrt-2.0.8.ebuild,
+ -files/abrt-2.0.5-conf, -files/abrt-2.0.5-init,
+ -files/abrt-2.0.6-gentoo.patch, -files/abrt-2.0.6-glib-2.31.patch,
+ -files/abrt-2.0.8-gentoo.patch:
+ Drop old.
11 Sep 2013; Michał Górny <mgorny@gentoo.org> abrt-2.0.12-r1.ebuild,
abrt-2.0.8.ebuild:
diff --git a/app-admin/abrt/abrt-2.0.8.ebuild b/app-admin/abrt/abrt-2.0.8.ebuild
deleted file mode 100644
index 4686b111ef70..000000000000
--- a/app-admin/abrt/abrt-2.0.8.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/abrt-2.0.8.ebuild,v 1.9 2013/09/11 08:59:06 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-
-# Need gnome2-utils for gnome2_icon_cache_update
-inherit autotools eutils gnome2-utils python systemd user
-
-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-0.16
- >=dev-libs/glib-2.21:2
- >=dev-libs/libreport-2.0.9
- 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-7"
-DEPEND="${COMMON_DEPEND}
- app-text/asciidoc
- app-text/xmlto
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- >=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.8-gentoo.patch"
-
- # Using a server response as a format string is a bad idea
- epatch "${FILESDIR}/${PN}-2.0.6-format-security.patch"
-
- # -Werror should not be used by default
- sed -e 's/^[ \t]*-Werror[ \t]*$/\t$(NULL)/' \
- -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"
-
- # pyhook test is sensitive to the format of python's error messages, and
- # fails with certain python versions
- sed -e '/pyhook.at/ d' \
- -i tests/Makefile.* tests/testsuite.at || die "sed 2 failed"
-
- # automake-1.12, #427926
- sed \
- -e "/AC_PROG_LIBTOOL/s:^:AM_PROG_AR\n:g" \
- -e "/AC_PROG_CC/s:$:\nAM_PROG_CC_C_O\n:g" \
- -e 's:-Werror::g' \
- -i configure.ac || die
-
- sed \
- -e 's:AM_PROG_MKDIR_P:AC_PROG_MKDIR_P:g' \
- -i m4/* aclocal.m4 || die
-
- eautoreconf
-
- python_clean_py-compile_files
- 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"
- "$(systemd_with_unitdir)"
- )
- # --disable-debug enables debug!
- use debug && myeconfargs=( "${myeconfargs[@]}" --enable-debug )
- 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
deleted file mode 100644
index e35958def408..000000000000
--- a/app-admin/abrt/files/abrt-2.0.5-conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
deleted file mode 100755
index 25769df28619..000000000000
--- a/app-admin/abrt/files/abrt-2.0.5-init
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/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-gentoo.patch b/app-admin/abrt/files/abrt-2.0.6-gentoo.patch
deleted file mode 100644
index 62904f2f541a..000000000000
--- a/app-admin/abrt/files/abrt-2.0.6-gentoo.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-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
deleted file mode 100644
index 2d3670f415cd..000000000000
--- a/app-admin/abrt/files/abrt-2.0.6-glib-2.31.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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/files/abrt-2.0.8-gentoo.patch b/app-admin/abrt/files/abrt-2.0.8-gentoo.patch
deleted file mode 100644
index b7c8ad9a7720..000000000000
--- a/app-admin/abrt/files/abrt-2.0.8-gentoo.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-commit fcb24c0966f53dc52d9bad6158ab8290a72ed69e
-Author: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat Oct 8 03:31:56 2011 -0400
-
- 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).
-
-diff --git a/configure.ac b/configure.ac
-index 4391239..1a78ca9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,7 +65,6 @@ PKG_CHECK_MODULES([GTK], [$GTK_VER])
- 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 5025f93..721fbaa 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -17,7 +17,6 @@ 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 abrt-dbus.txt
-diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
-index bed3c44..7697f50 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 \
-@@ -77,30 +74,12 @@ 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 \
-- -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 9b67034..db133e1 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"
-
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index 5edbd3e..4f01fac 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
-@@ -18,8 +17,6 @@ bin_PROGRAMS = \
- abrt-retrace-client \
- abrt-dedup-client
-
--libexec_PROGRAMS = abrt-action-install-debuginfo-to-abrt-cache
--
- #dist_pluginsconf_DATA = Python.conf
-
- eventsdir = $(EVENTS_DIR)
-@@ -51,7 +48,6 @@ dist_eventsconf_DATA = \
-
-
- PYTHON_FILES = \
-- abrt-action-install-debuginfo.in \
- abrt-action-list-dsos \
- abrt-action-analyze-core \
- abrt-action-analyze-vmcore.in
-@@ -186,18 +182,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 \
- https-utils.c
-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 0e17389..2abd5ce 100644
---- a/src/plugins/ccpp_event.conf
-+++ b/src/plugins/ccpp_event.conf
-@@ -31,18 +31,11 @@ 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
-- )
-+ abrt-action-analyze-backtrace
-
-
- # Bugzilla requires nonempty duphash
--EVENT=report_Bugzilla analyzer=CCpp duphash!=
-- test -f component || abrt-action-save-package-data
-- reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
-+# EVENT=report_Bugzilla analyzer=CCpp duphash!=
-+# test -f component || abrt-action-save-package-data
-+# reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
-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 2fdccda..6cc14ae 100644
---- a/src/plugins/koops_event.conf
-+++ b/src/plugins/koops_event.conf
-@@ -10,8 +10,8 @@ EVENT=post-create analyzer=Kerneloops
- reporter-kerneloops
-
- # report
--#EVENT=report_Kerneloops analyzer=Kerneloops
-- reporter-kerneloops
-+# EVENT=report_Kerneloops analyzer=Kerneloops
-+# reporter-kerneloops
-
--EVENT=report_Bugzilla analyzer=Kerneloops
-- reporter-bugzilla -b
-+# EVENT=report_Bugzilla analyzer=Kerneloops
-+# reporter-bugzilla -b
-diff --git a/src/plugins/python_event.conf b/src/plugins/python_event.conf
-index bbd9517..ad5f40d 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 -b -c /etc/libreport/plugins/bugzilla.conf
-+# EVENT=report_Bugzilla analyzer=Python
-+# test -f component || abrt-action-save-package-data
-+# reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf