diff --git a/.portsignore b/.portsignore index eeb15bd8eb7e..753140c5cb53 100644 --- a/.portsignore +++ b/.portsignore @@ -3892,6 +3892,7 @@ mail/sendmail-devel mail/sendok mail/serialmail mail/simscan +mail/squirrelmail-avelsieve-plugin mail/squirrelmail-change_sqlpass-plugin mail/squirrelmail-check_quota-plugin mail/squirrelmail-email_footer-plugin diff --git a/mail/Makefile b/mail/Makefile index 7f7386333c99..17951c16c1cb 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -604,7 +604,6 @@ SUBDIR += squirrelmail SUBDIR += squirrelmail-abook_import_export-plugin SUBDIR += squirrelmail-askuserinfo-plugin - SUBDIR += squirrelmail-avelsieve-plugin SUBDIR += squirrelmail-calendar_file_backend-plugin SUBDIR += squirrelmail-change_ldappass-plugin SUBDIR += squirrelmail-compatibility-plugin diff --git a/mail/squirrelmail-avelsieve-plugin/Makefile b/mail/squirrelmail-avelsieve-plugin/Makefile deleted file mode 100644 index 60c98a8d61ca..000000000000 --- a/mail/squirrelmail-avelsieve-plugin/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -PORTNAME= avelsieve -PORTVERSION= 1.9.9 -CATEGORIES= mail www - -MAINTAINER= ports@FreeBSD.org -COMMENT= SquirrelMail plugin for Server-Side Mail Filtering management -WWW= https://www.squirrelmail.org - -pre-install: - ${RM} -R ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/po - ${FIND} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} -type f \ - \( -name '.cvsignore' -o -name '*.bak' -o -name '*.orig' \) -exec ${RM} {} \; - -.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk" -.include diff --git a/mail/squirrelmail-avelsieve-plugin/distinfo b/mail/squirrelmail-avelsieve-plugin/distinfo deleted file mode 100644 index 56cf8c73f9f5..000000000000 --- a/mail/squirrelmail-avelsieve-plugin/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 58ff38bc575b..000000000000 --- a/mail/squirrelmail-avelsieve-plugin/files/patch-avelsieve__include__managesieve.lib.php +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 -+ * after AUTHENTICATE under a TLS encrypted session. We ignore capability -+ * strings for each SASL mechanism. -+ */ -+ function ignore_capabilities() -+ { -+ if ($this->capabilities['starttls']) do { -+ $line = fgets($this->fp, 1024); -+ } while (strncmp($line, 'OK', 2)); -+ } -+ - /** - * Perform SASL authentication to SIEVE server. - * -@@ -729,6 +743,7 @@ class sieve { - - $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); -@@ -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/files/pkg-message.in b/mail/squirrelmail-avelsieve-plugin/files/pkg-message.in deleted file mode 100644 index 56a6fbb1587e..000000000000 --- a/mail/squirrelmail-avelsieve-plugin/files/pkg-message.in +++ /dev/null @@ -1,10 +0,0 @@ -[ -{ type: install - message: <