From 4f1af96d736c614673c752ae0dc42a9ee1214e2e Mon Sep 17 00:00:00 2001
From: Christoph Haas <christoph.haas@student.uibk.ac.at>
Date: Wed, 29 Apr 2015 13:38:02 -0700
Subject: [PATCH] Alias patch for ZCP 7.1.7

---
 alias_patch.diff | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/alias_patch.diff b/alias_patch.diff
index bfa65c4..a76a5c4 100644
--- a/alias_patch.diff
+++ b/alias_patch.diff
@@ -304,7 +304,7 @@ diff -ruN --exclude=.svn spooler/mailer.cpp ZARAFA_SPOOLER/mailer.cpp
 diff -ruN --exclude=.svn spooler/Makefile.am ZARAFA_SPOOLER/Makefile.am
 --- spooler/Makefile.am	2013-02-28 16:11:57.000000000 +0100
 +++ ZARAFA_SPOOLER/Makefile.am	2013-04-27 13:12:21.888888200 +0200
-@@ -27,7 +27,7 @@
+@@ -28,7 +28,7 @@
  	$(PROG_LIBS) $(PYTHON_LIBS)
  
  zarafa_dagent_SOURCES = DAgent.cpp rules.cpp rules.h LMTP.cpp LMTP.h archive.cpp archive.h PyMapiPlugin.cpp PyMapiPlugin.h PythonSWIGRuntime.h
@@ -325,7 +325,7 @@ diff -ruN --exclude=.svn spooler/Makefile.in ZARAFA_SPOOLER/Makefile.in
  zarafa_spooler_OBJECTS = $(am_zarafa_spooler_OBJECTS)
  zarafa_spooler_DEPENDENCIES = ${top_builddir}/inetmapi/libinetmapi.la \
  	${top_builddir}/mapi4linux/src/libmapi.la \
-@@ -384,7 +384,7 @@
+@@ -388,7 +388,7 @@
  	$(PROG_LIBS) $(PYTHON_LIBS)
  
  zarafa_dagent_SOURCES = DAgent.cpp rules.cpp rules.h LMTP.cpp LMTP.h archive.cpp archive.h PyMapiPlugin.cpp PyMapiPlugin.h PythonSWIGRuntime.h
@@ -334,7 +334,7 @@ diff -ruN --exclude=.svn spooler/Makefile.in ZARAFA_SPOOLER/Makefile.in
  BUILT_SOURCES = PythonSWIGRuntime.h
  CLEANFILES = PythonSWIGRuntime.h
  EXTRA_DIST = PythonSWIGRuntime.h
-@@ -485,6 +485,7 @@
+@@ -489,6 +489,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Spooler.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archive.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailer.Po@am__quote@
@@ -348,6 +348,14 @@ diff -ruN --exclude=.svn spooler/README.txt ZARAFA_SPOOLER/README.txt
 @@ -0,0 +1,26 @@
 +README for the alias extension:
 +
++___BUILDING___:
++First read: http://www.zarafa.com/wiki/index.php/Compiling_source_code
++
++cd path/to/zarafa-source
++./configure --enable-release --disable-static --with-userscript-prefix=/etc/zarafa/userscripts --with-quotatemplate-prefix=/etc/zarafa/quotamails --enable-python --enable-unicode --disable-swig --disable-tcmalloc
++make
++checkinstall
++
 +___GENERAL___:
 +
 +The alias checking reads its rules from an ansi textfile.