From 0acb724f4591bb649e161c88f8aee75a23dfb9e0 Mon Sep 17 00:00:00 2001
From: Rene Schuster <mail@reneschuster.de>
Date: Fri, 26 Feb 2016 11:14:40 +0100
Subject: [PATCH] SpamAssassin: Removed update SpamAssassin rules and keys.
 Will be done by the default SpamAssassin cronjob.

---
 incubator/SpamAssassin/CHANGELOG              |  1 +
 .../SpamAssassin/backend/SpamAssassin.pm      | 48 -------------------
 2 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/incubator/SpamAssassin/CHANGELOG b/incubator/SpamAssassin/CHANGELOG
index f6250eac..0f688b44 100644
--- a/incubator/SpamAssassin/CHANGELOG
+++ b/incubator/SpamAssassin/CHANGELOG
@@ -1,6 +1,7 @@
 SpamAssassin - ChangeLog
 ========================
 
+	Removed: Update SpamAssassin rules and keys. Will be done by the default SpamAssassin cronjob.
 	Added: 3rd party SpamAssassin rules from Heinlein Support
 	Added: Option to define networks which won't be scanned for SPAM
 	Added: Option to scan outgoing mails of SMTP authenticated senders
diff --git a/incubator/SpamAssassin/backend/SpamAssassin.pm b/incubator/SpamAssassin/backend/SpamAssassin.pm
index db0068c6..cca43b6c 100644
--- a/incubator/SpamAssassin/backend/SpamAssassin.pm
+++ b/incubator/SpamAssassin/backend/SpamAssassin.pm
@@ -86,9 +86,6 @@ sub change
 	my $rs = $self->_getSaDbPassword();
 	return $rs if $rs;
 
-	$rs = $self->_updateSpamassassinRules();
-	return $rs if $rs;
-
 	$rs = $self->_spamassassinRulesHeinleinSupport('add');
 	return $rs if $rs;
 	
@@ -374,51 +371,6 @@ sub _init
 	$self;
 }
 
-=item _updateSpamassassinRules()
-
- Update the SpamAssassin filter rules and keys
-
- Return int 0 on success, other on failure
-
-=cut
-
-sub _updateSpamassassinRules
-{
-	my $self = shift;
-
-	$self->{'config'}->{'spamassassinOptions'} =~ m/helper-home-dir=(\S*)/;
-	my $helperHomeDir = $1;
-
-	$self->{'config'}->{'spamassassinOptions'} =~ m/username=(\S*)/;
-	my $saUser = $1;
-
-	my $rs = execute(
-		"/bin/su $saUser -c '/usr/bin/sa-update --gpghomedir $helperHomeDir/sa-update-keys'", \my $stdout, \my $stderr
-	);
-	debug($stdout) if $stdout;
-	error($stderr) if $stderr && $rs >= 4;
-	return $rs if $rs >= 4;
-
-	if($self->{'config'}->{'heinlein-support_sa-rules'} eq 'yes') {
-		$rs = execute(
-			"/bin/su $saUser -c '/usr/bin/sa-update --nogpg --channel spamassassin.heinlein-support.de'", \$stdout, \$stderr
-		);
-		debug($stdout) if $stdout;
-		error($stderr) if $stderr && $rs >= 4;
-		return $rs if $rs >= 4;
-	}
-
-	$rs = execute("su $saUser -c '/usr/bin/sa-compile --quiet'", \$stdout, \$stderr);
-	debug($stdout) if $stdout;
-	error($stderr) if $stderr && $rs;
-	return $rs if $rs;
-
-	$rs = execute("chmod -R go-w,go+rX $helperHomeDir/compiled", \$stdout, \$stderr);
-	debug($stdout) if $stdout;
-	error($stderr) if $stderr && $rs;
-	$rs;
-}
-
 =item _discoverPyzor()
 
  Create Pyzor home folder and discover the servers