summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Thomson <wltjr@gentoo.org>2007-01-20 20:56:45 +0000
committerWilliam Thomson <wltjr@gentoo.org>2007-01-20 20:56:45 +0000
commitd25ae437b5178f519630cd6c38c9af0746ecaa77 (patch)
tree37286c0d076443d1b49823b43eb92cb317f2d3ed /mail-filter
parentStable on ppc wrt bug 151429 (diff)
downloadgentoo-2-d25ae437b5178f519630cd6c38c9af0746ecaa77.tar.gz
gentoo-2-d25ae437b5178f519630cd6c38c9af0746ecaa77.tar.bz2
gentoo-2-d25ae437b5178f519630cd6c38c9af0746ecaa77.zip
Updated patch, problem with search in the logfiles being broken. Thanks as always to ovaron2 :)
(Portage version: 2.1.2-r1)
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/assp/ChangeLog9
-rw-r--r--mail-filter/assp/assp-1.2.6-r2.ebuild (renamed from mail-filter/assp/assp-1.2.6-r1.ebuild)2
-rw-r--r--mail-filter/assp/files/assp-1.2.6.patch11
-rw-r--r--mail-filter/assp/files/digest-assp-1.2.6-r2 (renamed from mail-filter/assp/files/digest-assp-1.2.6-r1)0
4 files changed, 19 insertions, 3 deletions
diff --git a/mail-filter/assp/ChangeLog b/mail-filter/assp/ChangeLog
index a6a487a1e34a..f4af4ed09346 100644
--- a/mail-filter/assp/ChangeLog
+++ b/mail-filter/assp/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for mail-filter/assp
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.9 2007/01/20 18:03:21 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.10 2007/01/20 20:56:45 wltjr Exp $
+
+*assp-1.2.6-r2 (20 Jan 2007)
+
+ 20 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+ files/assp-1.2.6.patch, -assp-1.2.6-r1.ebuild, +assp-1.2.6-r2.ebuild:
+ Updated patch, problem with search in the logfiles being broken. Thanks as
+ always to ovaron2 :)
*assp-1.2.6-r1 (20 Jan 2007)
diff --git a/mail-filter/assp/assp-1.2.6-r1.ebuild b/mail-filter/assp/assp-1.2.6-r2.ebuild
index 798ae03d5c2a..7beb27f45124 100644
--- a/mail-filter/assp/assp-1.2.6-r1.ebuild
+++ b/mail-filter/assp/assp-1.2.6-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.2.6-r1.ebuild,v 1.1 2007/01/20 18:03:21 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.2.6-r2.ebuild,v 1.1 2007/01/20 20:56:45 wltjr Exp $
inherit eutils
diff --git a/mail-filter/assp/files/assp-1.2.6.patch b/mail-filter/assp/files/assp-1.2.6.patch
index 106c682c71fa..d89ca181c23a 100644
--- a/mail-filter/assp/files/assp-1.2.6.patch
+++ b/mail-filter/assp/files/assp-1.2.6.patch
@@ -1,6 +1,6 @@
diff -Naur assporg/ASSP/assp.pl asspmod/ASSP/assp.pl
--- assporg/ASSP/assp.pl 2007-01-18 23:12:20.000000000 +0100
-+++ asspmod/ASSP/assp.pl 2007-01-18 23:15:13.000000000 +0100
++++ asspmod/ASSP/assp.pl 2007-01-20 21:17:07.000000000 +0100
@@ -52,13 +52,10 @@
if($ARGV[0]) {
$base=$ARGV[0];
@@ -221,6 +221,15 @@ diff -Naur assporg/ASSP/assp.pl asspmod/ASSP/assp.pl
seek(F,-$MaillogTailBytes,2) || seek(F,0,0);
local $/;
$s=<F>;
+@@ -7779,7 +7776,7 @@
+ my $lines=0;
+ my $files=0;
+ my ($logdir, $logdirfile) = $logfile=~/^(.*[\/\\])?(.*?)$/;
+- my @logfiles=reverse sort glob("$base/$logdir*$logdirfile");
++ my @logfiles=reverse sort glob("$logdir*$logdirfile");
+ my $logf=File::ReadBackwards->new(shift(@logfiles),'(?:\r?\n|\r)',1); # line terminator regex
+ if ($logf) {
+ $files++;
@@ -7821,7 +7818,7 @@
my %replace;
my $j=0;
diff --git a/mail-filter/assp/files/digest-assp-1.2.6-r1 b/mail-filter/assp/files/digest-assp-1.2.6-r2
index 4e0bc062def1..4e0bc062def1 100644
--- a/mail-filter/assp/files/digest-assp-1.2.6-r1
+++ b/mail-filter/assp/files/digest-assp-1.2.6-r2