rpms/mailgraph/devel mailgraph-spampd.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mailgraph.spec, 1.2, 1.3 sources, 1.2, 1.3

Bernard Johnson (bjohnson) fedora-extras-commits at redhat.com
Thu Jun 21 20:02:21 UTC 2007


Author: bjohnson

Update of /cvs/pkgs/rpms/mailgraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31228/devel

Modified Files:
	.cvsignore mailgraph.spec sources 
Added Files:
	mailgraph-spampd.patch 
Log Message:
update to 1.13
patch for spamproxyd


mailgraph-spampd.patch:

--- NEW FILE mailgraph-spampd.patch ---
Index: mailgraph/mailgraph-1.13/mailgraph.pl
===================================================================
--- mailgraph.orig/mailgraph-1.13/mailgraph.pl
+++ mailgraph/mailgraph-1.13/mailgraph.pl
@@ -742,7 +742,7 @@ sub process_line($)
 			event($time, 'spam');
 		}
 	}
-	elsif($prog eq 'spamproxyd') {
+	elsif($prog eq 'spamproxyd' or $prog eq 'spampd') {
 		if($text =~ /^\s*SPAM/ or $text =~ /^identified spam/) {
 			event($time, 'spam');
 		}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mailgraph/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jan 2007 21:09:14 -0000	1.2
+++ .cvsignore	21 Jun 2007 20:01:41 -0000	1.3
@@ -1 +1 @@
-mailgraph-1.12.tar.gz
+mailgraph-1.13.tar.gz


Index: mailgraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mailgraph/devel/mailgraph.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mailgraph.spec	25 Mar 2007 18:49:10 -0000	1.2
+++ mailgraph.spec	21 Jun 2007 20:01:42 -0000	1.3
@@ -1,17 +1,18 @@
 Name:           mailgraph
-Version:        1.12
-Release:        5%{?dist}%{?repotag:.%{repotag}}
+Version:        1.13
+Release:        1%{?dist}%{?repotag:.%{repotag}}
 Summary:        A RRDtool frontend for Mail statistics
 
 Group:          System Environment/Daemons
 License:        GPL
 
 URL:            http://people.ee.ethz.ch/~dws/software/mailgraph 
-Source0:        http://people.ee.ethz.ch/~dws/software/mailgraph/pub/mailgraph-1.12.tar.gz
+Source0:        http://people.ee.ethz.ch/~dws/software/mailgraph/pub/%{name}-%{version}.tar.gz
 Source1:        mailgraph.init
 Source2:        mailgraph.conf
 Source3:        mailgraph.sysconfig
 Patch0:         paths.patch
+Patch1:         mailgraph-spampd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       perl(File::Tail), rrdtool, httpd
@@ -29,6 +30,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .paths
+%patch1 -p2 -b .spampd
 
 %build
 
@@ -80,6 +82,10 @@
 
 
 %changelog
+* Thu Jun 21 2007 Bernard Johnson <bjohnson at symetrix.com> - 1.13-1
+- v 1.13
+- patch from Thomas Vander Stichele to catch logging of spampd on fedora
+
 * Sun Mar 25 2007 Bernard Johnson <bjohnson at symetrix.com> - 1.12-5
 - require initscripts because initfile uses daemon function
 - use perl(...) requires (bz #233769)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mailgraph/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jan 2007 21:09:14 -0000	1.2
+++ sources	21 Jun 2007 20:01:42 -0000	1.3
@@ -1 +1 @@
-e3c88ee9ff6e423942ff8ce7038449c4  mailgraph-1.12.tar.gz
+b59cc2375662f6c113c6be2ab5bfa179  mailgraph-1.13.tar.gz




More information about the fedora-extras-commits mailing list