dbp/mds
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add zarafa

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2511 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2010-10-11 20:17:05 +00:00
parent 0afb919483
commit d6727abf63
17 changed files with 639 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
www-apps/zarafa/files/patches/fix-pthread.patch Normal file
View File

@@ -0,0 +1,44 @@
Index: zarafa-6.40.2/configure.ac
===================================================================
--- zarafa-6.40.2.orig/configure.ac
+++ zarafa-6.40.2/configure.ac
@@ -405,7 +405,7 @@ if test "x$CLUCENE_INCLUDE_PREFIX" != "x
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
fi
# force add pthread in lucene test
-CXXFLAGS="$CXXFLAGS -pthread"
+CXXFLAGS="$CXXFLAGS -lpthread"
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
AC_CHECK_LIB(clucene, [open],
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
@@ -555,7 +555,7 @@ libs_keep=$LIBS
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
LIBS=$libs_keep
# because it seems this is better... (gnu c/c++ only?)
-CXXFLAGS="$CXXFLAGS -pthread"
+CXXFLAGS="$CXXFLAGS -lpthread"
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
libs_keep=$LIBS
Index: zarafa-6.40.2/ltmain.sh
===================================================================
--- zarafa-6.40.2.orig/ltmain.sh
+++ zarafa-6.40.2/ltmain.sh
@@ -1647,7 +1647,7 @@ EOF
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -2150,7 +2150,7 @@ EOF
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"

26
www-apps/zarafa/files/patches/fix-zarafaserver-uuid-linkage.patch Normal file
View File

@@ -0,0 +1,26 @@
Index: zarafa-6.40.0/provider/server/Makefile.in
===================================================================
--- zarafa-6.40.0.orig/provider/server/Makefile.in
+++ zarafa-6.40.0/provider/server/Makefile.in
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_ssl.la \
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
zarafa_server_SOURCES = ECServer.cpp \
ECSoapServerConnection.h ECSoapServerConnection.cpp \
Index: zarafa-6.40.0/provider/server/Makefile.am
===================================================================
--- zarafa-6.40.0.orig/provider/server/Makefile.am
+++ zarafa-6.40.0/provider/server/Makefile.am
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_ssl.la \
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
zarafa_server_SOURCES = ECServer.cpp \
ECSoapServerConnection.h ECSoapServerConnection.cpp \

24
www-apps/zarafa/files/patches/fix-zarafastats-uuid-linkage.patch Normal file
View File

@@ -0,0 +1,24 @@
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
@@ -13,7 +13,7 @@
${top_builddir}/mapi4linux/src/libmapi.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_util.la \
- -lncurses
+ -lncurses -luuid
zarafa_stats_SOURCES = zarafa-stats.cpp
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
@@ -250,7 +250,7 @@
${top_builddir}/mapi4linux/src/libmapi.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_util.la \
- -lncurses
+ -lncurses -luuid
zarafa_stats_SOURCES = zarafa-stats.cpp
all: all-am

61
www-apps/zarafa/files/patches/zarafa-6.40.0-package.patch Normal file
View File

@@ -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

19
www-apps/zarafa/files/patches/zarafa-6.40.2-libtcmalloc_shared-1.patch Normal file
View File

@@ -0,0 +1,19 @@
Submitted By: Your Name (your at email dot address)
Date: 2010-10-11
Initial Package Version: 6.40.2
Origin: me
Upstream Status: unknown
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
@@ -441,7 +441,7 @@
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
AC_CHECK_LIB(tcmalloc_minimal, [open],
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
[ WITH_TCMALLOC=no ])
AC_SUBST(TCMALLOC_LIBS)
AC_LANG_POP