libraries/libvmime-zarafa: Updated for version 0.9.1_p20110328.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

7 files changed, 81 insertions, 86 deletions

diff --git a/libraries/libvmime-zarafa/README b/libraries/libvmime-zarafa/README
index c4720ffc96..3431afcfc0 100644
--- a/libraries/libvmime-zarafa/README
+++ b/libraries/libvmime-zarafa/README
@@ -1,4 +1,6 @@
 VMime is a free mail library for C++, an open-source solution for working 
 with MIME messages and Internet messaging services like IMAP, POP or SMTP.
 
-This script builds a specially patched version of libvmime-0.7.1 for zarafa.
+This script builds a specially patched version of libvmime for zarafa.
+
+This requires libgsasl.
diff --git a/libraries/libvmime-zarafa/libvmime-zarafa.SlackBuild b/libraries/libvmime-zarafa/libvmime-zarafa.SlackBuild
index f899a96e7b..3080456b97 100644
--- a/libraries/libvmime-zarafa/libvmime-zarafa.SlackBuild
+++ b/libraries/libvmime-zarafa/libvmime-zarafa.SlackBuild
@@ -4,12 +4,31 @@
 # a library for working with MIME messages
 # (with patches from zarafa)
 
-# Written by Niels Horn <niels.horn@gmail.com>
-# revision date 2011/03/09
+# Copyright 2009-2011  Niels Horn, Rio de Janeiro, RJ, Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# revision date 2011/09/16
 
 PRGNAM=libvmime-zarafa
-VERSION=${VERSION:-0.7.1_p20100503}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9.1_p20110328}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -53,23 +72,24 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 # Apply zarafa patches in order of release-date
-mkdir zarafa-patches
-cd zarafa-patches
-tar xvf $CWD/zarafa-vmime-patches.tar.gz
-cd ..
-for patch in $(ls -1rt zarafa-patches/vmime*.diff); do
-  patch -p1 < $patch
+patches="\
+  0.8.1-charset-catch \
+  0.8.1-attachfnamelen \
+  0.8.1-header-value-on-next-line \
+  highchar-filename \
+  0.8.1-unicode-1-1-utf-7-charset \
+  fullname-without-email-address \
+  0.9.0-undisclosed-recipients \
+  0.9.2-infinite-loop \
+  flush-iconv"
+for patch in $patches; do
+  patch -p1 < $CWD/vmime-$patch.diff
 done
 
-# Patch "configure" so that it respects CFLAGS / CXXFLAGS
-patch -p1 < $CWD/patches/flags.patch
 # Patch "configure" & src/Makefile.in to rename the library to "libvmime-zarafa"
-patch -p1 < $CWD/patches/name.patch
-# Patch for newer gcc versions (based on tips from the Zarafa forum)
-patch -p1 < $CWD/patches/libvmime_signal.patch
+patch -p1 < $CWD/name.patch
 
-CFLAGS=$SLKCFLAGS \
-CXXFLAGS=$SLKCFLAGS \
+EXTRA_CFLAGS=$SLKCFLAGS \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/libraries/libvmime-zarafa/libvmime-zarafa.info b/libraries/libvmime-zarafa/libvmime-zarafa.info
index 4c33af919b..e1da6b6b39 100644
--- a/libraries/libvmime-zarafa/libvmime-zarafa.info
+++ b/libraries/libvmime-zarafa/libvmime-zarafa.info
@@ -1,10 +1,26 @@
 PRGNAM="libvmime-zarafa"
-VERSION="0.7.1_p20100503"
+VERSION="0.9.1_p20110328"
 HOMEPAGE="http://www.vmime.org/"
-DOWNLOAD="http://downloads.sourceforge.net/vmime/libvmime-0.7.1.tar.bz2 \
-          http://developer.zarafa.com/download/zarafa-vmime-patches.tar.gz"
-MD5SUM="81f06a771d2de01d5982635838eb5f6a \
-        a92aff3294829f9c270ea05929e619d1"
+DOWNLOAD="http://downloads.sourceforge.net/vmime/libvmime-0.9.1.tar.bz2 \
+          http://download.zarafa.com/community/final/7.0/7.0.1-28479/sourcecode/vmime-patches/vmime-0.8.1-attachfnamelen.diff \
+          http://download.zarafa.com/community/final/7.0/7.0.1-28479/sourcecode/vmime-patches/vmime-0.8.1-charset-catch.diff \
+          http://download.zarafa.com/community/final/7.0/7.0.1-28479/sourcecode/vmime-patches/vmime-0.8.1-header-value-on-next-line.diff \
+          http://download.zarafa.com/community/final/7.0/7.0.1-28479/sourcecode/vmime-patches/vmime-0.8.1-unicode-1-1-utf-7-charset.diff \
+          http://download.zarafa.com/community/final/7.0/7.0.1-28479/sourcecode/vmime-patches/vmime-0.9.0-undisclosed-recipients.diff \
+          http://download.zarafa.com/community/final/7.0/7.0.1-28479/sourcecode/vmime-patches/vmime-0.9.2-infinite-loop.diff \
+          http://download.zarafa.com/community/final/7.0/7.0.1-28479/sourcecode/vmime-patches/vmime-flush-iconv.diff \
+          http://download.zarafa.com/community/final/7.0/7.0.1-28479/sourcecode/vmime-patches/vmime-fullname-without-email-address.diff \
+          http://download.zarafa.com/community/final/7.0/7.0.1-28479/sourcecode/vmime-patches/vmime-highchar-filename.diff"
+MD5SUM="d5b6de44f7f9ca0e4cefe597d1905605 \
+        2850f22789405efefe2f28a276d9a2c2 \
+        4d542b58c57ebc57c315db9d4fef9648 \
+        7b6881e7e8d2d4ef7fe4ee95397fd9a7 \
+        4e3687cc1d5343e0b74a8b0ceedf976b \
+        e59e0c691223c3854f0d05bc05840af8 \
+        b98d90a6a3426011bf906cc05dd7764a \
+        d009c57b5bae2da1637e4fcc12d5402e \
+        793a367c4d4d3b76337b77ae0460f3fd \
+        5af720f59e0f3a332b2615957082fa48"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
diff --git a/libraries/libvmime-zarafa/name.patch b/libraries/libvmime-zarafa/name.patch
new file mode 100644
index 0000000000..fc82cf0b0b
--- /dev/null
+++ b/libraries/libvmime-zarafa/name.patch
@@ -0,0 +1,20 @@
+--- libvmime-0.7.1_orig/configure	2005-06-21 19:11:26.000000000 -0300
++++ libvmime-0.7.1/configure	2009-12-26 15:30:12.000000000 -0200
+@@ -1557,7 +1557,7 @@
+ GENERIC_VERSIONED_LIBRARY_NAME="vmime"
+ 
+ 
+-LIBRARY_NAME="libvmime"
++LIBRARY_NAME="libvmime-zarafa"
+ 
+ 
+ # Library version
+@@ -25237,7 +25237,7 @@
+ 
+ 
+ // Name of package
+-#define VMIME_PACKAGE \"libvmime\"
++#define VMIME_PACKAGE \"libvmime-zarafa\"
+ 
+ // Version number of package
+ #define VMIME_VERSION \"0.7.1\"
diff --git a/libraries/libvmime-zarafa/patches/flags.patch b/libraries/libvmime-zarafa/patches/flags.patch
deleted file mode 100644
index a7032f3792..0000000000
--- a/libraries/libvmime-zarafa/patches/flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libvmime-0.9.0_orig/configure	2008-10-19 10:36:19.000000000 -0200
-+++ libvmime-0.9.0/configure	2009-12-17 09:17:29.000000000 -0200
-@@ -32224,8 +32224,8 @@
- EXTRA_CFLAGS="$EXTRA_CFLAGS -D_REENTRANT=1 -D_THREAD_SAFE=1 $LIBGNUTLS_CFLAGS"
- EXTRA_LIBS="$GSASL_LIBS $LIBGNUTLS_LIBS"
- 
--CFLAGS=""
--CXXFLAGS=""
-+#CFLAGS=""
-+#CXXFLAGS=""
- 
- # -- Debug
- if test x$VMIME_DEBUG = x1 ; then
diff --git a/libraries/libvmime-zarafa/patches/libvmime_signal.patch b/libraries/libvmime-zarafa/patches/libvmime_signal.patch
deleted file mode 100644
index 1ddfabae87..0000000000
--- a/libraries/libvmime-zarafa/patches/libvmime_signal.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libvmime-0.7.1/vmime/platforms/posix/posixChildProcess.hpp	2005-05-25 16:14:54.000000000 -0300
-+++ libvmime-0.7.1_patched/vmime/platforms/posix/posixChildProcess.hpp	2011-03-09 01:09:18.000000000 -0300
-@@ -20,6 +20,7 @@
- #ifndef VMIME_PLATFORMS_POSIX_POSIXCHILDPROCESS_HPP_INCLUDED
- #define VMIME_PLATFORMS_POSIX_POSIXCHILDPROCESS_HPP_INCLUDED
- 
-+#include <signal.h>
- 
- #include "vmime/utility/childProcess.hpp"
- 
diff --git a/libraries/libvmime-zarafa/patches/name.patch b/libraries/libvmime-zarafa/patches/name.patch
deleted file mode 100644
index 4abeb0cb42..0000000000
--- a/libraries/libvmime-zarafa/patches/name.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libvmime-0.7.1_orig/configure	2005-06-21 19:11:26.000000000 -0300
-+++ libvmime-0.7.1/configure	2009-12-26 15:30:12.000000000 -0200
-@@ -1557,7 +1557,7 @@
- GENERIC_VERSIONED_LIBRARY_NAME="vmime"
- 
- 
--LIBRARY_NAME="libvmime"
-+LIBRARY_NAME="libvmime-zarafa"
- 
- 
- # Library version
-@@ -25237,7 +25237,7 @@
- 
- 
- // Name of package
--#define VMIME_PACKAGE \"libvmime\"
-+#define VMIME_PACKAGE \"libvmime-zarafa\"
- 
- // Version number of package
- #define VMIME_VERSION \"0.7.1\"
---- libvmime-0.7.1_orig/src/Makefile.in	2005-06-21 19:11:35.000000000 -0300
-+++ libvmime-0.7.1/src/Makefile.in	2009-12-26 17:57:50.000000000 -0200
-@@ -357,7 +357,7 @@
- AUTOMAKE_OPTIONS = no-dependencies foreign
- INTERNALS = 
- INCLUDES = -I$(top_srcdir) -I$(srcdir) @PKGCONFIG_CFLAGS@ @EXTRA_CFLAGS@
--lib_LTLIBRARIES = libvmime.la
-+lib_LTLIBRARIES = libvmime-zarafa.la
- libvmime_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
- libvmime_la_SOURCES = address.cpp \
- 	addressList.cpp \
-@@ -494,7 +494,7 @@
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
--libvmime.la: $(libvmime_la_OBJECTS) $(libvmime_la_DEPENDENCIES) 
-+libvmime-zarafa.la: $(libvmime_la_OBJECTS) $(libvmime_la_DEPENDENCIES) 
- 	$(CXXLINK) -rpath $(libdir) $(libvmime_la_LDFLAGS) $(libvmime_la_OBJECTS) $(libvmime_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile: