From: William Thomson Date: Sat, 20 Jan 2007 20:56:45 +0000 (+0000) Subject: Updated patch, problem with search in the logfiles being broken. Thanks as always... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d647a3dba480d8aee94cc0f21c2ce44bccc7d2c;p=gentoo.git Updated patch, problem with search in the logfiles being broken. Thanks as always to ovaron2 :) Package-Manager: portage-2.1.2-r1 --- 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. + 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/Manifest b/mail-filter/assp/Manifest index 3090a34de3e4..8d58eb2bcc07 100644 --- a/mail-filter/assp/Manifest +++ b/mail-filter/assp/Manifest @@ -2,10 +2,10 @@ AUX assp-1.2.5.patch 11949 RMD160 d55dd566ea2af6fd7ee2f24226b1cb4cb1995335 SHA1 MD5 ad064d8872bf51d35074350d0f4a663c files/assp-1.2.5.patch 11949 RMD160 d55dd566ea2af6fd7ee2f24226b1cb4cb1995335 files/assp-1.2.5.patch 11949 SHA256 5471e110974fceb3c4429f7570c8d024510985c684f399ece76a9012dde0da58 files/assp-1.2.5.patch 11949 -AUX assp-1.2.6.patch 16745 RMD160 dfb9dcdaf1c8b30a368e580feac3a0c3ac1cff73 SHA1 43b6ead7ed9f50d204766d32e5df832925228cd8 SHA256 6af72bb88fe7b52d09135b4cff85c726dd5443f262c490966897092ac70b336f -MD5 c4e2d9ff4e63e13776487324246b4d2a files/assp-1.2.6.patch 16745 -RMD160 dfb9dcdaf1c8b30a368e580feac3a0c3ac1cff73 files/assp-1.2.6.patch 16745 -SHA256 6af72bb88fe7b52d09135b4cff85c726dd5443f262c490966897092ac70b336f files/assp-1.2.6.patch 16745 +AUX assp-1.2.6.patch 17111 RMD160 472ffb8fd931bdc168f1fdebf7b43000bd1c5d69 SHA1 de477357d1cf79e43416696b29e640a5d17adc5d SHA256 4e1bc581b0ed16a8e3261f036eb049699d5de018e0f35ddc6def6a8261d9e29b +MD5 aeddada6f64cb3d9f767f498617402cb files/assp-1.2.6.patch 17111 +RMD160 472ffb8fd931bdc168f1fdebf7b43000bd1c5d69 files/assp-1.2.6.patch 17111 +SHA256 4e1bc581b0ed16a8e3261f036eb049699d5de018e0f35ddc6def6a8261d9e29b files/assp-1.2.6.patch 17111 AUX asspd.init 657 RMD160 066f56f95cd7177c669cb4db993401c5f164f16e SHA1 218b1d1d566d7a1f3d340c3a2266c38457878d88 SHA256 4ec543f7c2f006d80dcb592d50f44a41e8aa2cd449f65a6e1cd53996e67b2fde MD5 67bc4fa59ed71fe1f93e2fb365ed74ab files/asspd.init 657 RMD160 066f56f95cd7177c669cb4db993401c5f164f16e files/asspd.init 657 @@ -16,14 +16,14 @@ EBUILD assp-1.2.5-r5.ebuild 2661 RMD160 061d67742dd60173de66b2f3b33233def996652f MD5 51f0b20f95b2d36a43f1947e89593e36 assp-1.2.5-r5.ebuild 2661 RMD160 061d67742dd60173de66b2f3b33233def996652f assp-1.2.5-r5.ebuild 2661 SHA256 ee0c7d57f09836d72949ad54324c607cf9f15c824304b6f69caf09b60cc19376 assp-1.2.5-r5.ebuild 2661 -EBUILD assp-1.2.6-r1.ebuild 2707 RMD160 8e9d40c50a22c6617bdd273d47ffabbd9b50c937 SHA1 e730b066e40d37248d32aaef33a45accaef3ff38 SHA256 4a83f041fc4e592649b777c28926eba8feb7e681ae954e4dd1e3c53b5e77b2d6 -MD5 d150fb5f35896a2493e710a6c0a28dab assp-1.2.6-r1.ebuild 2707 -RMD160 8e9d40c50a22c6617bdd273d47ffabbd9b50c937 assp-1.2.6-r1.ebuild 2707 -SHA256 4a83f041fc4e592649b777c28926eba8feb7e681ae954e4dd1e3c53b5e77b2d6 assp-1.2.6-r1.ebuild 2707 -MISC ChangeLog 2454 RMD160 641fdd79c806fecd96c922155643423bc367570c SHA1 8bec22062b72c6569e932d79ac242df6a144ce8c SHA256 9d8dc9bc523ef56dc5cd3a63c45f3ed2735a31bc5b72782a55d6d48568003304 -MD5 c37f758ce4a54a2a95a412c322df6dcf ChangeLog 2454 -RMD160 641fdd79c806fecd96c922155643423bc367570c ChangeLog 2454 -SHA256 9d8dc9bc523ef56dc5cd3a63c45f3ed2735a31bc5b72782a55d6d48568003304 ChangeLog 2454 +EBUILD assp-1.2.6-r2.ebuild 2707 RMD160 4e61444aeb01111df9846c6d35b6c45081777866 SHA1 e49f486f64cb1b7b895231434a97d536d9e65d65 SHA256 b546db0dae0b49e65ad66c7119784819f294721266b848e5cac807e913bff637 +MD5 f41d295bf31f8cb67bf6dff67a5f6a44 assp-1.2.6-r2.ebuild 2707 +RMD160 4e61444aeb01111df9846c6d35b6c45081777866 assp-1.2.6-r2.ebuild 2707 +SHA256 b546db0dae0b49e65ad66c7119784819f294721266b848e5cac807e913bff637 assp-1.2.6-r2.ebuild 2707 +MISC ChangeLog 2715 RMD160 bc20ea8aee221ecdfd6550716652e05257f3a174 SHA1 c80ab75aaf7d953358a102095b62479a801f3499 SHA256 f5e0a7d5045fc9d5b85241458456147f3d70cb5e1ae423ecf14e5cdbd9dd302f +MD5 e4813b302ded11d42edbf6a251176bf2 ChangeLog 2715 +RMD160 bc20ea8aee221ecdfd6550716652e05257f3a174 ChangeLog 2715 +SHA256 f5e0a7d5045fc9d5b85241458456147f3d70cb5e1ae423ecf14e5cdbd9dd302f ChangeLog 2715 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6 MD5 31d7bb0d82eeb1c4fde76228f3d71a8d metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 metadata.xml 808 @@ -31,6 +31,6 @@ SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6 metadata MD5 24d9ce96160cb290c6872107dc5b6928 files/digest-assp-1.2.5-r5 247 RMD160 5eb32c5a2e77a2e5b0e74aaaa95059be0e0d6f85 files/digest-assp-1.2.5-r5 247 SHA256 8829c42c614f1cdf2569938d0d02d82300c4acb6dccb999aafd400ae23461656 files/digest-assp-1.2.5-r5 247 -MD5 397e3a17bf5a7aa227a56ae5b949e5a1 files/digest-assp-1.2.6-r1 247 -RMD160 62ff070b13b038c5bfaf31b579a0e64e585d79da files/digest-assp-1.2.6-r1 247 -SHA256 020336ad57d85e5c03a76dbbc5c041ee345f51ad0ec4ea015671215ec1adc512 files/digest-assp-1.2.6-r1 247 +MD5 397e3a17bf5a7aa227a56ae5b949e5a1 files/digest-assp-1.2.6-r2 247 +RMD160 62ff070b13b038c5bfaf31b579a0e64e585d79da files/digest-assp-1.2.6-r2 247 +SHA256 020336ad57d85e5c03a76dbbc5c041ee345f51ad0ec4ea015671215ec1adc512 files/digest-assp-1.2.6-r2 247 diff --git a/mail-filter/assp/assp-1.2.6-r1.ebuild b/mail-filter/assp/assp-1.2.6-r2.ebuild similarity index 98% rename from mail-filter/assp/assp-1.2.6-r1.ebuild rename to 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=; +@@ -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 similarity index 100% rename from mail-filter/assp/files/digest-assp-1.2.6-r1 rename to mail-filter/assp/files/digest-assp-1.2.6-r2