network/cyrus-imapd: Updated for version 3.2.4.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 32 insertions, 28 deletions

diff --git a/network/cyrus-imapd/README b/network/cyrus-imapd/README
index fbb307120b..e3eb218a72 100644
--- a/network/cyrus-imapd/README
+++ b/network/cyrus-imapd/README
@@ -1,15 +1,16 @@
-The Cyrus IMAP (Internet Message Access Protocol) server provides access to
-personal mail and system-wide bulletin boards through the IMAP protocol.
-The Cyrus IMAP server is a scalable enterprise mail system designed for use
-from small to large enterprise environments using standards-based
-technologies.
-
-A full Cyrus IMAP implementation allows a seamless mail and bulletin board
-environment to be set up across multiple servers. It differs from other IMAP
-server implementations in that it is run on "sealed" servers, where users
-are not normally permitted to log in. The mailbox database is stored in parts
-of the filesystem that are private to the Cyrus IMAP system. All user access
-to mail is through software using the IMAP, POP3, or KPOP protocols.
+The Cyrus IMAP (Internet Message Access Protocol) server provides access
+to personal mail and system-wide bulletin boards through the IMAP
+protocol.  The Cyrus IMAP server is a scalable enterprise mail system
+designed for use from small to large enterprise environments using
+standards-based technologies.
+
+A full Cyrus IMAP implementation allows a seamless mail and bulletin
+board environment to be set up across multiple servers. It differs from
+other IMAP server implementations in that it is run on "sealed" servers,
+where users are not normally permitted to log in. The mailbox database
+is stored in parts of the filesystem that are private to the Cyrus IMAP
+system. All user access to mail is through software using the IMAP,
+POP3, or KPOP protocols.
 
 The private mailbox database design gives the server large advantages in
 efficiency, scalability, and administratability. Multiple concurrent
@@ -18,15 +19,16 @@ supports access control lists on mailboxes and storage quotas on mailbox
 hierarchies.
 
 Cyrus is a highly scalable enterprise mail system designed for use in
-enterprise environments of various sizes using standards based technologies.
-Cyrus technologies scale from independent use in email departments to a system
-centrally managed in a large enterprise.
+enterprise environments of various sizes using standards based
+technologies.  Cyrus technologies scale from independent use in email
+departments to a system centrally managed in a large enterprise.
 
 For more information on how to install and run cyrus-imapd, see
-README.SLACKWARE that came with this package (which is also installed 
+README.SLACKWARE that came with this package (which is also installed
 with the documentation).
 
-Patches for autocreate and autosieve are no longer needed so they were removed.
+Patches for autocreate and autosieve are no longer needed so they were
+removed.
 
 Make sure to read the Upgrading to Cyrus IMAP 2.5.0 notes:
   https://cyrusimap.org/imap/release-notes/2.5/x/2.5.0.html
@@ -36,4 +38,3 @@ Something like this will create them:
   # groupadd -g 238 cyrus
   # useradd -d /var/imap -s /bin/sh -u 238 -g 238 cyrus
 See http://slackbuilds.org/uid_gid.txt for uid/gid suggestions.
-
diff --git a/network/cyrus-imapd/cyrus-imapd.SlackBuild b/network/cyrus-imapd/cyrus-imapd.SlackBuild
index 48e2c54e55..7a8a13e7ba 100644
--- a/network/cyrus-imapd/cyrus-imapd.SlackBuild
+++ b/network/cyrus-imapd/cyrus-imapd.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cyrus-imapd
-VERSION=${VERSION:-2.5.11}
+VERSION=${VERSION:-3.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -124,7 +124,8 @@ rm -rf $PKG/usr/share
 install -D -m0755 -oroot -groot $CWD/rc.cyrus-imapd $PKG/etc/rc.d/rc.cyrus-imapd.new
 
 # Install sample configuration
-install -D -m0640 -ocyrus -gcyrus master/conf/normal.conf $PKG/etc/cyrus.conf.new
+install -D -m0640 -ocyrus -gcyrus doc/examples/cyrus_conf/normal.conf \
+  $PKG/etc/cyrus.conf.new
 install -D -m0640 -ocyrus -gcyrus $CWD/imapd.conf $PKG/etc/imapd.conf.new
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -139,7 +140,9 @@ find $PKG -name perllocal.pod \
   | xargs rm -f
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README doc/* master/conf tools/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING README.md doc/* tools/ \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
diff --git a/network/cyrus-imapd/cyrus-imapd.info b/network/cyrus-imapd/cyrus-imapd.info
index 99b2c68075..1443c6b041 100644
--- a/network/cyrus-imapd/cyrus-imapd.info
+++ b/network/cyrus-imapd/cyrus-imapd.info
@@ -1,10 +1,10 @@
 PRGNAM="cyrus-imapd"
-VERSION="2.5.11"
+VERSION="3.2.4"
 HOMEPAGE="https://www.cyrusimap.org/"
-DOWNLOAD="ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.5.11.tar.gz"
-MD5SUM="674083444c36a786d9431b6612969224"
+DOWNLOAD="https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.2.4/cyrus-imapd-3.2.4.tar.gz"
+MD5SUM="e4a745ce615d6712e1b65bb13903807f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="jansson"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"