network/dovecot-pigeonhole: Updated for version 0.2.6.

  This version of dovecot-pigeohole would not build
  with the version of dovecot we host (2.0.12) so I
  added a patch that gets included if dovecot is
  less than 2.0.18.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

4 files changed, 48 insertions, 10 deletions

diff --git a/network/dovecot-pigeonhole/README b/network/dovecot-pigeonhole/README
index e736e8a5ed63..d23264a61181 100644
--- a/network/dovecot-pigeonhole/README
+++ b/network/dovecot-pigeonhole/README
@@ -2,6 +2,14 @@ Pigeonhole is the name of the project that adds support for
 the Sieve language (RFC 5228) and the ManageSieve protocol
 (RFC 5804) to the Dovecot Secure IMAP/POP3 Server.
 
+Sieve language specification and scripts provide mail filtering
+capabilities on the server side for individual users.  Each user
+can edit and upload (using ManageSieve) sieve scripts to filter
+mails based on supported Sieve language extensions by pigeonhole.
+
+Pigeonhole project provides Sieve support as a plugin to Dovecot's
+Local Delivery Agent (LDA).
+
 Requires: dovecot
 
 Configuration:
@@ -13,4 +21,3 @@ For additional configuration help, see:
 
 http://wiki2.dovecot.org/Pigeonhole/Sieve
 http://wiki2.dovecot.org/Pigeonhole/ManageSieve
-
diff --git a/network/dovecot-pigeonhole/dovecot-2.0.12.patch b/network/dovecot-pigeonhole/dovecot-2.0.12.patch
new file mode 100644
index 000000000000..34f7c3228b86
--- /dev/null
+++ b/network/dovecot-pigeonhole/dovecot-2.0.12.patch
@@ -0,0 +1,26 @@
+
+diff -r 8715c044a7ee -r 58fc2f01c432 src/managesieve-login/managesieve-proxy.c
+--- a/src/managesieve-login/managesieve-proxy.c	Sat Jan 07 16:29:23 2012 +0100
++++ b/src/managesieve-login/managesieve-proxy.c	Fri Feb 03 23:51:53 2012 +0100
+@@ -325,13 +325,13 @@
+ 
+ 			(void)client_skip_line(msieve_client);
+ 			client_proxy_finish_destroy_client(client);
+-			
++
+ 			return 1;
+-		} 
+-		
++		}
++
+ 		/* Login failed */
+ 
+-		if ( client->set->verbose_auth ) {
++		if ( client->set->auth_verbose ) {
+ 			const char *log_line = line;
+ 
+ 			if (strncasecmp(log_line, "NO ", 3) == 0)
+
+
+
+
diff --git a/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
index 707b0087aea5..548beb4538d7 100644
--- a/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
+++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for pigeonhole
 # Home Page: http://pigeonhole.dovecot.org/
 
-# Copyright (c) 2010-2011, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2010-2012, Nishant Limbachia, Hoffman Estates, IL, USA
 # <nishant _AT_ mnspace _DOT_ net>
 # All rights reserved.
 
@@ -25,13 +25,14 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-set -e
 
 PRGNAM="dovecot-pigeonhole"
-VERSION=${VERSION:-0.2.5}
+VERSION=${VERSION:-0.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM="dovecot-2.0-pigeonhole"
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -59,14 +60,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-SRCNAM="dovecot-2.0-pigeonhole"
+set -e
 
 rm -rf $TMP/$SRCNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $TMP/$SRCNAM-$VERSION
-
 chown -R root.root .
 find . \
 \( -perm 664 -o -perm 666 -o -perm 600 -o -perm 440 -o -perm 444 -o -perm 400 \) \
@@ -75,6 +75,11 @@ find . \
 \( -perm 777 -o -perm 755 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 -o -perm 500 \) \
 -exec chmod 755 {} \;
 
+# Patch to build with dovecot versions less than 2.0.18.
+if [[ $(dovecot --version) < '2.0.18' ]]; then
+  patch -p1 -R < $CWD/dovecot-2.0.12.patch
+fi
+
 CFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix=/usr \
diff --git a/network/dovecot-pigeonhole/dovecot-pigeonhole.info b/network/dovecot-pigeonhole/dovecot-pigeonhole.info
index 266177c43ec4..35de1fd46571 100644
--- a/network/dovecot-pigeonhole/dovecot-pigeonhole.info
+++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.info
@@ -1,10 +1,10 @@
 PRGNAM="dovecot-pigeonhole"
-VERSION="0.2.5"
+VERSION="0.2.6"
 HOMEPAGE="http://pigeonhole.dovecot.org/"
-DOWNLOAD="http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-pigeonhole-0.2.5.tar.gz"
-MD5SUM="f50151dd20eb5acbac2b546e586f2d43"
+DOWNLOAD="http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-pigeonhole-0.2.6.tar.gz"
+MD5SUM="be2aacc447b26e14eb90324116af70aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="Niels Horn,Erik Hanson"
+APPROVED="dsomero"