fix init.d startup script

Package-Manager: portage-2.1.4_rc10

5 files changed, 70 insertions, 12 deletions

diff --git a/sys-kernel/kerneloops/ChangeLog b/sys-kernel/kerneloops/ChangeLog
index 395605fcf4d9..7ab273046011 100644
--- a/sys-kernel/kerneloops/ChangeLog
+++ b/sys-kernel/kerneloops/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/kerneloops
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/ChangeLog,v 1.4 2008/01/08 23:42:00 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/ChangeLog,v 1.5 2008/01/08 23:45:40 gregkh Exp $
+
+*kerneloops-0.8-r1 (08 Jan 2008)
+
+  08 Jan 2008; Greg Kroah-Hartman <gregkh@gentoo.org> files/kerneloops,
+  +kerneloops-0.8-r1.ebuild:
+  fix the kerneloops startup script (wrong config file test and error message)
 
   08 Jan 2008; Greg Kroah-Hartman <gregkh@gentoo.org>
   -kerneloops-0.5.ebuild, -kerneloops-0.5-r1.ebuild:
diff --git a/sys-kernel/kerneloops/Manifest b/sys-kernel/kerneloops/Manifest
index 134de0c3c0ea..9479d243be45 100644
--- a/sys-kernel/kerneloops/Manifest
+++ b/sys-kernel/kerneloops/Manifest
@@ -1,16 +1,20 @@
-AUX kerneloops 822 RMD160 624f1c111f7e2bda58397274014c3f8d040ed1e0 SHA1 b79287d30ee83c64d91e52ed5c9d607fc310ab34 SHA256 72b23e14087e1d986bfa42ff88c0d29c58439a31dd428641c70b1391219fc444
-MD5 bd69bc1e3f276a13a480a96e3fc5c37d files/kerneloops 822
-RMD160 624f1c111f7e2bda58397274014c3f8d040ed1e0 files/kerneloops 822
-SHA256 72b23e14087e1d986bfa42ff88c0d29c58439a31dd428641c70b1391219fc444 files/kerneloops 822
+AUX kerneloops 823 RMD160 ca0c79ed0d0703a223ad81d0a39cd7087dbbbcd8 SHA1 883ea68a35e1b256b2b4d0c4703d92a43855e16f SHA256 9dfc39001d382fd5a2bbdec0d988a4a0e028b553bbe579feb56ccf4916486fb7
+MD5 159f6685c536b6812b9987ed0ba579c1 files/kerneloops 823
+RMD160 ca0c79ed0d0703a223ad81d0a39cd7087dbbbcd8 files/kerneloops 823
+SHA256 9dfc39001d382fd5a2bbdec0d988a4a0e028b553bbe579feb56ccf4916486fb7 files/kerneloops 823
 DIST kerneloops-0.8.tar.gz 49594 RMD160 2c548680d882c1fd164be864091267e696b7ae34 SHA1 7ef96f4a6b4417e17a1afca9720dca954b30ba56 SHA256 892efb04caf897b88671c8b98d3c81495d4f0517fcd9ab052cd57148862705c1
+EBUILD kerneloops-0.8-r1.ebuild 1404 RMD160 b6246cdc24eb0f6093512365caab7e685704a148 SHA1 2ce0df2d0f568975755909e6c71e60d25a253701 SHA256 4d556ab9f1172db801f16f74045f99a66269419000782874b73d3bf26465f886
+MD5 273871fdd86139a85c6dfd4795190dd5 kerneloops-0.8-r1.ebuild 1404
+RMD160 b6246cdc24eb0f6093512365caab7e685704a148 kerneloops-0.8-r1.ebuild 1404
+SHA256 4d556ab9f1172db801f16f74045f99a66269419000782874b73d3bf26465f886 kerneloops-0.8-r1.ebuild 1404
 EBUILD kerneloops-0.8.ebuild 1401 RMD160 f9e58a4b9125ce8414da02327f089ffadc3f03c5 SHA1 4ef9d3a8f8ae155bd58732b318cc1e558d0a797c SHA256 a5cb7a5267501e95e4e14c7cc11754aa02db613b67476a9e5da0f2564bb013bf
 MD5 aa8337dc021ca0173237f235ed9ab11b kerneloops-0.8.ebuild 1401
 RMD160 f9e58a4b9125ce8414da02327f089ffadc3f03c5 kerneloops-0.8.ebuild 1401
 SHA256 a5cb7a5267501e95e4e14c7cc11754aa02db613b67476a9e5da0f2564bb013bf kerneloops-0.8.ebuild 1401
-MISC ChangeLog 1210 RMD160 65dd08282f14c266b35104538845c875756fa819 SHA1 67d5b54c130a0182b46931f69cf5cf91abc63ed9 SHA256 db0a088ae10b3c03b735ad6a678bf6c3c5661441f9e89dcc3a7d8349170d0960
-MD5 f96daeee85f14791e396a4c10a2e6163 ChangeLog 1210
-RMD160 65dd08282f14c266b35104538845c875756fa819 ChangeLog 1210
-SHA256 db0a088ae10b3c03b735ad6a678bf6c3c5661441f9e89dcc3a7d8349170d0960 ChangeLog 1210
+MISC ChangeLog 1425 RMD160 03c770e6e29c046003e9ea60bd3355f74699fc1a SHA1 b568fce18b710bc307dc1e84174c1fa642ea6de0 SHA256 e2ae4433616ad166fb92de5ae98211b1c266fd4e870f40eba85c2c1b0e37d156
+MD5 10d06812a05126f25d3b7a37f3f82c11 ChangeLog 1425
+RMD160 03c770e6e29c046003e9ea60bd3355f74699fc1a ChangeLog 1425
+SHA256 e2ae4433616ad166fb92de5ae98211b1c266fd4e870f40eba85c2c1b0e37d156 ChangeLog 1425
 MISC metadata.xml 494 RMD160 5a3afba94ddd8f646c3eee493746be80006655ad SHA1 2f3aa383140a295aa0136267024e36cb69f4837d SHA256 768ef01b98419dda6aa1bdf24033bd279bfefc3f22506c95bd70ea2ecbb64fcf
 MD5 dcbf3b95d1d52945c52dbcafb38ab27a metadata.xml 494
 RMD160 5a3afba94ddd8f646c3eee493746be80006655ad metadata.xml 494
@@ -18,3 +22,6 @@ SHA256 768ef01b98419dda6aa1bdf24033bd279bfefc3f22506c95bd70ea2ecbb64fcf metadata
 MD5 198adc81315a90a5a50565b99bd83dae files/digest-kerneloops-0.8 241
 RMD160 b7cc8b9036042282644eac8805b13c32376f7f29 files/digest-kerneloops-0.8 241
 SHA256 6839c266573ce068cd03c210251abff0dfac9f42d73ca17ae9fa7a6afbf8c343 files/digest-kerneloops-0.8 241
+MD5 198adc81315a90a5a50565b99bd83dae files/digest-kerneloops-0.8-r1 241
+RMD160 b7cc8b9036042282644eac8805b13c32376f7f29 files/digest-kerneloops-0.8-r1 241
+SHA256 6839c266573ce068cd03c210251abff0dfac9f42d73ca17ae9fa7a6afbf8c343 files/digest-kerneloops-0.8-r1 241
diff --git a/sys-kernel/kerneloops/files/digest-kerneloops-0.8-r1 b/sys-kernel/kerneloops/files/digest-kerneloops-0.8-r1
new file mode 100644
index 000000000000..b8f606bae90d
--- /dev/null
+++ b/sys-kernel/kerneloops/files/digest-kerneloops-0.8-r1
@@ -0,0 +1,3 @@
+MD5 a8cac3b658bbe4860ba6ffb356253616 kerneloops-0.8.tar.gz 49594
+RMD160 2c548680d882c1fd164be864091267e696b7ae34 kerneloops-0.8.tar.gz 49594
+SHA256 892efb04caf897b88671c8b98d3c81495d4f0517fcd9ab052cd57148862705c1 kerneloops-0.8.tar.gz 49594
diff --git a/sys-kernel/kerneloops/files/kerneloops b/sys-kernel/kerneloops/files/kerneloops
index c6c1c776107a..9be16ea6d3be 100755
--- a/sys-kernel/kerneloops/files/kerneloops
+++ b/sys-kernel/kerneloops/files/kerneloops
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/files/kerneloops,v 1.1 2007/12/18 22:22:52 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/files/kerneloops,v 1.2 2008/01/08 23:45:41 gregkh Exp $
 
 depend() {
 	need net
@@ -9,12 +9,12 @@ depend() {
 
 exec="/usr/sbin/kerneloops"
 prog=$(basename $exec)
-conf="/etc/kerneloops.org"
+conf="/etc/kerneloops.conf"
 pidfile="/var/run/${prog}.pid"
 
 checkconfig() {
 	if [ ! -e $conf ] ; then
-		eerror "You need an ${exec} file to run $prog"
+		eerror "You need an ${conf} file to run $prog"
 		return 1
 	fi
 }
diff --git a/sys-kernel/kerneloops/kerneloops-0.8-r1.ebuild b/sys-kernel/kerneloops/kerneloops-0.8-r1.ebuild
new file mode 100644
index 000000000000..797fc7be4bff
--- /dev/null
+++ b/sys-kernel/kerneloops/kerneloops-0.8-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.8-r1.ebuild,v 1.1 2008/01/08 23:45:40 gregkh Exp $
+
+inherit eutils
+
+DESCRIPTION="Tool to automatically collect and submit Linux kernel crash signatures"
+HOMEPAGE="http://www.kerneloops.org/"
+SRC_URI="http://www.kerneloops.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="net-misc/curl sys-apps/dbus"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	doinitd "${FILESDIR}"/kerneloops || die "doinitd failed"
+
+}
+
+pkg_postinst() {
+	ewarn "PRIVACY NOTE"
+	ewarn "You must allow the kerneloops program to send the oops messages"
+	ewarn "by either editing the /etc/kerneloops.conf file, or by running the"
+	ewarn "kerneloops-applet program first."
+	ewarn "Enabling this option will cause your system to submit certain kernel"
+	ewarn "output to the kerneloops.org website, where it will be available via"
+	ewarn "this website to developers and everyone else."
+	ewarn "The submitted info are so-called \"oopses\", kernel crash signature."
+	ewarn "However, due to the nature of oopses, it may happen that a few"
+	ewarn "surrounding lines of the oops in the \"dmesg\" are being sent together"
+	ewarn "with the oops."
+}