From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: app-admin/abrt/, dev-libs/libreport/files/, dev-libs/btparser/, ...
Date: Thu, 17 Nov 2011 06:14:56 +0000 (UTC) [thread overview]
Message-ID: <64f13b36dc62b8cf1a269b06c005cdc654c7f49d.tetromino@gentoo> (raw)
commit: 64f13b36dc62b8cf1a269b06c005cdc654c7f49d
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 06:13:56 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Nov 17 06:13:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=64f13b36
abrt, btparser, libreport: moved to gx86
---
app-admin/abrt/abrt-2.0.5.ebuild | 114 ----------
app-admin/abrt/files/abrt-2.0.5-conf | 15 --
app-admin/abrt/files/abrt-2.0.5-gentoo.patch | 236 --------------------
app-admin/abrt/files/abrt-2.0.5-init | 57 -----
dev-libs/btparser/btparser-0.13.ebuild | 29 ---
.../libreport/files/libreport-2.0.6-gentoo.patch | 151 -------------
.../files/libreport-2.0.6-no-bugzilla.patch | 78 -------
.../files/libreport-2.0.6-not-reportable.patch | 218 ------------------
dev-libs/libreport/libreport-2.0.6.ebuild | 101 ---------
9 files changed, 0 insertions(+), 999 deletions(-)
diff --git a/app-admin/abrt/abrt-2.0.5.ebuild b/app-admin/abrt/abrt-2.0.5.ebuild
deleted file mode 100644
index 2aed6f7..0000000
--- a/app-admin/abrt/abrt-2.0.5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-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.5-gentoo.patch"
-
- # Building against libreport-2.0.6 fails with -Werror due to redefinition
- # of kernel_tainted_short.
- # XXX: Check if needed on next libreport release.
- sed -e 's/-Werror\( \|$\)//g' \
- -i src/lib/Makefile.* src/daemon/Makefile.* src/applet/Makefile.* \
- src/gui-gtk/Makefile.* src/plugins/Makefile.* src/cli/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() {
- emake DESTDIR="${D}" install
- dodoc ChangeLog README
-
- 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 e35958d..0000000
--- 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-gentoo.patch b/app-admin/abrt/files/abrt-2.0.5-gentoo.patch
deleted file mode 100644
index d65b701..0000000
--- a/app-admin/abrt/files/abrt-2.0.5-gentoo.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-From 75d9c9a2cbb9f42922c8fb27219de0c4784fa255 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 relevant only for an RPM-based distro
-
----
- configure.ac | 1 -
- src/daemon/Makefile.am | 29 +++--------------------------
- 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 +++---
- 8 files changed, 16 insertions(+), 67 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8debc2d..abe8203 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/src/daemon/Makefile.am b/src/daemon/Makefile.am
-index e6823bd..24468b7 100644
---- a/src/daemon/Makefile.am
-+++ b/src/daemon/Makefile.am
-@@ -8,9 +8,6 @@ dist_eventsconf_DATA = \
- bin_SCRIPTS = \
- abrt-handle-upload
-
--bin_PROGRAMS = \
-- abrt-action-save-package-data
--
- sbin_PROGRAMS = \
- abrtd \
- abrt-server
-@@ -62,45 +59,25 @@ 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
-
- MAN_TXT = \
- abrt-handle-upload.txt \
-- abrt-action-save-package-data.txt \
-- abrt-action-save-package-data.conf.txt \
- abrt.conf.txt \
- abrtd.txt \
- abrt-server.txt
-
- # Manual pages are generated from .txt via Docbook
--man1_MANS = abrt-handle-upload.1 abrt-server.1 abrt-action-save-package-data.1
--man5_MANS = abrt.conf.5 abrt-action-save-package-data.conf.5
-+man1_MANS = abrt-handle-upload.1 abrt-server.1
-+man5_MANS = abrt.conf.5
- man8_MANS = abrtd.8
-
- %.1 %.5 %.8: %.xml
-diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf
-index bf053f7..8c1aacf 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=
-+#EVENT=post-create component=
- abrt-action-save-package-data
-
-
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index acd1a31..eb9e45a 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)
-@@ -70,7 +67,6 @@ man1_MANS = ${MAN_TXT:%.txt=%.1}
- CLEANFILES = $(man1_MANS)
-
- PYTHON_FILES = \
-- abrt-action-install-debuginfo.in \
- abrt-action-list-dsos \
- abrt-action-analyze-core
-
-@@ -179,18 +175,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 4071705..d8bf148 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 -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/koops_event.conf b/src/plugins/koops_event.conf
-index 3b80a1b..701e6ba 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 -b
-+# EVENT=report_Bugzilla analyzer=Kerneloops
-+# reporter-bugzilla -b
-diff --git a/src/plugins/python_event.conf b/src/plugins/python_event.conf
-index 7a106b5..bc1533f 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
---
-1.7.7
-
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 e1c6a9d..0000000
--- 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: $
-
-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/dev-libs/btparser/btparser-0.13.ebuild b/dev-libs/btparser/btparser-0.13.ebuild
deleted file mode 100644
index 2c61eb6..0000000
--- a/dev-libs/btparser/btparser-0.13.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-DESCRIPTION="Parser and analyzer for backtraces produced by gdb"
-HOMEPAGE="https://fedorahosted.org/btparser/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- app-arch/xz-utils"
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- --disable-maintainer-mode
-}
-
-src_install() {
- default
- use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-libs/libreport/files/libreport-2.0.6-gentoo.patch b/dev-libs/libreport/files/libreport-2.0.6-gentoo.patch
deleted file mode 100644
index 8aca7b1..0000000
--- a/dev-libs/libreport/files/libreport-2.0.6-gentoo.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 003f49be7c44ea85c1ae5826342749b11aac28ee Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Fri, 7 Oct 2011 23:25:14 -0400
-Subject: [PATCH] Replace RedHat defaults with Gentoo ones
-
----
- src/plugins/Makefile.am | 34 +---------------------------------
- src/plugins/bugzilla.conf | 2 +-
- src/plugins/report_Bugzilla.conf | 2 +-
- src/plugins/report_Bugzilla.xml.in | 4 ++--
- src/plugins/reporter-bugzilla.txt | 2 +-
- 5 files changed, 6 insertions(+), 38 deletions(-)
-
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index 19e53fc..607c1b9 100644
---- a/src/plugins/Makefile.am
-+++ b/src/plugins/Makefile.am
-@@ -4,7 +4,6 @@ pluginslibdir = $(PLUGINS_LIB_DIR)
-
- bin_PROGRAMS = \
- reporter-bugzilla \
-- reporter-rhtsupport \
- reporter-kerneloops \
- reporter-upload \
- reporter-mailx \
-@@ -16,8 +15,7 @@ pluginsconfdir = $(PLUGINS_CONF_DIR)
- reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR)
-
- dist_reportpluginsconf_DATA = \
-- bugzilla.conf \
-- rhtsupport.conf
-+ bugzilla.conf
-
- eventsdir = $(EVENTS_DIR)
-
-@@ -27,7 +25,6 @@ dist_events_DATA = \
- report_Logger.conf \
- report_Logger.xml \
- report_Mailx.xml \
-- report_RHTSupport.xml \
- report_Kerneloops.xml \
- report_Uploader.xml
-
-@@ -39,14 +36,12 @@ dist_eventsconf_DATA = \
- mailx_event.conf \
- print_event.conf \
- bugzilla_event.conf \
-- rhtsupport_event.conf \
- uploader_event.conf
-
- MAN_TXT = \
- reporter-print.txt \
- reporter-mailx.txt \
- reporter-bugzilla.txt \
-- reporter-rhtsupport.txt \
- reporter-kerneloops.txt \
- reporter-upload.txt \
- report.txt
-@@ -71,7 +66,6 @@ EXTRA_DIST = \
- report_Logger.conf \
- report_Logger.xml.in \
- report_Mailx.xml.in \
-- report_RHTSupport.xml.in \
- report_Kerneloops.xml.in \
- report_Uploader.xml.in
-
-@@ -100,32 +94,6 @@ reporter_bugzilla_LDADD = \
- ../lib/libabrt_web.la \
- ../lib/libreport.la
-
--reporter_rhtsupport_SOURCES = \
-- abrt_rh_support.h abrt_rh_support.c \
-- reporter-rhtsupport.c
--reporter_rhtsupport_CPPFLAGS = \
-- -I$(srcdir)/../include \
-- -I$(srcdir)/../lib \
-- -DBIN_DIR=\"$(bindir)\" \
-- -DVAR_RUN=\"$(VAR_RUN)\" \
-- -DCONF_DIR=\"$(CONF_DIR)\" \
-- -DLOCALSTATEDIR='"$(localstatedir)"' \
-- -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
-- -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
-- -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
-- -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
-- $(GLIB_CFLAGS) \
-- $(LIBREPORT_CFLAGS) \
-- $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
-- -D_GNU_SOURCE \
-- -Wall -Wwrite-strings -Werror
--reporter_rhtsupport_LDFLAGS = -ltar
--reporter_rhtsupport_LDADD = \
-- $(GLIB_LIBS) \
-- $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
-- ../lib/libabrt_web.la \
-- ../lib/libreport.la
--
- reporter_upload_SOURCES = \
- reporter-upload.c
- reporter_upload_CPPFLAGS = \
-diff --git a/src/plugins/bugzilla.conf b/src/plugins/bugzilla.conf
-index 18eba5a..f5afe6f 100644
---- a/src/plugins/bugzilla.conf
-+++ b/src/plugins/bugzilla.conf
-@@ -1,5 +1,5 @@
- # Bugzilla URL
--BugzillaURL = https://bugzilla.redhat.com/
-+BugzillaURL = https://bugs.gentoo.org/
- # yes means that ssl certificates will be checked
- SSLVerify = yes
- # your login has to exist, if you don have any, please create one
-diff --git a/src/plugins/report_Bugzilla.conf b/src/plugins/report_Bugzilla.conf
-index f1a77f5..9e9c7d0 100644
---- a/src/plugins/report_Bugzilla.conf
-+++ b/src/plugins/report_Bugzilla.conf
-@@ -1,4 +1,4 @@
--Bugzilla_BugzillaURL = https://bugzilla.redhat.com
-+Bugzilla_BugzillaURL = https://bugs.gentoo.org
- Bugzilla_Login =
- Bugzilla_Password =
- Bugzilla_SSLVerify = yes
-diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in
-index f8dac8f..e91115f 100644
---- a/src/plugins/report_Bugzilla.xml.in
-+++ b/src/plugins/report_Bugzilla.xml.in
-@@ -15,8 +15,8 @@
- <_label>Bugzilla URL</_label>
- <allow-empty>no</allow-empty>
- <_description>Address of Bugzilla server</_description>
-- <default-value>https://bugzilla.redhat.com</default-value>
-- <_note-html>You can create bugzilla.redhat.com account <a href="https://bugzilla.redhat.com/createaccount.cgi">here</a></_note-html>
-+ <default-value>https://bugs.gentoo.org</default-value>
-+ <_note-html>You can create a Gentoo Bugzilla account <a href="https://bugs.gentoo.org/createaccount.cgi">here</a></_note-html>
- </option>
- <option type="text" name="Bugzilla_Login">
- <_label>User name</_label>
-diff --git a/src/plugins/reporter-bugzilla.txt b/src/plugins/reporter-bugzilla.txt
-index 4285600..29c45ce 100644
---- a/src/plugins/reporter-bugzilla.txt
-+++ b/src/plugins/reporter-bugzilla.txt
-@@ -41,7 +41,7 @@ Configuration file lines should have 'PARAM = VALUE' format. The parameters are:
- Password to Bugzilla account.
-
- 'BugzillaURL'::
-- Bugzilla HTTP(S) address. (default: https://bugzilla.redhat.com)
-+ Bugzilla HTTP(S) address. (default: https://bugs.gentoo.org)
-
- 'SSLVerify'::
- Use yes/true/on/1 to verify server's SSL certificate. (default: yes)
---
-1.7.7
-
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
deleted file mode 100644
index 4a11c7f..0000000
--- a/dev-libs/libreport/files/libreport-2.0.6-no-bugzilla.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 4cbdd212a9cb77ae586aa76936a6af8e4aaa1344 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat, 8 Oct 2011 00:26:15 -0400
-Subject: [PATCH] Disable bugzilla plugin (requires Gentoo infrastructure
- changes)
-
----
- src/plugins/Makefile.am | 28 +---------------------------
- 1 files changed, 1 insertions(+), 27 deletions(-)
-
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index 607c1b9..5addc10 100644
---- a/src/plugins/Makefile.am
-+++ b/src/plugins/Makefile.am
-@@ -3,7 +3,6 @@
- pluginslibdir = $(PLUGINS_LIB_DIR)
-
- bin_PROGRAMS = \
-- reporter-bugzilla \
- reporter-kerneloops \
- reporter-upload \
- reporter-mailx \
-@@ -14,8 +13,7 @@ pluginsconfdir = $(PLUGINS_CONF_DIR)
-
- reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR)
-
--dist_reportpluginsconf_DATA = \
-- bugzilla.conf
-+dist_reportpluginsconf_DATA =
-
- eventsdir = $(EVENTS_DIR)
-
-@@ -35,13 +33,11 @@ eventsconfdir = $(EVENTS_CONF_DIR)
- dist_eventsconf_DATA = \
- mailx_event.conf \
- print_event.conf \
-- bugzilla_event.conf \
- uploader_event.conf
-
- MAN_TXT = \
- reporter-print.txt \
- reporter-mailx.txt \
-- reporter-bugzilla.txt \
- reporter-kerneloops.txt \
- reporter-upload.txt \
- report.txt
-@@ -72,28 +68,6 @@ EXTRA_DIST = \
- $(DESTDIR)/$(DEBUG_INFO_DIR):
- $(mkdir_p) '$@'
-
--reporter_bugzilla_SOURCES = \
-- reporter-bugzilla.c rhbz.c rhbz.h
--reporter_bugzilla_CPPFLAGS = \
-- -I$(srcdir)/../include \
-- -I$(srcdir)/../lib \
-- -DBIN_DIR=\"$(bindir)\" \
-- -DVAR_RUN=\"$(VAR_RUN)\" \
-- -DCONF_DIR=\"$(CONF_DIR)\" \
-- -DLOCALSTATEDIR='"$(localstatedir)"' \
-- -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
-- -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
-- -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
-- -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
-- $(GLIB_CFLAGS) \
-- $(LIBREPORT_CFLAGS) \
-- -D_GNU_SOURCE \
-- -Wall -Wwrite-strings
--reporter_bugzilla_LDADD = \
-- $(GLIB_LIBS) \
-- ../lib/libabrt_web.la \
-- ../lib/libreport.la
--
- reporter_upload_SOURCES = \
- reporter-upload.c
- reporter_upload_CPPFLAGS = \
---
-1.7.7
-
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
deleted file mode 100644
index e1e1ae4..0000000
--- a/dev-libs/libreport/files/libreport-2.0.6-not-reportable.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-commit fbcf816140baa534e390fc7d4124189a3d406659
-Author: Nikola Pajkovsky <npajkovs@redhat.com>
-Date: Wed Oct 5 15:50:20 2011 +0200
-
- refuse reporting when *not-reportable* file exist
-
- Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
-
-diff --git a/src/cli/cli-report.c b/src/cli/cli-report.c
-index 0011ebc..c8fa672 100644
---- a/src/cli/cli-report.c
-+++ b/src/cli/cli-report.c
-@@ -750,6 +750,26 @@ int report(const char *dump_dir_name, int flags)
- if (!dd)
- return -1;
-
-+ char *not_reportable = dd_load_text_ext(dd, FILENAME_NOT_REPORTABLE, 0
-+ | DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE
-+ | DD_FAIL_QUIETLY_ENOENT
-+ | DD_FAIL_QUIETLY_EACCES);
-+
-+ if (not_reportable)
-+ {
-+ char *reason = dd_load_text_ext(dd, FILENAME_REASON, 0
-+ | DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE);
-+ char *t = xasprintf("%s%s%s",
-+ not_reportable ?: "",
-+ not_reportable ? ": " : "",
-+ reason ?: _("(no description)"));
-+
-+ dd_close(dd);
-+ error_msg("%s", t);
-+ free(t);
-+ xfunc_die();
-+ }
-+
- if (!(flags & CLI_REPORT_ONLY))
- {
- char *analyze_events_as_lines = list_possible_events(dd, NULL, "analyze");
-diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c
-index 0279f83..8bdc8d1 100644
---- a/src/gui-wizard-gtk/wizard.c
-+++ b/src/gui-wizard-gtk/wizard.c
-@@ -1032,7 +1032,16 @@ void update_gui_state_from_problem_data(void)
- gtk_window_set_title(GTK_WINDOW(g_assistant), g_dump_dir_name);
-
- const char *reason = get_problem_item_content_or_NULL(g_cd, FILENAME_REASON);
-- gtk_label_set_text(g_lbl_cd_reason, reason ? reason : _("(no description)"));
-+ const char *not_reportable = get_problem_item_content_or_NULL(g_cd,
-+ FILENAME_NOT_REPORTABLE);
-+
-+ char *t = xasprintf("%s%s%s",
-+ not_reportable ?: "",
-+ not_reportable ? ": " : "",
-+ reason ?: _("(no description)"));
-+
-+ gtk_label_set_text(g_lbl_cd_reason, t);
-+ free(t);
-
- gtk_list_store_clear(g_ls_details);
- struct cd_stats stats = { 0 };
-@@ -2281,12 +2290,21 @@ static void add_pages()
- error_msg_and_die("Can't load %s: %s", g_glade_file, error->message);
- }
-
-+ struct dump_dir *dd = dd_opendir(g_dump_dir_name, DD_OPEN_READONLY | DD_FAIL_QUIETLY_EACCES);
-+ if (!dd)
-+ return;
-+ char *not_reportable = dd_load_text_ext(dd, FILENAME_NOT_REPORTABLE, 0
-+ | DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE
-+ | DD_FAIL_QUIETLY_ENOENT
-+ | DD_FAIL_QUIETLY_EACCES);
-+ dd_close(dd);
-+
- int i;
- int page_no = 0;
- for (i = 0; page_names[i] != NULL; i++)
- {
- char *delim = strrchr(page_names[i], '_');
-- if (delim != NULL)
-+ if (!not_reportable && delim)
- {
- if (g_report_only && (strncmp(delim + 1, "report", strlen("report"))) != 0)
- {
-@@ -2308,10 +2326,14 @@ static void add_pages()
- gtk_assistant_set_page_complete(g_assistant, page, true);
-
- gtk_assistant_set_page_title(g_assistant, page, pages[i].title);
-- gtk_assistant_set_page_type(g_assistant, page, pages[i].type);
-+ if (not_reportable && i == 0)
-+ gtk_assistant_set_page_type(g_assistant, pages[i].page_widget, GTK_ASSISTANT_PAGE_SUMMARY);
-+ else
-+ gtk_assistant_set_page_type(g_assistant, page, pages[i].type);
-
- VERB1 log("added page: %s", page_names[i]);
- }
-+ free(not_reportable);
-
- /* Set pointers to objects we might need to work with */
- g_lbl_cd_reason = GTK_LABEL( gtk_builder_get_object(builder, "lbl_cd_reason"));
-@@ -2369,10 +2391,14 @@ static void add_pages()
-
- /* Add "Close" button */
- GtkWidget *w;
-- w = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-- g_signal_connect(w, "clicked", G_CALLBACK(gtk_main_quit), NULL);
-- gtk_widget_show(w);
-- gtk_assistant_add_action_widget(g_assistant, w);
-+ if (!not_reportable)
-+ {
-+ w = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-+ g_signal_connect(w, "clicked", G_CALLBACK(gtk_main_quit), NULL);
-+ gtk_widget_show(w);
-+ gtk_assistant_add_action_widget(g_assistant, w);
-+ }
-+
- /* and hide "Cancel" button - "Close" is a better name for what we want */
- gtk_assistant_commit(g_assistant);
-
-diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h
-index 67a7ea3..5fc09c3 100644
---- a/src/include/internal_libreport.h
-+++ b/src/include/internal_libreport.h
-@@ -581,7 +581,7 @@ int delete_dump_dir_possibly_using_abrtd(const char *dump_dir_name);
- struct dump_dir *steal_directory(const char *base_dir, const char *dump_dir_name);
-
- #define kernel_tainted_short libreport_kernel_tainted_short
--char *kernel_tainted_short(unsigned tainted);
-+char *kernel_tainted_short(const char *kernel_bt);
- #define kernel_tainted_long libreport_kernel_tainted_long
- GList *kernel_tainted_long(unsigned tainted);
-
-@@ -635,6 +635,7 @@ GList *kernel_tainted_long(unsigned tainted);
- */
- #define FILENAME_REPORTED_TO "reported_to"
- #define FILENAME_EVENT_LOG "event_log"
-+#define FILENAME_NOT_REPORTABLE "not-reportable"
-
- // Not stored as files, added "on the fly":
- #define CD_DUMPDIR "Directory"
-diff --git a/src/lib/kernel-tainted.c b/src/lib/kernel-tainted.c
-index 3595408..217587c 100644
---- a/src/lib/kernel-tainted.c
-+++ b/src/lib/kernel-tainted.c
-@@ -18,6 +18,12 @@
- */
- #include "internal_libreport.h"
-
-+/* reading /proc/sys/kernel/tainted file after an oops is ALWAYS going
-+ * to show it as tainted.
-+ *
-+ * https://bugzilla.redhat.com/show_bug.cgi?id=724838
-+ */
-+
- /* From RHEL6 kernel/panic.c: */
- static const int tnts_short[] = {
- 'P' ,
-@@ -106,21 +112,16 @@ static const char *const tnts_long[] = {
- "Tech_preview",
- };
-
--char *kernel_tainted_short(unsigned tainted)
-+char *kernel_tainted_short(const char *kernel_bt)
- {
-- char *tnt = xzalloc(ARRAY_SIZE(tnts_short) + 1);
-- int i = 0;
-- while (tainted)
-- {
-- if (0x1 & tainted)
-- tnt[i] = tnts_short[i];
-- else
-- tnt[i] = '-';
-
-- ++i;
-- tainted >>= 1;
-- }
-+ /* example of flags: |G B | */
-+ char *tainted = strstr(kernel_bt, "Tainted: ");
-+ if (!tainted)
-+ return NULL;
-
-+ /* 12 == count of flags */
-+ char *tnt = xstrndup(tainted + strlen("Tainted: "), 12);
- return tnt;
- }
-
-diff --git a/src/report-newt/report-newt.c b/src/report-newt/report-newt.c
-index b8dddbc..02f75c8 100644
---- a/src/report-newt/report-newt.c
-+++ b/src/report-newt/report-newt.c
-@@ -318,6 +318,27 @@ static int report(const char *dump_dir_name)
- if (!(dd = dd_opendir(dump_dir_name, 0)))
- return -1;
- events_as_lines = list_possible_events(dd, NULL, "report");
-+
-+ char *not_reportable = dd_load_text_ext(dd, FILENAME_NOT_REPORTABLE, 0
-+ | DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE
-+ | DD_FAIL_QUIETLY_ENOENT
-+ | DD_FAIL_QUIETLY_EACCES);
-+
-+ if (not_reportable)
-+ {
-+ char *reason = dd_load_text_ext(dd, FILENAME_REASON, 0
-+ | DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE);
-+ char *t = xasprintf("%s%s%s",
-+ not_reportable ?: "",
-+ not_reportable ? ": " : "",
-+ reason ?: _("(no description)"));
-+
-+ dd_close(dd);
-+ newtWinMessage(_("Error"), _("Ok"), "%s", t);
-+ free(t);
-+ return -1;
-+ }
-+
- dd_close(dd);
-
- reporters = get_available_reporters(events_as_lines);
diff --git a/dev-libs/libreport/libreport-2.0.6.ebuild b/dev-libs/libreport/libreport-2.0.6.ebuild
deleted file mode 100644
index 72bb2cf..0000000
--- a/dev-libs/libreport/libreport-2.0.6.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-
-inherit autotools eutils python
-
-DESCRIPTION="Generic library for reporting various problems"
-HOMEPAGE="https://fedorahosted.org/abrt/"
-SRC_URI="https://fedorahosted.org/released/abrt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.21:2
- dev-libs/newt
- dev-libs/nss
- dev-libs/libtar
- dev-libs/libxml2
- dev-libs/xmlrpc-c
- gnome-base/gnome-keyring
- net-misc/curl[ssl]
- sys-apps/dbus
- x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/xmlto
- >=dev-util/intltool-0.3.50
- >=dev-util/pkgconfig-0.9.0
- >=sys-devel/gettext-0.17"
-
-# Tests require python-meh, which is highly redhat-specific.
-RESTRICT="tests"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-
- enewgroup abrt
- enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
- # Replace redhat-specific defaults with gentoo ones
- epatch "${FILESDIR}/${PN}-2.0.6-gentoo.patch"
-
- # Disable bugzilla plugin for now (requires bugs.gentoo.org infra support)
- epatch "${FILESDIR}/${PN}-2.0.6-no-bugzilla.patch"
-
- # Needed for abrt-2.0.5, will be in next release
- epatch "${FILESDIR}/${P}-not-reportable.patch"
-
- # Wizard does not build with -Werror under gcc-4.6 (fails format-security
- # in gtk_message_dialog_new() calls)
- sed -e "s/ -Werror$//" -i src/gui-wizard-gtk/Makefile.* || die
-
- mkdir m4
- eautoreconf
- ln -sfn $(type -P true) py-compile
-}
-
-src_configure() {
- # Gentoo's xmlrpc-c does not provide a pkgconfig file
- # XXX: this is probably cross-compile-unfriendly
- export XMLRPC_CFLAGS=$(xmlrpc-c-config --cflags)
- export XMLRPC_LIBS=$(xmlrpc-c-config --libs)
- export XMLRPC_CLIENT_CFLAGS=$(xmlrpc-c-config client --cflags)
- export XMLRPC_CLIENT_LIBS=$(xmlrpc-c-config client --libs)
- # 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)
-
- ECONF="--localstatedir=${EPREFIX}/var"
- # --disable-debug enables debug!
- use debug && ECONF="${ECONF} --enable-debug"
- econf ${ECONF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README
-
- # Need to set correct ownership for use by app-admin/abrt
- diropts -o abrt -g abrt
- keepdir /var/spool/abrt
-
- find "${D}" -name '*.la' -exec rm -f {} + || die
-}
-
-pkg_postinst() {
- python_mod_optimize report reportclient
-}
-
-pkg_postrm() {
- python_mod_cleanup report reportclient
-}
reply other threads:[~2011-11-17 6:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=64f13b36dc62b8cf1a269b06c005cdc654c7f49d.tetromino@gentoo \
--to=tetromino@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox