mail/squirrelmail-avelsieve-plugin: Update to 1.9.9

PR:		207775

4 files changed, 149 insertions, 49 deletions

diff --git a/mail/squirrelmail-avelsieve-plugin/Makefile b/mail/squirrelmail-avelsieve-plugin/Makefile
index 9666b477fed2..237fb4ea0c89 100644
--- a/mail/squirrelmail-avelsieve-plugin/Makefile
+++ b/mail/squirrelmail-avelsieve-plugin/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	avelsieve
-PORTVERSION=	1.9.7
-PORTREVISION=	4
+PORTVERSION=	1.9.9
 CATEGORIES=	mail www
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/squirrelmail-avelsieve-plugin/distinfo b/mail/squirrelmail-avelsieve-plugin/distinfo
index 7366e029b37a..56cf8c73f9f5 100644
--- a/mail/squirrelmail-avelsieve-plugin/distinfo
+++ b/mail/squirrelmail-avelsieve-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (squirrelmail/avelsieve-1.9.7.tar.gz) = ee40d391d1098788fb0df467144cd39f57596792511fa427ceecf82eff732657
-SIZE (squirrelmail/avelsieve-1.9.7.tar.gz) = 318089
+SHA256 (squirrelmail/avelsieve-1.9.9.tar.gz) = 15881185a6e7c2f27261e10182ec3ad9872ffc835adf527ea0325ae0fe4e3c8c
+SIZE (squirrelmail/avelsieve-1.9.9.tar.gz) = 467180
diff --git a/mail/squirrelmail-avelsieve-plugin/files/patch-avelsieve__include__managesieve.lib.php b/mail/squirrelmail-avelsieve-plugin/files/patch-avelsieve__include__managesieve.lib.php
index e3d925b8b4f0..58ff38bc575b 100644
--- a/mail/squirrelmail-avelsieve-plugin/files/patch-avelsieve__include__managesieve.lib.php
+++ b/mail/squirrelmail-avelsieve-plugin/files/patch-avelsieve__include__managesieve.lib.php
@@ -1,9 +1,10 @@
---- avelsieve/include/managesieve.lib.php.orig	2006-07-24 14:48:27.000000000 +0100
-+++ avelsieve/include/managesieve.lib.php	2009-03-26 20:36:33.000000000 +0000
-@@ -686,6 +686,20 @@
+--- avelsieve/include/managesieve.lib.php.orig	2016-03-17 16:47:45 UTC
++++ avelsieve/include/managesieve.lib.php
+@@ -713,6 +713,20 @@ class sieve {
+           return true;
    }
  
-   /**
++   /**
 +   * Neil Darlow - 2009/03/26
 +   * Changes to Sieve servers to be compliant with draft-managesieve-09.txt
 +   * break authenticate() which cannot handle the capability strings received
@@ -17,39 +18,38 @@
 +    } while (strncmp($line, 'OK', 2));
 +  }
 +
-+  /**
+   /**
     * Perform SASL authentication to SIEVE server.
     *
-    * Attempts to authenticate to SIEVE, using some SASL authentication method
-@@ -701,6 +715,7 @@
+@@ -729,6 +743,7 @@ class sieve {
     
-             $this->len=strlen($auth);			
+             $this->len=strlen($auth);            
              fputs($this->fp, 'AUTHENTICATE "PLAIN" {' . $this->len . '+}' . "\r\n");
 +            $this->ignore_capabilities();
              fputs($this->fp, "$auth\r\n");
  
-             $this->line=fgets($this->fp,1024);		
-@@ -717,6 +732,7 @@
- 	     // SASL DIGEST-MD5 support works with timsieved 1.1.0
- 	     // follows rfc2831 for generating the $response to $challenge
- 	     fputs($this->fp, "AUTHENTICATE \"DIGEST-MD5\"\r\n");
-+ 	     $this->ignore_capabilities();
- 	     // $clen is length of server challenge, we ignore it. 
- 	     $clen = fgets($this->fp, 1024);
- 	     // read for 2048, rfc2831 max length allowed
-@@ -768,6 +784,7 @@
- 	     // CRAM-MD5 does not support proxy of $auth by $user
- 	     // requires php mhash extension
- 	     fputs($this->fp, "AUTHENTICATE \"CRAM-MD5\"\r\n");
-+	     $this->ignore_capabilities();
- 	     // $clen is the length of the challenge line the server gives us
- 	     $clen = fgets($this->fp, 1024);
- 	     // read for 1024, should be long enough?
-@@ -793,6 +810,7 @@
-  	     $pass=base64_encode($this->pass);
-  	
-  	     fputs($this->fp, "AUTHENTICATE \"LOGIN\"\r\n");
-+ 	     $this->ignore_capabilities();
-  	     fputs($this->fp, "{".strlen($login)."+}\r\n");
-  	     fputs($this->fp, "$login\r\n");
-  	     fputs($this->fp, "{".strlen($pass)."+}\r\n");
+             $this->line=fgets($this->fp,1024);        
+@@ -745,6 +760,7 @@ class sieve {
+          // SASL DIGEST-MD5 support works with timsieved 1.1.0
+          // follows rfc2831 for generating the $response to $challenge
+          fputs($this->fp, "AUTHENTICATE \"DIGEST-MD5\"\r\n");
++         $this->ignore_capabilities();
+          // $clen is length of server challenge, we ignore it. 
+          $clen = fgets($this->fp, 1024);
+          // read for 2048, rfc2831 max length allowed
+@@ -796,6 +812,7 @@ class sieve {
+          // CRAM-MD5 does not support proxy of $auth by $user
+          // requires php mhash extension
+          fputs($this->fp, "AUTHENTICATE \"CRAM-MD5\"\r\n");
++         $this->ignore_capabilities();
+          // $clen is the length of the challenge line the server gives us
+          $clen = fgets($this->fp, 1024);
+          // read for 1024, should be long enough?
+@@ -821,6 +838,7 @@ class sieve {
+           $pass=base64_encode($this->pass);
+      
+           fputs($this->fp, "AUTHENTICATE \"LOGIN\"\r\n");
++          $this->ignore_capabilities();
+           fputs($this->fp, "{".strlen($login)."+}\r\n");
+           fputs($this->fp, "$login\r\n");
+           fputs($this->fp, "{".strlen($pass)."+}\r\n");
diff --git a/mail/squirrelmail-avelsieve-plugin/pkg-plist b/mail/squirrelmail-avelsieve-plugin/pkg-plist
index 3befe796f202..e921a3fc814c 100644
--- a/mail/squirrelmail-avelsieve-plugin/pkg-plist
+++ b/mail/squirrelmail-avelsieve-plugin/pkg-plist
@@ -1,4 +1,116 @@
 @unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/ajax_handler.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config/rule.10.default.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config/rule.11.default.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config/rule.12.default.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config/rule.13.default.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/doc/FAQ
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/doc/NOTES
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/calendar.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/clock.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/external_link.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/famfamfam/del.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/famfamfam/down.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/famfamfam/edit.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/famfamfam/up.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/accept.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/add.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/application_form_add.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/arrow_divide.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/arrow_down.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/arrow_refresh.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/arrow_right.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/arrow_undo.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/arrow_up.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/asterisk_orange.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/asterisk_yellow.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/bin.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/cancel.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/connect.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/cross.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/delete.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/disconnect.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/disk.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/email.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/email_add.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/email_attach.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/email_delete.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/email_edit.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/email_error.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/email_go.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/email_link.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/email_open.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/email_open_image.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/error.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/exclamation.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/folder.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/folder_add.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/folder_go.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/help.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/information.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/lightbulb.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/page_copy.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/script.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/script_add.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/script_code.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/script_code_red.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/script_delete.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/script_edit.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/script_error.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/script_go.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/script_save.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/status_away.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/stop.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/tag_blue.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/tag_blue_add.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/tag_blue_delete.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/tag_blue_edit.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/textfield.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/textfield_add.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/textfield_delete.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/icons/tick.png
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/opentriangle.gif
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/images/triangle.gif
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_disabled.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_discard.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_fileinto.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_imapflags.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_junk.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_keep.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_keepdeleted.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_notify.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_redirect.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_reject.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_stop.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_trash.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_action_vacation.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_condition.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/%%SQUIRREL_PLUGIN_NAME%%_condition_datetime.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/configtest.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/DO_Sieve_LdapSieve.class.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/html_ruleedit.10.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/html_ruleedit.11.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/html_ruleedit.12.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/html_ruleedit.13.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/junkmail.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/right_main.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/sieve_buildrule.10.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/sieve_buildrule.11.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/sieve_buildrule.12.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/sieve_buildrule.13.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/sieve_conditions.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/sieve_rule_spam.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/include/styles.inc.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/javascripts/%%SQUIRREL_PLUGIN_NAME%%_common.js
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/javascripts/%%SQUIRREL_PLUGIN_NAME%%_edit.js
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/javascripts/%%SQUIRREL_PLUGIN_NAME%%_table.js
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/javascripts/datepicker.js
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/javascripts/prototype-base-extensions.js
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/javascripts/prototype-date-extensions.js
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/locale/el_GR/LC_MESSAGES/%%SQUIRREL_PLUGIN_NAME%%_rule_11.mo
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/locale/el_GR/LC_MESSAGES/%%SQUIRREL_PLUGIN_NAME%%_rule_11.po
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/styles/datepicker.css
 %%SQUIRRELDIR%%/plugins/avelsieve/locale/zh_CN/LC_MESSAGES/avelsieve.po
 %%SQUIRRELDIR%%/plugins/avelsieve/locale/zh_CN/LC_MESSAGES/avelsieve.mo
 %%SQUIRRELDIR%%/plugins/avelsieve/locale/ru_RU/LC_MESSAGES/avelsieve.po
@@ -43,7 +155,6 @@
 %%SQUIRRELDIR%%/plugins/avelsieve/include/sieve_actions.inc.php
 %%SQUIRRELDIR%%/plugins/avelsieve/include/sieve.inc.php
 %%SQUIRRELDIR%%/plugins/avelsieve/include/search_integration.inc.php
-%%SQUIRRELDIR%%/plugins/avelsieve/include/process_user_input.inc.php
 %%SQUIRRELDIR%%/plugins/avelsieve/include/message_commands.inc.php
 %%SQUIRRELDIR%%/plugins/avelsieve/include/managesieve_wrapper.inc.php
 %%SQUIRRELDIR%%/plugins/avelsieve/include/managesieve.lib.php
@@ -54,7 +165,6 @@
 %%SQUIRRELDIR%%/plugins/avelsieve/include/dumpr.php
 %%SQUIRRELDIR%%/plugins/avelsieve/include/constants.inc.php
 %%SQUIRRELDIR%%/plugins/avelsieve/include/DO_Sieve_Skeleton.class.php
-%%SQUIRRELDIR%%/plugins/avelsieve/include/DO_Sieve_PearManageSieve.class.php
 %%SQUIRRELDIR%%/plugins/avelsieve/include/DO_Sieve_ManageSieve.class.php
 %%SQUIRRELDIR%%/plugins/avelsieve/include/DO_Sieve_File.class.php
 %%SQUIRRELDIR%%/plugins/avelsieve/include/DO_Sieve.class.php
@@ -99,15 +209,8 @@
 %%SQUIRRELDIR%%/plugins/avelsieve/images/bluecurve_16x16/bottom.gif
 %%SQUIRRELDIR%%/plugins/avelsieve/images/add.png
 %%SQUIRRELDIR%%/plugins/avelsieve/doc/style/avelsieve_meta.css
-%%SQUIRRELDIR%%/plugins/avelsieve/doc/notes.html
-%%SQUIRRELDIR%%/plugins/avelsieve/doc/highlight_spam.patch
-%%SQUIRRELDIR%%/plugins/avelsieve/doc/avelsieve_translation_statistics.html
-%%SQUIRRELDIR%%/plugins/avelsieve/doc/TODO.html
-%%SQUIRRELDIR%%/plugins/avelsieve/doc/TODO
 %%SQUIRRELDIR%%/plugins/avelsieve/doc/REPORTING_BUGS.html
 %%SQUIRRELDIR%%/plugins/avelsieve/doc/REPORTING_BUGS
-%%SQUIRRELDIR%%/plugins/avelsieve/doc/RELEASE-NOTES.html
-%%SQUIRRELDIR%%/plugins/avelsieve/doc/RELEASE-NOTES
 %%SQUIRRELDIR%%/plugins/avelsieve/doc/README.html
 %%SQUIRRELDIR%%/plugins/avelsieve/doc/README-FIRST.BETA
 %%SQUIRRELDIR%%/plugins/avelsieve/doc/README
@@ -121,11 +224,9 @@
 %%SQUIRRELDIR%%/plugins/avelsieve/version
 %%SQUIRRELDIR%%/plugins/avelsieve/table.php
 %%SQUIRRELDIR%%/plugins/avelsieve/setup.php
-%%SQUIRRELDIR%%/plugins/avelsieve/manage_scripts.php
 %%SQUIRRELDIR%%/plugins/avelsieve/index.php
 %%SQUIRRELDIR%%/plugins/avelsieve/edit.php
-%%SQUIRRELDIR%%/plugins/avelsieve/addspamrule.php
 %%SQUIRRELDIR%%/plugins/avelsieve/addrule.php
 @dir %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/lib
-@dir %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/locale/nn_NO/LC_MESSAGES
+@dir %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/locale/no_NO/LC_MESSAGES
 @exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi