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.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 74 insertions, 16 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/Manifest b/app-admin/abrt/Manifest
index d3872fc8bca8..49af6b10970c 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -4,7 +4,8 @@ Hash: SHA256
 AUX abrt-2.0.12-automake-1.12.patch 1905 SHA256 6a3772721095070dd792a73838440244c101a7522785c96614cc8460a368e415 SHA512 f29fd4bcb33bb20fd1d555ddc9dc21bb243641bb0d6a44d5a49948f2c6221404482718f4d6a4bb68a8e59945c2ca5566faab2628fa4c98f7900fa76e994ad7cb WHIRLPOOL 2a029f546aba01e70f45d8fc3f3a08dbf8d89882762ed424b7344e062306eb7ca7becdd8c598deee0c8400b9a550c82536575360fc265b50cd9a4a223f7d53c2
 AUX abrt-2.0.12-dbus-fallback.patch 3515 SHA256 f82f2a42c632d4e9e4ebdc2dec46efc657a964de058dc1e0c4714bb6bc13f1fb SHA512 6f6c298c14e0f6a0e127c635337883ee9ae3f1afa0229064a7bd2ad9431c5ec144452c33f2ee65a3ba0aebbcd33c10f9688ff8f74a553ad179a3faa098a9dbcd WHIRLPOOL 22154cd7504f534c3a554adace06631b1614f1929563f4c7e3661d36da723e0727407736208ff03987906522c5e18bb2766874d5d6ce8e535f93d22d24135888
 AUX abrt-2.0.12-gentoo.patch 13050 SHA256 05c8e5ae82432ea13ba54ef3c0c7b0b64219478901d13cf89d46c3191c018d1a SHA512 246eaf8faf1a5793837be94ecc3a56dc37488473140b05c17d6383c235922494468fac7aaa18f50654395c0b4fbaafc904262a3c15a8dc9fc21de320da43bbfa WHIRLPOOL 43708194563f677f38969ac4c20a679a46809573c75fd774e85aeb50bc8bdc53a932bf06394095f6cbb28e67edcf53237c9a6915627a9a3c841e1d3ff168af5f
-AUX abrt-2.0.12-init 1429 SHA256 c910debfc1bad80a36431d18aab4159b3a2ea606a5c6175c163862e1d6d57862 SHA512 8d50eee36564ac8a4f6db878a0a9709ec0c80641c03a18a73407891af36e248a030db2fc4e8c5c06d9d53958aaec5c7aa9760e0c3fb482b660f4ef91d60af14d WHIRLPOOL cce30cfb3955dcb4be927999657dbc4f49c92f765913e2b292e072ab7bdcf5c0aeba3cca1cebe4a3e18fdbd80696e20a62bf92f17cb1bc448e9bed1c9e6956ef
+AUX abrt-2.0.12-r1-conf 687 SHA256 92e678393b44ff5ce42a5787618da170fc151d823187bf56bb1cf41054bfde17 SHA512 8dc19a07ca57a7a95184366e747f20e36b97eea6423aafb88390f9754f90bfa76b6d0c33806c714fcadfebeebda05e989b282bf07cd0ce50cf01efa8721357f2 WHIRLPOOL d97533b294fd9127045530ca5619059bc17b971ef3ead0336e4902600ac6103faad89e9011efdbe2803f14f3fb08f10f898dc621ab1c50c759f2b3fc2c806f4b
+AUX abrt-2.0.12-r1-init 2052 SHA256 45c5c1d0360cf3ce8cd161bc3d46dadfb1dce69e13e0f73f36a33f33b238a838 SHA512 6d3564f6c90e60b872d6b6239d15e71f3e0fecbc38df7b56921a5f680cf6016c1212f1b0580fa515604d127aeb417a9423448044f544bb82ec9d338be0e374c6 WHIRLPOOL f2133de60ac70d031dce1578bb2b783de2c8fb21d98440fb016c9cc991a3a7c6810e22aaa165f45859016e3e6670cf8559c8be4ff507c42f167e74dd2694330e
 AUX abrt-2.0.5-conf 390 SHA256 1730ac3e69309bcff1ba3c599da1d19e7ca4ac623504613e928d4de0cd8640ec SHA512 97f4a0e5e9c058efa0028a8cae7e79e907b37d114769c6015ccb13847fe18b1e0712b26d4f1a4957449c3a2141ab99df57ef57897aa376d8987779ac29a93478 WHIRLPOOL c29802d316faa4e434c2c2d74c363dbd6af3229be681cdbfe899a65238d538d5c38954fbf55230568ec5fe9679249a1d93856590cceb32de3743b53229927593
 AUX abrt-2.0.5-init 1408 SHA256 2894a7b5c98c142ba1318679c48a3679885549b36ca218a79cbb2fe5eb7aecba SHA512 5c703a776373a3792288e4f7dc95e39c02053b8145c28068aed7644d7034ada259370f5755f6b80901e30ccbc77a1d4028a187ed0e82757d5d21aa2a6cfd7f46 WHIRLPOOL 2e6f0146d079b74a2de76755a5aed150483490f2a3b007298fde2a55f4b5f63db4f38a731e3dbc5b94a5dd4f3bcd7b67588f757544a103bce133e9c478a909e8
 AUX abrt-2.0.6-format-security.patch 911 SHA256 23059d8bfc28ed3277828493dc267801baa1351e5a8a70c4879fbac3742f5ec8 SHA512 8e9f8bb37698834b998d1d4a9452e17f5484a2fa9fbc400b80f2154fb4f7ad35dcbc65112afa3fef2f1b2ccf78a01f745e436e61323c40d76f17da11a6229b71 WHIRLPOOL 0f3c6998e00608099ff5cce33ab07326776244ad666bb72a714652e60fcd4ef73cb75fffe0936f930588b3fa0ba383f1318eed60875961077747a30887da4e77
@@ -14,19 +15,19 @@ AUX abrt-2.0.8-gentoo.patch 9404 SHA256 24679bb205b0b71a6fc82013cec993c96264c784
 DIST abrt-2.0.12.tar.gz 1090121 SHA256 2957f4136958078c3c8c9b2031febd8b322ef8705ca25a51592279b3ccd5c9e2 SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a WHIRLPOOL 9b39fe91f77e2de5b3816d5cfc10f75c7c3d7dedfc354ed4e052b50e6cebb94bd26fec94aaba6cfd1cc79b71f1cc34b77bfd70d27d25761fa853a6a2af5ef7ce
 DIST abrt-2.0.6.tar.gz 996676 SHA256 0413a6b6143d0e667bb9c2c34a8ddfdb82d0dff04050acd254eb86943dd181a1 SHA512 3a4715c18fe04fb7f4b6dc921b08380795a55628926b7cfb7b33750db3dfb9d8c0ce6c975edc945c2c8f030ae1095ebef5397e9ccbedeb34a08a1798d462c07c WHIRLPOOL a5d1b231502f860a12a06f302889786349bd3e1ec84651d33443eb8214977e7cc943d6140865c17aef2a76a61a66e4cbb052e17acb1db053a506a2d8183bc57d
 DIST abrt-2.0.8.tar.gz 960737 SHA256 aaad9f6914e40bda8783ff10e34f62a9712bfebda06373a7c056e3ca8bad4e5b SHA512 3b4dbb09309a45d3596c6d890f103e95aff12a4246bcea1dc5ae558869ff138c87559f0362534156a5d628a642e43621a5147a6eeaa5abbb3d3b5299d42ced17 WHIRLPOOL 51f82e8913708c7398889ccff0e2a0d41fe9e037c20a32547bae7f859ff2e04004f399fd5f118b20c14dc4438d7bd56fa6fc6318ad99f474f218dd6e5bb0d32c
-EBUILD abrt-2.0.12.ebuild 2795 SHA256 c69d21aea2a987c25402993f6f4526701c4819ed473395af3ca2d725bf6d51b1 SHA512 68c4e8ef272d49dfc99d9be16a842f0b18cc72d249a3dd88367daf9de0732ca74eef7459970773f6348e5c5b7f869a5413bce342f0d747706034b4036a5657bb WHIRLPOOL bc5136ab6aeebb2530d11122a6a26e04e9ccc556dad0dc5d34946b8baedd0095bc7b7b184fe24a3d91078e66d9851ee82292965951f443f411fc88d04b244b91
+EBUILD abrt-2.0.12-r1.ebuild 2805 SHA256 1cf518f46b395d980377843c7a7e727dbab3d2830cf152f733801edb2acecea0 SHA512 5491ee6637f2c1450cd56639a1685c29d85a1f3c137d365c521af37a651b429e68910b26a62b406c1f9a30845b99dd1b178cb83bfbaf913acf67e84fe789fc97 WHIRLPOOL e59f6af8bbe55460a2ed5040ff19ea84476d64e176c2bcfd7f42bf173e2bf1796446aaeb265bbdcb96ed118a09382be3b76f00811c396ce5d57ac6247bf9264e
 EBUILD abrt-2.0.6.ebuild 2976 SHA256 64e4a2bcba4db8b8154179d787f898d5727412efac4314c47d249b38080d3c15 SHA512 a36c5c8979b9dd619894baee87c2a7351f747c1c866f8860b56d5942d3d5657995d9ab35d3ffbb9667fc0e0606df754d2fd08553a5457ebeefa645c742ee249a WHIRLPOOL 09a58c9c77fe18d48fd95c1765b90a5bd3110bf0f30608067d244e6db2593d7de5360719032406fe4a0533d0ff6b4f05b48192ef3ba8f5be863a039b2311b9b4
 EBUILD abrt-2.0.8.ebuild 3379 SHA256 4ec710c16d345ae256cdbca554544d432aea57e4d230f27d3922386a61d3d6ab SHA512 52b64270f58e246909add7fdf52a091f8889ce225a594e0fee2441092ecc778481a79947982eb238533c85f94796c2f716e2de1782ec520a65ec2e13d47f57a8 WHIRLPOOL 2530383714bb6de2b25d416c61b4529ce1b393cdba01f318fc559a6788f4fc228d320070df0256227513a62d81d3e86655900a6c187f525c0e5058b88bc0c64e
-MISC ChangeLog 2499 SHA256 4814378800f342ed00d58aec849f9b1325cc16413e9ef8d3eb9684293c9acad4 SHA512 43aadcc73419000a43d34bb4957b28db2ae708e7f49c9e89ea12daf0b3e7d90f87d27ce01f281771b077336c0b4489ca690314260e6beaad201349f81d8af2a0 WHIRLPOOL b5dd4eee0439d20546bb9eab04752825f78ff5afec8f7f1cd82a9a86342f2f8445863b11c8eeeb0f125e22aa00875f95a7697bdf781522081234c561c86357d2
+MISC ChangeLog 2972 SHA256 39c8f452e849b07f1c6b52ea153e374e4889d747722641575aa38bdde88fe9ea SHA512 92ddcf51f7fe6b65950f03b7485f598fbb36913ab1c5cb4c98969e9cdad14526142d0923b2d35b506ab743959e816b56968a316729a46da2f437591e234e28f2 WHIRLPOOL 9c394f8aafe8b05eb859a2ee1056b3a5a0e472ffb0ece56edb14e5a67545a186161ff413999a2344435b740f28ff9a9ca928411e01c24db00c30a3b0bfe1f2f4
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQXhvFAAoJEJ0WA1zPCt1hHJcIAJdkY7+LnTPVlC9ErQ0K3vkV
-mF3BDqnd0eYgWTNOUoUbPhB98YDuMX4iKogAercPGzmQRmZwOl9nNMkRUV4IQ0JH
-fN9lzQPnE5ZXzHev7HcntiyqeFHTA6F86JjG6zb7QoMe6iwCxbfXLtbIgNIw9aCw
-JfA98+0mc5aMzlhK6sO3l836DgBpS4DwUoJ0fCM4icCXVjqlgZFa4647lTg85lQh
-QUR1UtfkDNPTt2LJd0xKDBHmeMmIoy5tBpKwp/8wfDsx/28DR19PXHtTNK3cR7eS
-JEKOh+EZPmtSQHbIp0YKmpd8d+Ttv284NYZI2nF/DCC24doylAZD+A5vpd4wGPI=
-=VEFu
+iQEcBAEBCAAGBQJQiOqFAAoJEJ0WA1zPCt1hmlEH/2yr/mVsUSYUfY4kFwyfb88w
+9FdMgz7ZVtkRmB+yK7OfayZ+uLS4N7N7NnFj6vVJ4rEo7yeGbbzjTyLgq67XJ8UH
+gNEAzs20yyWtgIQdxFGJ5XJ/nl50G/LHTCCicRmp3TIFxm89U4x8A2qapwhUGoOd
+S+KPIImCFY5drpoIUjFwOyZh6FCr2VICGoLHyWh/YCCogHgOTWdlRyfTFFyH2jHh
+zjUBhJZER3dnwNUZaLymIHtCUdKbObKiIxYbkBbWZjJdwJgIjth+IKbWV5dPHyEX
+9R760Q1LbzKUIkULE7QiSM4SXFxMyPWI/wjMCpJLlncNTYKS9ZGUtCiXQTy936Q=
+=H4aO
 -----END PGP SIGNATURE-----
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 \