rpms/kerneloops/F-8 kerneloops-cleanup-logging.patch, NONE, 1.1 kerneloops-fix-always-pref.patch, NONE, 1.1 kerneloops-ignore-raid-warning.patch, NONE, 1.1 kerneloops.spec, 1.7, 1.8

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kerneloops/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31011

Modified Files:
	kerneloops.spec 
Added Files:
	kerneloops-cleanup-logging.patch 
	kerneloops-fix-always-pref.patch 
	kerneloops-ignore-raid-warning.patch 
Log Message:
* Fri Mar 28 2008 Chuck Ebbert <cebbert at redhat.com>  0.10-10
- Write the correct preference setting when user chooses "always". (F9#437291)
- Don't repeatedly ask the user for permission to send old oopses. (F9#435065)
- Don't report a harmless RAID warning message. (F9#437854)


kerneloops-cleanup-logging.patch:

--- NEW FILE kerneloops-cleanup-logging.patch ---
Write a logfile entry even if nothing gets submitted, so users don't get
asked again about oopses they refused to submit.

Clear the queue when the user answers "never".

Index: kerneloops-0.10/kerneloops.c
===================================================================
--- kerneloops-0.10.orig/kerneloops.c
+++ kerneloops-0.10/kerneloops.c
@@ -77,6 +77,7 @@ static DBusHandlerResult got_message(
 	}
 	if (dbus_message_is_signal(message,
 		"org.kerneloops.submit.permission", "never")) {
+		clear_queue();
 		opted_in = 0;
 		return DBUS_HANDLER_RESULT_HANDLED;
 	}
Index: kerneloops-0.10/submit.c
===================================================================
--- kerneloops-0.10.orig/submit.c
+++ kerneloops-0.10/submit.c
@@ -129,7 +129,12 @@ static void print_queue(void)
 
 }
 
-
+static void write_logfile(int count)
+{
+	openlog("kerneloops", 0, LOG_KERN);
+	syslog(LOG_WARNING, "Submitted %i kernel oopses to www.kerneloops.org", count);
+	closelog();
+}
 
 void submit_queue(void)
 {
@@ -180,11 +185,9 @@ void submit_queue(void)
 		count++;
 	}
 
-	if (count && !testmode) {
-		openlog("kerneloops", 0, LOG_KERN);
-		syslog(LOG_WARNING, "Submitted %i kernel oopses to www.kerneloops.org", count);
-		closelog();
-	}
+	if (count && !testmode)
+		write_logfile(count);
+
 	if (count)
 		dbus_say_thanks();
 	/*
@@ -210,6 +213,7 @@ void clear_queue(void)
 		free(oops);
 		oops = next;
 	}
+	write_logfile(0);
 }
 
 void ask_permission(void)

kerneloops-fix-always-pref.patch:

--- NEW FILE kerneloops-fix-always-pref.patch ---
Index: kerneloops-0.10/kerneloops-applet.c
===================================================================
--- kerneloops-0.10.orig/kerneloops-applet.c
+++ kerneloops-0.10/kerneloops-applet.c
@@ -119,7 +119,7 @@ static void notify_action(NotifyNotifica
 
 	send_permission(answer);
 	if (strcmp(answer, "always") == 0)
-		write_config("alway");
+		write_config("always");
 	if (strcmp(answer, "never") == 0)
 		write_config("never");
 	gtk_status_icon_set_visible(statusicon, FALSE);

kerneloops-ignore-raid-warning.patch:

--- NEW FILE kerneloops-ignore-raid-warning.patch ---
Don't trigger on a harmless RAID1 warning message.

Index: kerneloops-0.10/dmesg.c
===================================================================
--- kerneloops-0.10.orig/dmesg.c
+++ kerneloops-0.10/dmesg.c
@@ -156,37 +156,40 @@ static void extract_oops(char *buffer, i
 
 	i = 0;
 	while (i < linecount) {
-		if (linepointer[i] == NULL) {
+		char *c = linepointer[i];
+
+		if (c == NULL) {
 			i++;
 			continue;
 		}
 		if (oopsstart < 0) {
 			/* find start-of-oops markers */
-			if (strstr(linepointer[i], "general protection fault:"))
+			if (strstr(c, "general protection fault:"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "BUG:"))
+			if (strstr(c, "BUG:"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "kernel BUG at"))
+			if (strstr(c, "kernel BUG at"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "double fault:"))
+			if (strstr(c, "double fault:"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "Badness at"))
+			if (strstr(c, "Badness at"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "WARNING:"))
+			if (strstr(c, "WARNING:") &&
+			    !strstr(c, "appears to be on the same physical disk"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "Unable to handle kernel"))
+			if (strstr(c, "Unable to handle kernel"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "sysctl table check failed"))
+			if (strstr(c, "sysctl table check failed"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "------------[ cut here ]------------"))
+			if (strstr(c, "------------[ cut here ]------------"))
 				oopsstart = i;
-			if (strstr(linepointer[i], "Oops:") && i >= 3)
+			if (strstr(c, "Oops:") && i >= 3)
 				oopsstart = i-3;
 			if (oopsstart >= 0 && testmode) {
 				printf("Found start of oops at line %i\n", oopsstart);
 				printf("    start line is -%s-\n", linepointer[oopsstart]);
 				if (oopsstart != i)
-					printf("    trigger line is -%s-\n", linepointer[i]);
+					printf("    trigger line is -%s-\n", c);
 			}
 			/* give the kernel some time to finish dumping the oops */
 			/* but not in testmode since that makes regression testins slow */


Index: kerneloops.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/F-8/kerneloops.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kerneloops.spec	17 Mar 2008 17:38:58 -0000	1.7
+++ kerneloops.spec	28 Mar 2008 18:04:41 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		kerneloops
 Version:	0.10
-Release:	7%{?dist}
+Release:	10%{?dist}
 Summary:	Tool to automatically collect and submit kernel crash signatures
 
 Group:		System Environment/Base
@@ -12,6 +12,9 @@
 Patch1:		kerneloops-ignore-module-list.patch
 Patch2:		kerneloops-require-syslog-on-shutdown.patch
 Patch3:		kerneloops-performance.patch
+Patch4:		kerneloops-ignore-raid-warning.patch
+Patch5:		kerneloops-cleanup-logging.patch
+Patch6:		kerneloops-fix-always-pref.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -37,6 +40,9 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -77,6 +83,11 @@
 %{_mandir}/man8/kerneloops.8.gz
 
 %changelog
+* Fri Mar 28 2008 Chuck Ebbert <cebbert at redhat.com>  0.10-10
+- Write the correct preference setting when user chooses "always". (F9#437291)
+- Don't repeatedly ask the user for permission to send old oopses. (F9#435065)
+- Don't report a harmless RAID warning message. (F9#437854)
+
 * Mon Mar 17 2008 Chuck Ebbert <cebbert at redhat.com>  0.10-7
 - Fix high CPU usage on startup with large system logs (F9#435544)