network/cyrus-imapd: Updated for version 2.4.17.

(changed download location because upstream plays
hide-and-seek with the sources  --ponce)

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

4 files changed, 17 insertions, 20 deletions

diff --git a/network/cyrus-imapd/README.SLACKWARE b/network/cyrus-imapd/README.SLACKWARE
index 7772378a26..7fadb01925 100644
--- a/network/cyrus-imapd/README.SLACKWARE
+++ b/network/cyrus-imapd/README.SLACKWARE
@@ -8,7 +8,7 @@ a specific directory structure, you can do something like this:
 Afterwards run mkimap script to setup the enviroment:
 
 # su - cyrus
-# /usr/doc/cyrus-imapd-2.4.12/tools/mkimap
+# /usr/doc/cyrus-imapd-2.4.17/tools/mkimap
 
 You will probably also want to put this into rc.local:
 
diff --git a/network/cyrus-imapd/cyrus-imapd.SlackBuild b/network/cyrus-imapd/cyrus-imapd.SlackBuild
index ef1ff30876..6579042342 100644
--- a/network/cyrus-imapd/cyrus-imapd.SlackBuild
+++ b/network/cyrus-imapd/cyrus-imapd.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cyrus-imapd
-VERSION=${VERSION:-2.4.12}
+VERSION=${VERSION:-2.4.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -92,7 +92,7 @@ find . \
 if [ "$PATCHES" = yes ]; then
 # Patches for autocreate/autosieve
   patch -p1 <$CWD/patches/cyrus-imapd-2.4.4-autocreate-0.10-0-sv1.patch
-  patch -p1 <$CWD/patches/cyrus-imapd-2.4.4-autosieve-0.6.0-sv1.patch
+  patch -p1 <$CWD/patches/cyrus-imapd-2.4.12-autosieve-0.6.0.patch
 fi
 
 CFLAGS="$SLKCFLAGS" \
@@ -111,6 +111,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-bdb-incdir=/usr/include/db4 \
   --with-cyrus-user=cyrus \
   --with-cyrus-group=cyrus \
+  --enable-idled \
   --build=$ARCH-slackware-linux \
   $DATABASE
 
diff --git a/network/cyrus-imapd/cyrus-imapd.info b/network/cyrus-imapd/cyrus-imapd.info
index 9f6b41703c..92e6db8cfe 100644
--- a/network/cyrus-imapd/cyrus-imapd.info
+++ b/network/cyrus-imapd/cyrus-imapd.info
@@ -1,8 +1,8 @@
 PRGNAM="cyrus-imapd"
-VERSION="2.4.12"
+VERSION="2.4.17"
 HOMEPAGE="http://www.cyrusimap.org/"
-DOWNLOAD="http://cyrusimap.org/releases/cyrus-imapd-2.4.12.tar.gz"
-MD5SUM="80f27401490a3dc9e422884ceee6ecf6"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/cyrus-imapd-2.4.17.tar.gz"
+MD5SUM="c1747c6252587535d3d27f71eca8bd44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/cyrus-imapd/patches/cyrus-imapd-2.4.4-autosieve-0.6.0-sv1.patch b/network/cyrus-imapd/patches/cyrus-imapd-2.4.12-autosieve-0.6.0.patch
index 6168d224a3..d3526669fc 100644
--- a/network/cyrus-imapd/patches/cyrus-imapd-2.4.4-autosieve-0.6.0-sv1.patch
+++ b/network/cyrus-imapd/patches/cyrus-imapd-2.4.12-autosieve-0.6.0.patch
@@ -1,7 +1,5 @@
-# Added md->date in deliver_mailbox function for Cyrus 2.4.12 by mario@slackverse.org, 2011
-diff -Naur cyrus-imapd-2.4.4.orig/README.autosievefolder cyrus-imapd-2.4.4/README.autosievefolder
---- cyrus-imapd-2.4.4.orig/README.autosievefolder	1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-imapd-2.4.4/README.autosievefolder	2010-11-15 10:40:56.299163485 +0100
+--- cyrus-imapd-2.4.12.orig/README.autosievefolder	1970-01-01 01:00:00.000000000 +0100
++++ cyrus-imapd-2.4.12/README.autosievefolder	2011-10-31 10:07:44.890693235 +0100
 @@ -0,0 +1,43 @@
 +Cyrus IMAP autosievefolder patch
 +----------------------------------
@@ -46,9 +44,8 @@ diff -Naur cyrus-imapd-2.4.4.orig/README.autosievefolder cyrus-imapd-2.4.4/READM
 +
 +For more information and updates please visit http://email.uoa.gr/projects/cyrus/autosievefolder
 +
-diff -Naur cyrus-imapd-2.4.4.orig/imap/lmtp_sieve.c cyrus-imapd-2.4.4/imap/lmtp_sieve.c
---- cyrus-imapd-2.4.4.orig/imap/lmtp_sieve.c	2010-11-11 23:15:33.000000000 +0100
-+++ cyrus-imapd-2.4.4/imap/lmtp_sieve.c	2010-11-15 10:40:13.127210740 +0100
+--- cyrus-imapd-2.4.12.orig/imap/lmtp_sieve.c	2011-10-31 10:07:03.922690650 +0100
++++ cyrus-imapd-2.4.12/imap/lmtp_sieve.c	2011-10-31 10:08:36.752691723 +0100
 @@ -88,6 +88,9 @@
      struct auth_state *authstate;
  } script_data_t;
@@ -59,9 +56,9 @@ diff -Naur cyrus-imapd-2.4.4.orig/imap/lmtp_sieve.c cyrus-imapd-2.4.4/imap/lmtp_
  static char *make_sieve_db(const char *user)
  {
      static char buf[MAX_MAILBOX_PATH+1];
-@@ -496,7 +499,20 @@
+@@ -503,7 +506,20 @@
  			      sd->username, mdata->notifyheader,
- 			      namebuf, quotaoverride, 0);
+ 			      namebuf, md->date, quotaoverride, 0);
      }
 -
 +    
@@ -81,7 +78,7 @@ diff -Naur cyrus-imapd-2.4.4.orig/imap/lmtp_sieve.c cyrus-imapd-2.4.4/imap/lmtp_
      if (!ret) {
  	snmp_increment(SIEVE_FILEINTO, 1);
  	return SIEVE_OK;
-@@ -947,3 +963,80 @@
+@@ -973,3 +989,80 @@
         we'll do normal delivery */
      return r;
  }
@@ -162,10 +159,9 @@ diff -Naur cyrus-imapd-2.4.4.orig/imap/lmtp_sieve.c cyrus-imapd-2.4.4/imap/lmtp_
 +        return IMAP_MAILBOX_NONEXISTENT;
 +}
 +
-diff -Naur cyrus-imapd-2.4.4.orig/lib/imapoptions cyrus-imapd-2.4.4/lib/imapoptions
---- cyrus-imapd-2.4.4.orig/lib/imapoptions	2010-11-11 23:15:33.000000000 +0100
-+++ cyrus-imapd-2.4.4/lib/imapoptions	2010-11-15 10:40:13.129220481 +0100
-@@ -1096,6 +1096,15 @@
+--- cyrus-imapd-2.4.12.orig/lib/imapoptions	2011-10-31 10:07:03.969690694 +0100
++++ cyrus-imapd-2.4.12/lib/imapoptions	2011-10-31 10:13:23.876700183 +0100
+@@ -1145,6 +1145,15 @@
  /* If enabled, lmtpd will look for Sieve scripts in user's home
     directories: ~user/.sieve. */