move
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2528 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
12
net-mail/zarafa/files/50_zarafa-webaccess-mobile.conf
Normal file
12
net-mail/zarafa/files/50_zarafa-webaccess-mobile.conf
Normal file
@@ -0,0 +1,12 @@
|
||||
<IfDefine ZARAFA-WEBACCESS-MOBILE>
|
||||
Alias /webaccess-mobile /usr/share/zarafa-webaccess-mobile
|
||||
|
||||
<Directory /usr/share/zarafa-webaccess-mobile/>
|
||||
DirectoryIndex index.php
|
||||
Options -Indexes +FollowSymLinks
|
||||
AllowOverride Options
|
||||
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
</IfDefine>
|
||||
12
net-mail/zarafa/files/50_zarafa-webaccess.conf
Normal file
12
net-mail/zarafa/files/50_zarafa-webaccess.conf
Normal file
@@ -0,0 +1,12 @@
|
||||
<IfDefine ZARAFA-WEBACCESS>
|
||||
Alias /webaccess /usr/share/zarafa-webaccess
|
||||
|
||||
<Directory /usr/share/zarafa-webaccess/>
|
||||
DirectoryIndex index.php
|
||||
Options -Indexes +FollowSymLinks
|
||||
AllowOverride Options
|
||||
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
</IfDefine>
|
||||
44
net-mail/zarafa/files/patches/fix-pthread.patch
Normal file
44
net-mail/zarafa/files/patches/fix-pthread.patch
Normal 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"
|
||||
@@ -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 \
|
||||
@@ -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
net-mail/zarafa/files/patches/zarafa-6.40.0-package.patch
Normal file
61
net-mail/zarafa/files/patches/zarafa-6.40.0-package.patch
Normal 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
|
||||
@@ -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
|
||||
@@ -0,0 +1,187 @@
|
||||
Submitted By: Your Name (your at email dot address)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
30
net-mail/zarafa/files/zarafa-gateway.rc6
Normal file
30
net-mail/zarafa/files/zarafa-gateway.rc6
Normal file
@@ -0,0 +1,30 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
GATEWAYCONFIG=/etc/zarafa/gateway.cfg
|
||||
GATEWAYPROGRAM=/usr/bin/zarafa-gateway
|
||||
|
||||
[ -x $GATEWAYPROGRAM ] || exit 0
|
||||
|
||||
GATEWAYCONFIG_OPT=""
|
||||
[ ! -z $GATEWAYCONFIG -a -f $GATEWAYCONFIG ] && GATEWAYCONFIG_OPT="-c $GATEWAYCONFIG"
|
||||
|
||||
PIDFILE=/var/run/"${SVCNAME}".pid
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${GATEWAYPROGRAM} -- ${GATEWAYCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${GATEWAYPROGRAM} -- ${GATEWAYCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
30
net-mail/zarafa/files/zarafa-ical.rc6
Normal file
30
net-mail/zarafa/files/zarafa-ical.rc6
Normal file
@@ -0,0 +1,30 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
ICALCONFIG=/etc/zarafa/ical.cfg
|
||||
ICALPROGRAM=/usr/bin/zarafa-ical
|
||||
|
||||
[ -x $ICALPROGRAM ] || exit 0
|
||||
|
||||
ICALCONFIG_OPT=""
|
||||
[ ! -z $ICALCONFIG -a -f $ICALCONFIG ] && ICALCONFIG_OPT="-c $ICALCONFIG"
|
||||
|
||||
PIDFILE=/var/run/"${SVCNAME}".pid
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${ICALPROGRAM} -- ${ICALCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${ICALPROGRAM} -- ${ICALCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
31
net-mail/zarafa/files/zarafa-indexer.rc6
Normal file
31
net-mail/zarafa/files/zarafa-indexer.rc6
Normal file
@@ -0,0 +1,31 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
INDEXERCONFIG=/etc/zarafa/indexer.cfg
|
||||
INDEXERPROGRAM=/usr/bin/zarafa-indexer
|
||||
|
||||
[ -x $INDEXERPROGRAM ] || exit 0
|
||||
|
||||
INDEXERCONFIG_OPT=""
|
||||
[ ! -z $INDEXERCONFIG -a -f $INDEXERCONFIG ] && INDEXERCONFIG_OPT="-c $INDEXERCONFIG"
|
||||
|
||||
PIDFILE=/var/run/"${SVCNAME}".pid
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${INDEXERPROGRAM} -- ${INDEXERCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile ${PIDFILE} \
|
||||
--retry 65 \
|
||||
--exec ${INDEXERPROGRAM} -- ${INDEXERCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
30
net-mail/zarafa/files/zarafa-licensed.rc6
Normal file
30
net-mail/zarafa/files/zarafa-licensed.rc6
Normal file
@@ -0,0 +1,30 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
LICENSEDCONFIG=/etc/zarafa/licensed.cfg
|
||||
LICENSEDPROGRAM=/usr/bin/zarafa-licensed
|
||||
|
||||
[ -x $LICENSEDPROGRAM ] || exit 0
|
||||
|
||||
LICENSEDCONFIG_OPT=""
|
||||
[ ! -z $LICENSEDCONFIG -a -f $LICENSEDCONFIG ] && LICENSEDCONFIG_OPT="-c $LICENSEDCONFIG"
|
||||
|
||||
PIDFILE=/var/run/"${SVCNAME}".pid
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${LICENSEDPROGRAM} -- ${LICENSEDCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${LICENSEDPROGRAM} -- ${LICENSEDCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
30
net-mail/zarafa/files/zarafa-monitor.rc6
Normal file
30
net-mail/zarafa/files/zarafa-monitor.rc6
Normal file
@@ -0,0 +1,30 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
MONITORCONFIG=/etc/zarafa/monitor.cfg
|
||||
MONITORPROGRAM=/usr/bin/zarafa-monitor
|
||||
|
||||
[ -x $MONITORPROGRAM ] || exit 0
|
||||
|
||||
MONITORCONFIG_OPT=""
|
||||
[ ! -z $MONITORCONFIG -a -f $MONITORCONFIG ] && MONITORCONFIG_OPT="-c $MONITORCONFIG"
|
||||
|
||||
PIDFILE=/var/run/"${SVCNAME}".pid
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${MONITORPROGRAM} -- ${MONITORCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${MONITORPROGRAM} -- ${MONITORCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
31
net-mail/zarafa/files/zarafa-server.rc6
Normal file
31
net-mail/zarafa/files/zarafa-server.rc6
Normal file
@@ -0,0 +1,31 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
SERVERCONFIG=/etc/zarafa/server.cfg
|
||||
SERVERPROGRAM=/usr/bin/zarafa-server
|
||||
|
||||
[ -x $SERVERPROGRAM ] || exit 0
|
||||
|
||||
SERVERCONFIG_OPT=""
|
||||
[ ! -z $SERVERCONFIG -a -f $SERVERCONFIG ] && SERVERCONFIG_OPT="-c $SERVERCONFIG"
|
||||
|
||||
PIDFILE=/var/run/"${SVCNAME}".pid
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${SERVERPROGRAM} -- ${SERVERCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile ${PIDFILE} \
|
||||
--retry 65 \
|
||||
--exec ${SERVERPROGRAM} -- ${SERVERCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
30
net-mail/zarafa/files/zarafa-spooler.rc6
Normal file
30
net-mail/zarafa/files/zarafa-spooler.rc6
Normal file
@@ -0,0 +1,30 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
SPOOLERCONFIG=/etc/zarafa/spooler.cfg
|
||||
SPOOLERPROGRAM=/usr/bin/zarafa-spooler
|
||||
|
||||
[ -x $SPOOLERPROGRAM ] || exit 0
|
||||
|
||||
SPOOLERCONFIG_OPT=""
|
||||
[ ! -z $SPOOLERCONFIG -a -f $SPOOLERCONFIG ] && SPOOLERCONFIG_OPT="-c $SPOOLERCONFIG"
|
||||
|
||||
PIDFILE=/var/run/"${SVCNAME}".pid
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${SPOOLERPROGRAM} -- ${SPOOLERCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop \
|
||||
--pidfile ${PIDFILE} \
|
||||
--exec ${SPOOLERPROGRAM} -- ${SPOOLERCONFIG_OPT}
|
||||
eend $?
|
||||
}
|
||||
101
net-mail/zarafa/files/zarafa.logrotate
Normal file
101
net-mail/zarafa/files/zarafa.logrotate
Normal file
@@ -0,0 +1,101 @@
|
||||
#
|
||||
# This is an example for the common logrotate system.
|
||||
# Copy this file to /etc/logrotate.d/zarafa to activate it.
|
||||
# Also, check the location of the logfiles, and replace if needed.
|
||||
#
|
||||
|
||||
/var/log/zarafa/dagent.log {
|
||||
weekly
|
||||
missingok
|
||||
rotate 52
|
||||
compress
|
||||
delaycompress
|
||||
notifempty
|
||||
postrotate
|
||||
killall -HUP zarafa-dagent
|
||||
endscript
|
||||
}
|
||||
|
||||
/var/log/zarafa/indexer.log {
|
||||
weekly
|
||||
missingok
|
||||
rotate 52
|
||||
compress
|
||||
delaycompress
|
||||
notifempty
|
||||
postrotate
|
||||
killall -HUP zarafa-indexer
|
||||
endscript
|
||||
}
|
||||
|
||||
/var/log/zarafa/licensed.log {
|
||||
weekly
|
||||
missingok
|
||||
rotate 52
|
||||
compress
|
||||
delaycompress
|
||||
notifempty
|
||||
postrotate
|
||||
killall -HUP zarafa-licensed
|
||||
endscript
|
||||
}
|
||||
|
||||
/var/log/zarafa/server.log {
|
||||
weekly
|
||||
missingok
|
||||
rotate 52
|
||||
compress
|
||||
delaycompress
|
||||
notifempty
|
||||
postrotate
|
||||
killall -HUP zarafa-server
|
||||
endscript
|
||||
}
|
||||
|
||||
/var/log/zarafa/spooler.log {
|
||||
weekly
|
||||
missingok
|
||||
rotate 52
|
||||
compress
|
||||
delaycompress
|
||||
notifempty
|
||||
postrotate
|
||||
killall -HUP zarafa-spooler
|
||||
endscript
|
||||
}
|
||||
|
||||
/var/log/zarafa/monitor.log {
|
||||
weekly
|
||||
missingok
|
||||
rotate 52
|
||||
compress
|
||||
delaycompress
|
||||
notifempty
|
||||
postrotate
|
||||
killall -HUP zarafa-monitor
|
||||
endscript
|
||||
}
|
||||
|
||||
/var/log/zarafa/gateway.log {
|
||||
weekly
|
||||
missingok
|
||||
rotate 52
|
||||
compress
|
||||
delaycompress
|
||||
notifempty
|
||||
postrotate
|
||||
killall -HUP zarafa-gateway
|
||||
endscript
|
||||
}
|
||||
|
||||
/var/log/zarafa/ical.log {
|
||||
weekly
|
||||
missingok
|
||||
rotate 52
|
||||
compress
|
||||
delaycompress
|
||||
notifempty
|
||||
postrotate
|
||||
killall -HUP zarafa-ical
|
||||
endscript
|
||||
}
|
||||
Reference in New Issue
Block a user