Update init script for changes in abrt-dump-oops, so that the abrt service doesn't always get marked as "crashed" (bug #439494, thanks to Justin Lecher) and to start the xorg crash reporter. Remove the 2.0.12 ebuild and its broken init script.

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 63 insertions, 6 deletions

diff --git a/app-admin/abrt/ChangeLog b/app-admin/abrt/ChangeLog
index e44b5bd7fbad..9af3fe008c0c 100644
--- a/app-admin/abrt/ChangeLog
+++ b/app-admin/abrt/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/abrt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/ChangeLog,v 1.14 2012/09/22 20:12:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/ChangeLog,v 1.15 2012/10/25 07:30:12 tetromino Exp $
+
+*abrt-2.0.12-r1 (25 Oct 2012)
+
+  25 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -abrt-2.0.12.ebuild,
+  +abrt-2.0.12-r1.ebuild, -files/abrt-2.0.12-init, +files/abrt-2.0.12-r1-conf,
+  +files/abrt-2.0.12-r1-init:
+  Update init script for changes in abrt-dump-oops, so that the abrt service
+  doesn't always get marked as "crashed" (bug #439494, thanks to Justin Lecher)
+  and to start the xorg crash reporter. Remove the 2.0.12 ebuild and its broken
+  init script.
 
 *abrt-2.0.12 (22 Sep 2012)
 
diff --git a/app-admin/abrt/abrt-2.0.12.ebuild b/app-admin/abrt/abrt-2.0.12-r1.ebuild
index e65d47d7c635..6285d3d84193 100644
--- a/app-admin/abrt/abrt-2.0.12.ebuild
+++ b/app-admin/abrt/abrt-2.0.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/abrt-2.0.12.ebuild,v 1.1 2012/09/22 20:12:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/abrt-2.0.12-r1.ebuild,v 1.1 2012/10/25 07:30:12 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -93,8 +93,8 @@ src_install() {
 
 	find "${D}" -name '*.la' -exec rm -f {} + || die
 
-	newinitd "${FILESDIR}/${PN}-2.0.12-init" abrt
-	newconfd "${FILESDIR}/${PN}-2.0.5-conf" abrt
+	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
 }
 
 pkg_preinst() {
diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-conf b/app-admin/abrt/files/abrt-2.0.12-r1-conf
new file mode 100644
index 000000000000..073eb0daf82e
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-r1-conf
@@ -0,0 +1,27 @@
+# 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"
+
+# Call abrt-dump-oops to log kernel oops
+START_OOPS="yes"
+# log file to watch for kernel oops
+# Default: "/var/log/messages"
+OOPS_WATCH_LOG="/var/log/messages"
+# abrt-dump-oops command-line options
+# Default: "-xD"
+OOPS_DUMP_OPTS="-xD"
+
+# Call abrt-dump-xorg to log X crashes
+START_XORG="yes"
+# log file to watch for X crashes
+# Default: "/var/log/Xorg.0.log"
+XORG_WATCH_LOG="/var/log/Xorg.0.log"
+# abrt-dump-xorg command-line options
+# Default: "-xD"
+XORG_DUMP_OPTS="-xD"
diff --git a/app-admin/abrt/files/abrt-2.0.12-init b/app-admin/abrt/files/abrt-2.0.12-r1-init
index 0a05b9d52c84..65e19f97ffe4 100644
--- a/app-admin/abrt/files/abrt-2.0.12-init
+++ b/app-admin/abrt/files/abrt-2.0.12-r1-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 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.12-init,v 1.1 2012/09/22 20:12:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/files/abrt-2.0.12-r1-init,v 1.1 2012/10/25 07:30:12 tetromino Exp $
 
 description="Automated crash detection service"
 
@@ -32,12 +32,32 @@ start() {
 		start-stop-daemon --start --quiet \
 			--pidfile /var/run/abrt/abrt-dump-oops.pid \
 			--make-pidfile --background \
-			--exec /usr/bin/abrt-dump-oops -- ${OOPS_OPTS}
+			--exec /usr/bin/abrt-watch-log -- \
+			-F "`/usr/bin/abrt-dump-oops -m`" ${OOPS_WATCH_LOG} -- \
+			/usr/bin/abrt-dump-oops ${OOPS_DUMP_OPTS}
+		eend $?
+	fi
+
+	if [[ "${START_XORG}" = "yes" ]]; then
+		ebegin "Starting abrt-dump-xorg"
+		start-stop-daemon --start --quiet \
+			--pidfile /var/run/abrt/abrt-dump-xorg.pid \
+			--make-pidfile --background \
+			--exec /usr/bin/abrt-watch-log -- \
+			-F "`/usr/bin/abrt-dump-xorg -m`" ${XORG_WATCH_LOG} -- \
+			/usr/bin/abrt-dump-xorg ${XORG_DUMP_OPTS}
 		eend $?
 	fi
 }
 
 stop() {
+	if [[ "${START_XORG}" = "yes" ]]; then
+		ebegin "Stopping abrt-dump-xorg"
+		start-stop-daemon --stop --quiet \
+			--pidfile /var/run/abrt/abrt-dump-xorg.pid
+		eend $?
+	fi
+
 	if [[ "${START_OOPS}" = "yes" ]]; then
 		ebegin "Stopping abrt-dump-oops"
 		start-stop-daemon --stop --quiet \