Additional sed expressions thanks to ovaron2. Removed past version.

Package-Manager: portage-2.1.4.1

3 files changed, 18 insertions, 7 deletions

diff --git a/mail-filter/assp/ChangeLog b/mail-filter/assp/ChangeLog
index feecba12050b..715d3265c136 100644
--- a/mail-filter/assp/ChangeLog
+++ b/mail-filter/assp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2007/10/23 21:57:11 wltjr Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.24 2008/03/27 21:57:33 wltjr Exp $
+
+*assp-1.3.3.8-r2 (27 Mar 2008)
+
+  27 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  -assp-1.3.3.8.ebuild, +assp-1.3.3.8-r2.ebuild:
+  Additional sed expressions thanks to ovaron2. Removed past version.
 
 *assp-1.3.3.8-r1 (23 Oct 2007)
 
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index 83b5a463cb30..4fff06b6c1f8 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -5,6 +5,6 @@ DIST ASSP_1.2.6-Install.zip 245745 RMD160 35b7808ef6cd8819e0c29d147c42fc409d69e5
 DIST ASSP_1.3.3.8-Install.zip 332926 RMD160 823307c69887aaaaf0440af637c186d1ac147a33 SHA1 586f149e4f8bce36039ee874e8e4e4cdc16549a7 SHA256 48a84aa63cbcff99833710c7ccbef69933558e98368982456f5ec8d201fad3ba
 EBUILD assp-1.2.6-r3.ebuild 2793 RMD160 ab3c65b8b3ed8280ed2ceefba0801850405af9c1 SHA1 dcce9da8aff5e60bac94e5c497f82483e673f026 SHA256 441607691b87ce26a2a329599c38a85ee085dffb1e65198e244af0aef1133725
 EBUILD assp-1.3.3.8-r1.ebuild 5838 RMD160 2b308ea0e764505ae2cab38424cf29bf81d0e353 SHA1 3815947a33c2b0e6b458f2daf7c2eb2ded15bab8 SHA256 b07300f21900af81065624e20bc6186b9745f2815e17f65383812e42ac1eeca2
-EBUILD assp-1.3.3.8.ebuild 5688 RMD160 d9f27c38c51ff4e88207f7c38006d2cda5828c09 SHA1 992ec19141f1e6e39f18179c9f0d550e9a1cd6ad SHA256 1ec6fd23bba433495aa0f96d5999cc6c3b2279f2505a1dc51ef4256299b6048f
-MISC ChangeLog 5722 RMD160 0f6ed36cd7443192be5cd23ee352334831f725f8 SHA1 ef2c3681c806d9c919f134876aa58d051f38cd51 SHA256 a1835f16c7c7294bf205123de98c0161a5f71cf1d7be9dfe9696cbc6ae8ca0a2
+EBUILD assp-1.3.3.8-r2.ebuild 6077 RMD160 a2e14db764cf273b05a4675c25dfe34a6c73f61c SHA1 96f0b1f8804eac7afcea6ddede50d2371da545d3 SHA256 3aadb1940ee9fb6191d529f17793c29d22fb5b5c7dae660008037391eddd02d7
+MISC ChangeLog 5931 RMD160 2486394fda6cd26c1d54137f2d8ee7b3ca8f8e66 SHA1 cbfaaa69f1015a21596ae001a3db0f14341bae43 SHA256 ccea5f44ec969c49b61043d855346668582d13b0cf2187b14a3ebe5ed79ff644
 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6
diff --git a/mail-filter/assp/assp-1.3.3.8.ebuild b/mail-filter/assp/assp-1.3.3.8-r2.ebuild
index 5e41259422e4..3aa370fb7fb9 100644
--- a/mail-filter/assp/assp-1.3.3.8.ebuild
+++ b/mail-filter/assp/assp-1.3.3.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.3.3.8.ebuild,v 1.3 2007/10/22 03:57:07 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.3.3.8-r2.ebuild,v 1.1 2008/03/27 21:57:33 wltjr Exp $
 
 inherit eutils
 
@@ -61,6 +61,7 @@ src_unpack() {
 		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
 		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
 		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
+		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
 		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
 		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
 		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
@@ -75,13 +76,14 @@ src_unpack() {
 		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
 		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
 		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\//i;|' \
+		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
 		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
 		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
 		-e 's|$fil="$base/$fil";|$fil="/usr/share/assp/$fil";|' \
 		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
 		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
 		-e 's|$base/$bf|/etc/assp/$bf|g' \
+		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
 		assp.pl || die
 
 	# questionable stuff
@@ -97,6 +99,9 @@ src_unpack() {
 	# sed rebuildspamdb.pl
 	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
 		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
+		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
+		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
+		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
 		rebuildspamdb.pl || die
 
 	# sed stats.sh