Gergely, I am planning an NMU for these three bugs (patch attached) plus making ccze lintian clean. I have sent a ping to the submitter of #330974 to make sure I understand the problem, but it looks like it's just the extra space. The fix itself is inelegant, as it only calls ccze_space once, when there are two spaces in the match, but I think it's good enough for now. I'd have to brush up on pcre again to figure out the right thing - probably a for loop on offset or something.
Well, let me know if these patches are acceptable. If the third one isn't, I'm willing to see if I can't make it better, but I'm inclined to let it slide otherwise. I understand it's a bit odd doing an NMU for less than RC bugs, but I do like the package, and it's the non-RC bugs that are annoying in life, I find. Any objections, and I won't go ahead, of course. Take care, -- ----------------------------------------------------------------- | ,''`. Stephen Gran | | : :' : [EMAIL PROTECTED] | | `. `' Debian user, admin, and developer | | `- http://www.debian.org | -----------------------------------------------------------------
diff -u ccze-0.2.1/debian/changelog ccze-0.2.1/debian/changelog
--- ccze-0.2.1/debian/changelog
+++ ccze-0.2.1/debian/changelog
@@ -1,3 +1,14 @@
+ccze (0.2.1-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Apply patch for A/V regexes (closes: #345586)
+ * Make debian/copyright pedantically correct (closes: #290082)
+ * Update FSF address
+ * Update to standards version 3.6.2 (no changes necessary)
+ * Allow for extra space in syslog parsing (appears to closes: #330974)
+
+ -- Stephen Gran <[EMAIL PROTECTED]> Mon, 17 Apr 2006 20:07:56 +0100
+
ccze (0.2.1-1.1) unstable; urgency=low
* NMU
diff -u ccze-0.2.1/debian/control ccze-0.2.1/debian/control
--- ccze-0.2.1/debian/control
+++ ccze-0.2.1/debian/control
@@ -2,7 +2,7 @@
Section: utils
Priority: extra
Maintainer: Gergely Nagy <[EMAIL PROTECTED]>
-Standards-Version: 3.5.9
+Standards-Version: 3.6.2
Build-Depends: libpcre3-dev, libncurses5-dev
Package: ccze
diff -u ccze-0.2.1/debian/copyright ccze-0.2.1/debian/copyright
--- ccze-0.2.1/debian/copyright
+++ ccze-0.2.1/debian/copyright
@@ -7,6 +7,10 @@
Copyright:
+Copyright 2003-2005 Gergely Nagy <[EMAIL PROTECTED]>
+
+License:
+
CCZE is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 dated June, 1991.
@@ -17,9 +21,9 @@
License for more details.
You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ along with this package; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
On Debian systems, the complete text of the GNU General Public License
can be found in `/usr/share/common-licenses/GPL'.
only in patch2:
unchanged:
--- ccze-0.2.1.orig/src/ccze-wordcolor.c
+++ ccze-0.2.1/src/ccze-wordcolor.c
@@ -37,13 +37,13 @@
"warn", "restart", "exit", "stop", "end", "shutting", "down", "close",
"unreach", "can't", "cannot", "skip", "deny", "disable", "ignored",
"miss", "oops", "not", "backdoor", "blocking", "ignoring",
- "unable", "readonly", "offline", "terminate", "empty"
+ "unable", "readonly", "offline", "terminate", "empty", "virus"
};
static char *words_good[] = {
"activ", "start", "ready", "online", "load", "ok", "register", "detected",
"configured", "enable", "listen", "open", "complete", "attempt", "done",
- "check", "listen", "connect", "finish"
+ "check", "listen", "connect", "finish", "clean"
};
static char *words_error[] = {
only in patch2:
unchanged:
--- ccze-0.2.1.orig/src/mod_syslog.c
+++ ccze-0.2.1/src/mod_syslog.c
@@ -104,7 +104,7 @@
int errptr;
reg_syslog = pcre_compile ("^(\\S*\\s{1,2}\\d{1,2}\\s\\d\\d:\\d\\d:\\d\\d)"
- "\\s(\\S+)\\s((\\S+:?)\\s(.*))$", 0, &error,
+ "\\s(\\S+)\\s+((\\S+:?)\\s(.*))$", 0, &error,
&errptr, NULL);
hints_syslog = pcre_study (reg_syslog, 0, &error);
}
signature.asc
Description: Digital signature
