diff -Naur assp_org/ASSP/assp.pl assp_patched/ASSP/assp.pl
--- assp_org/ASSP/assp.pl 2007-05-01 05:23:42.000000000 -0600
+++ assp_patched/ASSP/assp.pl 2007-06-16 11:45:31.000000000 -0600
@@ -55,13 +55,9 @@
if($ARGV[0]) {
$base=$ARGV[0];
} else {
- # the last one is the one used if all else fails
- foreach ('.','assp','/usr/local/assp','/home/assp','/etc/assp','/usr/assp','/applications/assp','/assp','.') {
- $base=$_;
- last if -e "$base/assp.cfg";
- }
+ $base='/etc/assp/';
}
-if ( !-e "$base/images/noIcon.png")
+if ( !-e "/usr/share/assp/images/noIcon.png")
{ die "Abort: folder 'images' not correctly installed";}
loadConfig();
@@ -124,8 +120,8 @@
[blackRe,'BlackRe - Expression to Identify Spam* ',60,textinput,'http://[\\w\\.]+@|\w<[a-z0-9]+[abcdfghjklmnpqrstuvwxyz0-9]{4}[a-z0-9]*>|subject: [^\\n]* \S','(.*)',ConfigCompileRe,
'If an incoming email that\'s not local or whitelisted matches this Perl regular expression it will be considered spam by the Bayesian filter.
May match text from the body or header of the email. For example: penis|virgin|X-Priority: 1','Basic'],
-[redRe,'Expression to Identify Redlisted Mail*',60,textinput,'file:files/redre.txt','(.*)',ConfigCompileRe,
-'If an email matches this Perl regular expression it will be considered redlisted. The redlist is a list of addresses that cannot contribute to the whitelist, and who are not considered local, even if their mail is from a local computer. For example, if someone goes on a vacation and turns on their email\'s autoresponder, put them on the redlist until they return. Then as they reply to every spam they receive they won\'t corrupt your non-spam collection or whitelist: \\[autoreply\\]
Redlisted addresses will not be added to the whitelist. Redlisted messages will not be stored in the SPAM/NOTSPAM-collection. As all fields marked by * this field accepts a list separated by | or a specified file \'file:files/redre.txt\' .','Basic'],
+[redRe,'Expression to Identify Redlisted Mail*',60,textinput,'file:/etc/assp/redre.txt','(.*)',ConfigCompileRe,
+'If an email matches this Perl regular expression it will be considered redlisted. The redlist is a list of addresses that cannot contribute to the whitelist, and who are not considered local, even if their mail is from a local computer. For example, if someone goes on a vacation and turns on their email\'s autoresponder, put them on the redlist until they return. Then as they reply to every spam they receive they won\'t corrupt your non-spam collection or whitelist: \\[autoreply\\]
Redlisted addresses will not be added to the whitelist. Redlisted messages will not be stored in the SPAM/NOTSPAM-collection. As all fields marked by * this field accepts a list separated by | or a specified file \'file:/etc/assp/redre.txt\' .','Basic'],
[SpamError,'Spam Error',80,textinput,'554 5.7.1 Mail appears to be unsolicited -- send error reports to postmaster@yourdomain.com','(5\d\d .*)',undef,
'SMTP error message to reject spam. For example:554 5.7.1 Mail appears to be unsolicited -- send error reports to postmaster@yourdomain.com'],
@@ -207,7 +203,7 @@
Valid entry types are as per spamlovers: full address, username only, or entire @domain.'],
[noProcessingIPs,'Unprocessed IPs*',60,textinput,'','(.*)',ConfigMakeRe,
'Mail from any of these IPs are ignored by ASSP.
-For example: 127.0.0.1|10.|169.254.|172.16.|192.168. As all fields marked by * this field accepts a list separated by | or a filename specified this way: \'file:files/ipnp.txt\' .'],
+For example: 127.0.0.1|10.|169.254.|172.16.|192.168. As all fields marked by * this field accepts a list separated by | or a filename specified this way: \'file:/etc/assp/ipnp.txt\' .'],
[npRe,'Expression to Identify No Processing Mail*',60,textinput,'','(.*)',ConfigCompileRe,
'If an email header matches this Perl regular expression it will pass
through unprocessed. For example: 169\.254\.122\.|172\.16\.|\\[autoreply\\].'],
@@ -228,9 +224,9 @@
For example: Secret Ham Password|307\D{0,3}730\D{0,3}4[12]\d\d
For help writing regular expressions click here.
Note that flags are "si" and the header as well as body is scanned.
- Some things you might include here are your office phone number or street address, spam rarely includes these details. As usual (marked by *) this field accepts a list separated by | or a filename specified this way: \'file:files/whitere.txt\' .','Basic'],
+ Some things you might include here are your office phone number or street address, spam rarely includes these details. As usual (marked by *) this field accepts a list separated by | or a filename specified this way: \'file:/etc/assp/whitere.txt\' .','Basic'],
[whiteListedIPs,'Whitelisted IPs*',60,textinput,'','(.*)',ConfigMakeRe,
- 'They contribute to the whitelist and to notspam. For example: 127.0.0.1|10.|169.254.|172.16.|192.168. As all fields marked by * this field accepts a list separated by | or a filename specified this way: \'file:files/ipwl.txt\' .'],
+ 'They contribute to the whitelist and to notspam. For example: 127.0.0.1|10.|169.254.|172.16.|192.168. As all fields marked by * this field accepts a list separated by | or a filename specified this way: \'file:/etc/assp/ipwl.txt\' .'],
[whiteListedDomains,'Whitelisted Domains*',60,textinput,'sourceforge.net','(.*)',ConfigMakeRe,
'Domains from which you want to receive all mail. Your ISP, domain registration, mail list servers, stock broker, or other key business partners might be good candidates. Note this matches the end of the address, so if you don\'t want to match subdomains then include the @. Note that buy.com would also match spambuy.com but .buy.com won\'t match buy.com. DO NOT put your local domains on this list. For example: sourceforge.net|@google.com|.buy.com','Basic'],
[ValidateRWL,'Enable Realtime Whitelist Validation',0,checkbox,0,'([01]?)',configUpdateRWL,
@@ -288,7 +284,7 @@
rel="external">NET::LDAP module in PERL.'],
[ispip,'ISP/Secondary MX Servers*',60,textinput,'','(\S*)',ConfigMakeRe,
'Enter any addresses that are your ISP or backup MX servers, separated by pipes (|).
- These addresses will (necessarily) bypass Griplist, IP Limiting, Delaying, Penalty Box, SPF, RBL & SRS checks. For example: 127.0.0.1|10. You can use here the same file which is used for delay-exceptions: \'file:files/nodelay.txt\'','Basic'],
+ These addresses will (necessarily) bypass Griplist, IP Limiting, Delaying, Penalty Box, SPF, RBL & SRS checks. For example: 127.0.0.1|10. You can use here the same file which is used for delay-exceptions: \'file:/etc/assp/nodelay.txt\'','Basic'],
[ispgreyvalue,'ISP/Secondary MX Grey Value',5,textinput,'0.5','(\S*)',undef,
'It is recommended that for ISP & Secondary MX servers to bypass their Griplist values
For eg. 0.5 (Completely GReyIP). If left blank then the Griplist "X" value is used.
@@ -400,9 +396,9 @@
"The White Box is always activated. The White Box works in a similar way for IPs as the Whitelist works for addresses - but it is not a whitelist: Bayesian check will be done. WhiteBox Entries will expire after this number of days. For example: 30"],
[exportExtremeFile,'Exported Black Box Extreme IPs *',40,textinput,'','(\S*)',undef,
- 'IP\'s in Black Box which surpassed the extreme level will be regularly stored to this file - if defined. It can be used, to fill safely the denysmtpfile over time. For example: file:files/exportextreme.txt'],
+ 'IP\'s in Black Box which surpassed the extreme level will be regularly stored to this file - if defined. It can be used, to fill safely the denysmtpfile over time. For example: file:/etc/assp/exportextreme.txt'],
[denySMTPConnectionsFrom,'Deny SMTP Connections from these IPs*',40,textinput,'','(\S*)',ConfigMakeRe,
-'Manually maintained list of IPs which should be denied access. For example: file:files/denysmtp.txt'],
+'Manually maintained list of IPs which should be denied access. For example: file:/etc/assp/denysmtp.txt'],
[DoNotPenalizeRed,'Do Not Penalize Redlisted Mails',0,checkbox,0,'([01]?)',undef,
'Mails matching Red Regex or Redlist will not be penalized.'],
[DoNotPenalizeBounces,'Do Not Penalize Bounced Mails',0,checkbox,1,'([01]?)',undef,
@@ -482,9 +478,9 @@
[DoInvalidPTR,'Reversed Lookup FQDN',1,textinput,0,'(.*)',undef,
'If activated - and Reversed Lookup is activated and found a record -, the PTR-FQDN record is checked against the Regex. This requires an installed Net::DNS module in PERL.
0 = deactivate, 1 = activate, 2 = log only, 3 = message-scoring .','Basic'],
-[invalidPTRRe,'Expression to Invalidate Format of PTR*',80,textinput,'file:files/invalidptr.txt','(.*)',ConfigCompileRe,
+[invalidPTRRe,'Expression to Invalidate Format of PTR*',80,textinput,'file:/etc/assp/invalidptr.txt','(.*)',ConfigCompileRe,
'Validate Format PTR will check PTR records for this.
- For example: ^\d+\.\d+\.\d+\.\d+$|^[^\.]+\.?$ or file:files/invalidptr.txt'],
+ For example: ^\d+\.\d+\.\d+\.\d+$|^[^\.]+\.?$ or file:/etc/assp/invalidptr.txt'],
[DoDomainCheck,'Validate Sender Domain MX/A',1,textinput,0,'(.*)',undef,
'If activated, each sender address is checked for a valid MX/A record.
This requires an installed Email::Valid module in PERL.
@@ -526,7 +522,7 @@
'Delete outdated entries from triplets and whitelisted tuplets databases every this many seconds.
Note: the current timeout must expire before the new setting is loaded, or you can restart.
Defaults to 1 hour.'],
-[noDelay,'Don\'t Delay these IPs*',60,textinput,'file:files/nodelay.txt','(.*)',ConfigMakeRe,
+[noDelay,'Don\'t Delay these IPs*',60,textinput,'file:/etc/assp/nodelay.txt','(.*)',ConfigMakeRe,
'Enter IP addresses that you don\'t want to be delayed, separated by pipes (|). There are misbehaving MTAs that will not be able to get a legitimate email through a Greylisting server because they do not try again later. An INCOMPLETE list of such mailers is available at cvs.puremagic.com/viewcvs/Greylisting/schema/whitelist_ip.txt.
When using mentioned list remember to add trailing dots in IP addresses which specify subnets (eg. 192.168 -> 192.168. ).
For example: 127.0.0.1|192.168.'],
@@ -638,7 +634,7 @@
0 = deactivate, 1 = activate, 2 = log only, 3 = message-scoring .','Basic'],
[URIBLServiceProvider,'URIBL Service Providers*',60,\&textinput,'multi.surbl.org','(.*)',configUpdateURIBLSP,
'Domain Names of URIBLs to use separated by "|". Default is: multi.surbl.org. You may separate this in multi.uribl.com|sc.surbl.org|ws.surbl.org|ob.surbl.org|ab.surbl.org|ph.surbl.org|jp.surbl.org and set and set the max hits to 2 for an affirmative'],
- [URIBLCCTLDS,'URIBL Country Code TLDs*',60,\&textinput,'file:files/URIBLCCTLDS.txt','(.*)',ConfigMakeRe,
+ [URIBLCCTLDS,'URIBL Country Code TLDs*',60,\&textinput,'file:/etc/assp/URIBLCCTLDS.txt','(.*)',ConfigMakeRe,
'List of country code TLDs used to determine the base domain of the uri.'],
[ValidateMaxURI,'Enable maximum number of URI domains check' ,1,textinput,'1','(.*)',undef,'
0 = deactivate, 1 = activate, 2 = log only, 3 = message-scoring .'],
@@ -751,7 +747,7 @@
[DoBombRe,'Use Bomb Regular Expression 
','1',textinput,0,'(\d*)',undef,
'If activated, each message is checked against the Bomb Regular Expression.
0 = deactivate, 1 = activate, 2 = log only, 3 = message-scoring .'],
-[bombRe,'Bomb Regular Expression*',80,textinput,'file:files/bombre.txt','(.*)',ConfigCompileRe,'Header and Data will be checked against the Regex. For example:
IMG [^>]*src=[\'"]cid|]*>(<[^>]+>|\n|\r)*]+>(<[^>]+>|\n|\r)*'],
+[bombRe,'Bomb Regular Expression*',80,textinput,'file:/etc/assp/bombre.txt','(.*)',ConfigCompileRe,'Header and Data will be checked against the Regex. For example: