Merge remote branch 'origin/master' into f12

Conflicts:
	.gitignore

.gitignore

@@ -0,0 +1 @@
+zarafa-6.40.3.tar.gz

dead.package

@@ -1 +0,0 @@
-Package is retired

sources

@@ -0,0 +1 @@
+a2177498a1cc054b8beaba9a3887ec89  zarafa-6.40.3.tar.gz

zarafa-6.40.0-package.patch

@@ -0,0 +1,61 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
+removes the paths from autoconf/automake related files, that don't exist in the OSS
+version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
+re-run of autoreconf is needed in order to get the rpaths completely out of all the
+libraries and binaries built during the make process.
+
+--- zarafa-6.40.0/configure.ac			2010-05-31 15:45:19.000000000 +0200
++++ zarafa-6.40.0/configure.ac.package		2010-06-06 02:48:22.000000000 +0200
+@@ -772,19 +772,6 @@
+ 		version
+ 		specialbuild
+ ])
+-dnl non-oss files
+-if test -d `dirname $0`/licensed; then
+-AC_CONFIG_FILES([
+-		liblicense/Makefile
+-		licensed/Makefile
+-		ECtools/zarafa-backup/Makefile
+-		ECtools/zarafa-backup/helpers/Makefile
+-		ECtools/zarafa-report/Makefile
+-		ECtools/libarchiver/Makefile
+-		ECtools/zarafa-archiver/Makefile
+-		debian/zarafa.install
+-])
+-fi
+ 
+ AC_OUTPUT
+ 
+--- zarafa-6.40.0/Makefile.am			2010-05-31 15:45:19.000000000 +0200
++++ zarafa-6.40.0/Makefile.am.package		2010-06-06 02:51:29.000000000 +0200
+@@ -1,9 +1,5 @@
+ AUTOMAKE_OPTIONS = 1.9 foreign
+ 
+-if ! OSS_ONLY
+-PROSUBS = liblicense licensed
+-endif
+-
+ SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext spooler gateway caldav ECtools installer po doc
+ 
+ if WITH_PERL
+@@ -17,10 +13,6 @@
+ common/ecversion.h: versionheader.sh
+ 	sh ${top_srcdir}/versionheader.sh > common/ecversion.h
+ 
+-if ! OSS_ONLY
+-CLEANFILES=common/ecversion.h
+-endif
+-
+ dist-hook:
+ 	find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
+ if OSS_ONLY
+--- zarafa-6.40.0/ECtools/Makefile.am		2010-05-31 15:45:18.000000000 +0200
++++ zarafa-6.40.0/ECtools/Makefile.am.package	2010-06-06 02:48:37.000000000 +0200
+@@ -1,7 +1,3 @@
+-if ! OSS_ONLY
+-PROSUBS = zarafa-backup zarafa-report libarchiver zarafa-archiver 
+-endif
+-
+ if WITH_TESTTOOLS
+ TESTSUBS = ECTestTools
+ endif

zarafa-webaccess.conf

@@ -0,0 +1,32 @@
+#
+# Zarafa Webaccess featuring a 'Look & Feel' similar to Outlook
+#
+
+Alias /webaccess /usr/share/zarafa-webaccess/
+
+# Following Apache and PHP settings need to be set to work correct
+#
+<Directory /usr/share/zarafa-webaccess/>
+    # Some apache settings
+    Options -Indexes +FollowSymLinks
+
+    # Register globals must be off
+    php_flag register_globals off
+
+    # Magic quotes must be off
+    php_flag magic_quotes_gpc off
+    php_flag magic_quotes_runtime off
+
+    # The maximum POST limit. To upload large files, this value must
+    # be larger than upload_max_filesize.
+    php_value post_max_size 31M
+    php_value upload_max_filesize 30M
+
+    # Short open tags must be on
+    php_flag short_open_tag on
+
+    # Uncomment for debugging purposes only. Make sure Apache/PHP can
+    # write to this file or no errors will be logged!
+#    php_flag log_errors on
+#    php_value error_log /var/lib/zarafa-webaccess/error_log
+</Directory>

zarafa.ini

@@ -0,0 +1,2 @@
+; Enable Zarafa mapi extension module
+extension=mapi.so

zarafa.logrotate

@@ -0,0 +1,13 @@
+/var/log/zarafa/SERVICE.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	postrotate
+			killall -HUP zarafa-SERVICE 2> /dev/null || true
+	endscript
+	create 0644 zarafa zarafa
+}
+