summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/dovecot/README10
-rw-r--r--network/dovecot/dovecot.SlackBuild28
-rw-r--r--network/dovecot/dovecot.info6
3 files changed, 34 insertions, 10 deletions
diff --git a/network/dovecot/README b/network/dovecot/README
index 8481c55139..52b3c6b69f 100644
--- a/network/dovecot/README
+++ b/network/dovecot/README
@@ -3,7 +3,15 @@ openssl installed - openssl-solibs is not enough in itself to meet this
requirement. Additionally, dovecot will be compiled with POP3 support.
Unfortunately, dovecot does not have a man page at this time, so you'll
have to find your documentation elsewhere. A few examples are included
-in /usr/doc/dovecot-1.1.3. The dovecot team maintains a wiki that may
+in /usr/doc/dovecot-$VERSION. The dovecot team operates a wiki that may
prove useful: http://wiki.dovecot.org
You should create a dovecot user to run the login processes on your server.
+
+From the dovecot-new release posting comes this word of advice:
+
+ Remember to read http://wiki2.dovecot.org/Upgrading/2.0 before
+ upgrading from v1.x. Although there is automatic config conversion,
+ it can't handle everything, so reserve some extra time for upgrading.
+
+
diff --git a/network/dovecot/dovecot.SlackBuild b/network/dovecot/dovecot.SlackBuild
index db6b75d042..51114504c0 100644
--- a/network/dovecot/dovecot.SlackBuild
+++ b/network/dovecot/dovecot.SlackBuild
@@ -21,7 +21,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM="dovecot"
-VERSION="1.1.15"
+VERSION="2.0.0"
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -40,6 +40,15 @@ TMP=${TMP:-/tmp/SBo}
PKG="$TMP/package-$PRGNAM"
OUTPUT=${OUTPUT:-/tmp}
+# Build with mysql database by default, sqlite/mysql/postgresql are supported
+DATABASE=${DATABASE:-mysql}
+case "$DATABASE" in
+ pgsql) DATABASE="--with-pgsql" ;;
+ mysql) DATABASE="--with-mysql" ;;
+ sqlite) DATABASE="--with-sqlite" ;;
+ *) DATABASE="" ;;
+esac
+
# Bail if user isn't valid on your system
if ! grep -q ^dovecot: /etc/passwd ; then
echo " You must have a dovecot user to run this script."
@@ -68,6 +77,7 @@ fi
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
+rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chmod -R a-s,u+w,go+r-w .
@@ -83,11 +93,11 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--enable-header-install \
--with-notify=inotify \
- --disable-ipv6 \
--without-pam \
--with-pop3d \
--disable-static \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux \
+ $DATABASE
make
make install-strip DESTDIR=$PKG
@@ -97,10 +107,16 @@ cp -a AUTHORS COPYING COPYING.LGPL COPYING.MIT ChangeLog INSTALL NEWS \
README TODO doc/* $PKG/usr/doc/$PRGNAM-$VERSION/
cat $CWD/dovecot.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/dovecot.SlackBuild
rm -rf $PKG/usr/share/doc
+find $PKG/usr/doc -type f \( -name "Makefile*" -o -name "*.in" \) -delete
+
+# Place a default conf file in /etc
+cat $PKG/usr/doc/dovecot-2.0.0/example-config/dovecot.conf > \
+ $PKG/etc/dovecot/dovecot.conf
-# Put the example files with the documentation
-mv $PKG/etc/dovecot-ldap-example.conf $PKG/etc/dovecot-sql-example.conf \
- $PKG/usr/doc/$PRGNAM-$VERSION
+# Handle man pages
+mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
# Add an init script
mkdir -p $PKG/etc/rc.d
diff --git a/network/dovecot/dovecot.info b/network/dovecot/dovecot.info
index c929c7bbb8..656be7a1ca 100644
--- a/network/dovecot/dovecot.info
+++ b/network/dovecot/dovecot.info
@@ -1,8 +1,8 @@
PRGNAM="dovecot"
-VERSION="1.1.15"
+VERSION="2.0.0"
HOMEPAGE="http://www.dovecot.org/"
-DOWNLOAD="http://dovecot.org/releases/1.1/dovecot-1.1.15.tar.gz"
-MD5SUM="90562401bbf6bd052b23b89f7f5a700f"
+DOWNLOAD="http://dovecot.org/releases/2.0/dovecot-2.0.0.tar.gz"
+MD5SUM="2ca3cbd523cac1cbd53a904255dcd4f8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Alan Hicks"