network/dovecot: Updated for version 1.0.3

3 files changed, 24 insertions, 11 deletions

diff --git a/network/dovecot/dovecot.SlackBuild b/network/dovecot/dovecot.SlackBuild
index 229e5e6b80..175913b591 100644
--- a/network/dovecot/dovecot.SlackBuild
+++ b/network/dovecot/dovecot.SlackBuild
@@ -22,16 +22,17 @@
 set -e
 
 PRGNAM="dovecot"
-VERSION="1.0.0"
+VERSION="1.0.3"
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-CWD=$(pwd)
+CWD=`pwd`
 TMP=${TMP:-/tmp/SBo}
 PKG="$TMP/pkg-$PRGNAM"
 OUTPUT=${OUTPUT:-/tmp}
 
+
 # Bail if user isn't valid on your system
 if ! grep ^dovecot: /etc/passwd 2>&1 > /dev/null; then
   echo "  Must have a dovecot user to run this script."
@@ -55,14 +56,16 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
 
-chown -R root:root $PRGNAM-$VERSION
 chmod -R a-s,u+w,go+r-w $PRGNAM-$VERSION
+chown -R root:root $PRGNAM-$VERSION
 
 cd $PRGNAM-$VERSION
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-notify=inotify \
   --disable-ipv6 \
   --without-pam \
   --with-pop3d
@@ -71,10 +74,15 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/install $PKG/usr/doc/$PRGNAM-$VERSION $PKG/etc/rc.d
-cp -a AUTHORS COPYING COPYING.LGPL COPYING.MIT ChangeLog INSTALL NEWS README \
-  TODO doc/* $PKG/usr/doc/$PRGNAM-$VERSION/
+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
 
+# Make sure that the docs have the right ownership and permissions.  If
+# built by a mortal user, these permissions will be wrong.
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+chmod -R ug+rw,o-w $PKG/usr/doc/$PRGNAM-$VERSION
+
 # Dovecot installs these, but we already copied them above, so bye bye
 rm -rf $PKG/usr/share/doc
 
@@ -87,6 +95,11 @@ install -m 0644 $CWD/rc.dovecot $PKG/etc/rc.d/rc.dovecot
 
 # Let's not kill the existing config file (even if it is just an example)
 mv $PKG/etc/dovecot-example.conf $PKG/etc/dovecot-example.conf.new
+# Put the other example files in /usr/doc for the user to consider later.
+mv $PKG/etc/dovecot-ldap-example.conf \
+   $PKG/usr/doc/$PRGNAM-$VERSION/dovecot-ldap-example.conf
+mv $PKG/etc/dovecot-sql-example.conf \
+   $PKG/usr/doc/$PRGNAM-$VERSION/dovecot-sql-example.conf
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/network/dovecot/dovecot.info b/network/dovecot/dovecot.info
index bd4f2cc14a..6a3270a3b5 100644
--- a/network/dovecot/dovecot.info
+++ b/network/dovecot/dovecot.info
@@ -1,8 +1,8 @@
 PRGNAM="dovecot"
-VERSION="1.0.0"
+VERSION="1.0.3"
 HOMEPAGE="http://www.dovecot.org/"
-DOWNLOAD="http://www.dovecot.org/releases/dovecot-1.0.0.tar.gz"
-MD5SUM="65ccc71e66c495c536d8fb8a7ae39bb3"
+DOWNLOAD="http://dovecot.org/releases/1.0/dovecot-1.0.3.tar.gz"
+MD5SUM="1d7cc3c4964789554553e7e4ea3f82b4"
 MAINTAINER="Alan Hicks"
 EMAIL="alan@lizella.net"
-APPROVED="rworkman"
+APPROVED="Alan Hicks,rworkman"
diff --git a/network/dovecot/slack-desc b/network/dovecot/slack-desc
index 85adf94125..06a1198db7 100644
--- a/network/dovecot/slack-desc
+++ b/network/dovecot/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler-----------------------------------------------------|
+dovecot: Dovecot (open source IMAP and POP3 server)
+dovecot:
 dovecot: Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like
 dovecot: systems, written with security primarily in mind. Although it's
 dovecot: written in C, it uses several coding techniques to avoid most of the
 dovecot: common pitfalls.
-dovecot:
 dovecot: Dovecot can work with standard mbox and Maildir formats and it's
 dovecot: fully compatible with UW-IMAP and Courier IMAP servers'
 dovecot: implementation of them, as well as mail clients accessing the
 dovecot: mailboxes directly
-dovecot:
 dovecot: Packaged by Alan Hicks <alan@lizella.net>