commit 73864f6d070662eb1b3e2f9f10b6d64c19018f43 Author: geos_one Date: Sun Jun 19 05:28:25 2011 +0000 move zarafa to its own ovelray git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/zarafa@2932 6952d904-891a-0410-993b-d76249ca496b diff --git a/app-arch/rpm5offset/ChangeLog b/app-arch/rpm5offset/ChangeLog new file mode 100644 index 0000000..e5df727 --- /dev/null +++ b/app-arch/rpm5offset/ChangeLog @@ -0,0 +1,17 @@ +# ChangeLog for app-arch/rpm5offset +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 12 Oct 2010; Mario Fetka rpm5offset-9.0.ebuild, + -rpm5offset-9.0-r1.ebuild: + remove broken ebuild + +*rpm5offset-9.0-r1 (09 Sep 2009) + + 09 Sep 2009; Mario Fetka + +rpm5offset-9.0-r1.ebuild: + add support for app-arch/xz-utils + + 16 Jan 2009; Mario Fetka +metadata.xml: + initial rpm5offset + diff --git a/app-arch/rpm5offset/Manifest b/app-arch/rpm5offset/Manifest new file mode 100644 index 0000000..0ebb81d --- /dev/null +++ b/app-arch/rpm5offset/Manifest @@ -0,0 +1,4 @@ +AUX rpmoffset.c 1964 RMD160 acea626f5080b7ea47863cf9e3bc2ab3b381c61e SHA1 5ec35b3d37773ca4a09443c6ea687c7d3a739f34 SHA256 e1e18d68009bd4541d6c65b43f45b58d720b9c87eba612d7616e244142f80dfe +EBUILD rpm5offset-9.0.ebuild 626 RMD160 8e00ebb9e2178c77d24bc00c7415e10d0783984e SHA1 a84f110afe57abf7cf2e5ccf9c273ff60248e85f SHA256 58736742fc4655d0dba4f7b7b0546d15319df2b1ade324ac6fb1f0c128b1a926 +MISC ChangeLog 486 RMD160 84d82672de16cc5e01034e2502aa2bcc24b90967 SHA1 121205dac2a9749486776182bfa2e2ebfa9d1e74 SHA256 7a87ea2dd02a2287e2c5303eaf50e6464b010777c794f6034d520c5ff7d1a692 +MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/app-arch/rpm5offset/files/rpmoffset.c b/app-arch/rpm5offset/files/rpmoffset.c new file mode 100644 index 0000000..61a4624 --- /dev/null +++ b/app-arch/rpm5offset/files/rpmoffset.c @@ -0,0 +1,72 @@ + +/* Find how deeply inside an .RPM the real data is */ +/* kept, and report the offset in bytes */ + +/* Wouldn't it be a lot more sane if we could just untar these things? */ + +#include +#include + +/* These offsets keep getting bigger, so we're going to just bite a 2MB */ +/* chunk of RAM right away so that we have enough. Yeah, horrible */ +/* quick and dirty implementation, but hey -- it gets the job done. */ + +#define RPMBUFSIZ 3145728 + +main() +{ + char *buff = malloc(RPMBUFSIZ),*eb,*p; + for (p = buff, eb = buff + read(0,buff,RPMBUFSIZ); p < eb; p++) + { + + /* gzip format */ + if (*p == '\037' && p[1] == '\213' && p[2] == '\010') + { + printf("%ld\n",p - buff); + exit(0); + } + + /* bzip2 format */ + else if (*p == 'B' && p[1] == 'Z' && p[2] == 'h' ) + { + printf("%ld\n",p - buff); + exit(0); + } + + /* LZMA files; both LZMA_Alone and LZMA utils formats. The LZMA_Alone + * format is used by the LZMA_Alone tool from LZMA SDK. The LZMA utils + * format is the default format of LZMA utils 4.32.1 and later. */ + + /* LZMA utils format */ + else if (*p == '\377' && p[1] == 'L' && + p[2] == 'Z' && p[3] == 'M' && + p[4] == 'A' && p[5] == '\000') + { + printf("%ld\n",p - buff); + exit(0); + } + + /* The LZMA_Alone format has no magic bytes, thus we + * need to play a wizard. This can give false positives, + * thus the detection below should be removed when + * the newer LZMA utils format has got popular. */ +// else if (*p == 0x5D && p[1] == 0x00 && + else if (*p == '\135' && + p[5] == '\377' && p[6] == '\377' && + p[7] == '\377' && p[8] == '\377' && + p[9] == '\377' && p[10] == '\377' && + p[11] == '\377' && p[12] == '\377') + +/* ((p[10] == 0x00 && p[11] == 0x00 && + p[12] == 0x00) || + (p[5] == 0xFF && p[6] == 0xFF && + p[7] == 0xFF && p[8] == 0xFF && + p[9] == 0xFF && p[10] == 0xFF && + p[11] == 0xFF && p[12] == 0xFF))) +*/ { + printf("%ld\n",p - buff); + exit(0); + } + } + exit(1); +} diff --git a/app-arch/rpm5offset/metadata.xml b/app-arch/rpm5offset/metadata.xml new file mode 100644 index 0000000..7e32869 --- /dev/null +++ b/app-arch/rpm5offset/metadata.xml @@ -0,0 +1,5 @@ + + + +maintainer-wanted + diff --git a/app-arch/rpm5offset/rpm5offset-9.0.ebuild b/app-arch/rpm5offset/rpm5offset-9.0.ebuild new file mode 100644 index 0000000..c2bfae6 --- /dev/null +++ b/app-arch/rpm5offset/rpm5offset-9.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit toolchain-funcs + +DESCRIPTION="Find how deeply inside an .RPM the real data is" +HOMEPAGE="http://www.slackware.com/config/packages.php" +SRC_URI="" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="userland_GNU" + +RDEPEND="app-arch/cpio + app-arch/xz-utils" +DEPEND="${DEPEND}" + +src_compile() { + "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} ${FILESDIR}/rpmoffset.c -o rpm5offset || die +} + +src_install() { + dobin rpm5offset || die +} diff --git a/dev-cpp/libvmime/ChangeLog b/dev-cpp/libvmime/ChangeLog new file mode 100644 index 0000000..36f9474 --- /dev/null +++ b/dev-cpp/libvmime/ChangeLog @@ -0,0 +1,24 @@ +# ChangeLog for dev-cpp/libvmime +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 22 Mar 2011; Mario Fetka + libvmime-0.9.2_pre581.ebuild: + add zarafa patches + +*libvmime-0.9.2_pre581 (21 Mar 2011) + + 21 Mar 2011; Mario Fetka + +libvmime-0.9.2_pre581.ebuild: + add libvmime pre release + + 13 Oct 2010; Mario Fetka libvmime-0.7.1.ebuild: + add arm keyword + + 11 Oct 2010; Mario Fetka libvmime-0.7.1.ebuild: + correct include install + + 11 Oct 2010; Mario Fetka +metadata.xml: + add libvmime with fedora patch to rename the lib to libvmime07 to have it + clearly sloted + diff --git a/dev-cpp/libvmime/Manifest b/dev-cpp/libvmime/Manifest new file mode 100644 index 0000000..8517367 --- /dev/null +++ b/dev-cpp/libvmime/Manifest @@ -0,0 +1,8 @@ +DIST libvmime-0.7.1-zarafa-gentoo-4.tar.bz2 12834 RMD160 3d981f73d72bd86b5f8dd02ffcfcae84f7f8e176 SHA1 c740b5453b93c65d3939ad6c4f4bc1b90c4605f1 SHA256 e087d38c0b5ebf539979c584f6aca2a8ef5bcd7c27ab721df57a6618a1749f64 +DIST libvmime-0.7.1.tar.bz2 418302 RMD160 259983c8844108c8040bcbae2ea53e453a811124 SHA1 30fefbdd31c2fa46976984f18d4d21bf3c2ec20a SHA256 fc3476aec565341594c7c4dca982539695b61ecb92a438f19860e9130ca019e3 +DIST libvmime-0.9.2+svn581.tar.bz2 520479 RMD160 64a5da0aab87cc8d8c3af1684424419144906f63 SHA1 fb5f73f471b3904bb5f8c0b9a31403b27dfaec68 SHA256 f1aaa124d40f10b71910cacb059aa77f146094a5ecddc70e46409196b26b26c7 +DIST libvmime-0.9.2_pre581-zarafa-1.tar.bz2 3091 RMD160 da8a8133f1ffcd0dbc902cfebab9947d424fd73a SHA1 f24e034b502410aefe0e120928c220e15e246fc8 SHA256 025290d28fec79e79886fb24fce6fa2625e464414ce0843d9895fec1251a7a36 +EBUILD libvmime-0.7.1.ebuild 1594 RMD160 25e780130b70564bbd084e081a6c942e18daddfa SHA1 986cf884f04ab88f9ebba2a98265308ba63f47a5 SHA256 7c5855190244c71487059fa0fd4755eb19d04daacb72ae3a19442eeaaffbac41 +EBUILD libvmime-0.9.2_pre581.ebuild 1933 RMD160 33f8dacd201d712d1bc23577b842c334b5253a9a SHA1 33cb0465d8cc37d38e3c840e879f74817a68d61f SHA256 1ad5c690db97124f652030fcf11367cc7abf17242aeb7a9b33f06a1732a8886d +MISC ChangeLog 726 RMD160 e5bbc488b4bf0297814e0c8408a5a5a286870887 SHA1 6ae2845ff642c87fa9f9867f7eea327daf96e583 SHA256 4ee733cb8eb1e481a25d9c8aab35a0c75d22c22042ba089c3f4b8cc8b7009da8 +MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/dev-cpp/libvmime/libvmime-0.7.1.ebuild b/dev-cpp/libvmime/libvmime-0.7.1.ebuild new file mode 100644 index 0000000..3dba2b2 --- /dev/null +++ b/dev-cpp/libvmime/libvmime-0.7.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils autotools + +DESCRIPTION="Library for working with MIME messages and Internet messaging services like IMAP, POP or SMTP" +HOMEPAGE="http://www.vmime.org" +SRC_URI="mirror://sourceforge/vmime/${P}.tar.bz2 + http://ftp.disconnected-by-peer.at/zarafa/${P}-zarafa-gentoo-4.tar.bz2" + + +LICENSE="GPL-2" +SLOT="0.7" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug doc examples +imap +maildir +pop sasl sendmail +smtp ssl static" + +RDEPEND="virtual/libiconv + ssl? ( >=net-libs/gnutls-1.2.0 ) + sasl? ( virtual/gsasl ) + sendmail? ( virtual/mta )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +src_prepare() { + EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + eautoreconf +# die +} + +src_configure() { + econf $(use_enable debug) \ + $(use_enable static) \ + $(use_enable sasl) \ + $(use_enable ssl tls) \ + $(use_enable pop messaging-proto-pop3) \ + $(use_enable smtp messaging-proto-smtp) \ + $(use_enable imap messaging-proto-imap) \ + $(use_enable maildir messaging-proto-maildir) \ + $(use_enable sendmail messaging-proto-sendmail) +} + +src_compile() { + default + if use doc ; then + doxygen vmime.doxygen || die "doxygen failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog || die "dodoc failed" + if use doc ; then + dohtml doc/html/* || die "dohtml failed" + fi + + insinto /usr/share/doc/${PF} + if use examples ; then + doins -r examples || die "doins examples failed" + fi +} diff --git a/dev-cpp/libvmime/libvmime-0.9.2_pre581.ebuild b/dev-cpp/libvmime/libvmime-0.9.2_pre581.ebuild new file mode 100644 index 0000000..ba3d925 --- /dev/null +++ b/dev-cpp/libvmime/libvmime-0.9.2_pre581.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils autotools + +MY_PV=${PV/_pre/+svn} +MY_PVV=${PV/_pre*/} + +DESCRIPTION="Library for working with MIME messages and Internet messaging services like IMAP, POP or SMTP" +HOMEPAGE="http://www.vmime.org" +SRC_URI="mirror://sourceforge/vmime/${PN}-${MY_PV}.tar.bz2 + http://download.zarafa.com/community/beta/7.0/7.0.0beta3-25734/sourcecode/${PN}-${MY_PV}.tar.bz2 + http://ftp.disconnected-by-peer.at/zarafa/${P}-zarafa-1.tar.bz2" + + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug doc examples +imap +maildir +pop sasl sendmail +smtp ssl static" + +RDEPEND="virtual/libiconv + ssl? ( >=net-libs/gnutls-1.2.0 ) + sasl? ( virtual/gsasl ) + sendmail? ( virtual/mta )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +S="${WORKDIR}/${PN}-${MY_PVV}" + +src_prepare() { + sed -i \ + -e "s|doc/\${PACKAGE_TARNAME}|doc/${PF}|" \ + -e "s|doc/\$(GENERIC_LIBRARY_NAME)|doc/${PF}|" \ + configure Makefile.in || die "sed failed" + EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="diff" \ + EPATCH_FORCE="yes" epatch +# AT_M4DIR="m4" eautoreconf +# die +} + +src_configure() { + econf $(use_enable debug) \ + $(use_enable static) \ + $(use_enable sasl) \ + $(use_enable ssl tls) \ + $(use_enable pop messaging-proto-pop3) \ + $(use_enable smtp messaging-proto-smtp) \ + $(use_enable imap messaging-proto-imap) \ + $(use_enable maildir messaging-proto-maildir) \ + $(use_enable sendmail messaging-proto-sendmail) +} + +src_compile() { + default + if use doc ; then + doxygen vmime.doxygen || die "doxygen failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog || die "dodoc failed" + if use doc ; then + dohtml doc/html/* || die "dohtml failed" + fi + + insinto /usr/share/doc/${PF} + if use examples ; then + doins -r examples || die "doins examples failed" + fi +} diff --git a/dev-cpp/libvmime/metadata.xml b/dev-cpp/libvmime/metadata.xml new file mode 100644 index 0000000..46a44e5 --- /dev/null +++ b/dev-cpp/libvmime/metadata.xml @@ -0,0 +1,34 @@ + + + + +no-herd + + @gentoo.org + + + + + diff --git a/eclass/rpm5.eclass b/eclass/rpm5.eclass new file mode 100644 index 0000000..8a7f884 --- /dev/null +++ b/eclass/rpm5.eclass @@ -0,0 +1,113 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.20 2010/07/18 21:57:20 vapier Exp $ + +# @ECLASS: rpm.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: convenience class for extracting RPMs + +inherit eutils + +DEPEND=">=app-arch/rpm5offset-9.0" + +# @FUNCTION: rpm_unpack +# @USAGE: +# @DESCRIPTION: +# Unpack the contents of the specified rpms like the unpack() function. +rpm5_unpack() { + [[ $# -eq 0 ]] && set -- ${A} + local a rpmoff decompcmd + for a in "$@" ; do + echo ">>> Unpacking ${a} to ${PWD}" + if [[ ${a} == ./* ]] ; then + : nothing to do -- path is local + elif [[ ${a} == ${DISTDIR}/* ]] ; then + ewarn 'QA: do not use ${DISTDIR} with rpm_unpack -- it is added for you' + elif [[ ${a} == /* ]] ; then + ewarn 'QA: do not use full paths with rpm_unpack -- use ./ paths instead' + else + a="${DISTDIR}/${a}" + fi +# rpm2tar -O "${a}" | tar xf - || die "failure unpacking ${a}" + rpmoff=`rpm5offset < ${a}` + [ -z "${rpmoff}" ] && return 1 + + decompcmd="lzma -dc" + if [ -n "`dd if=${a} skip=${rpmoff} bs=1 count=3 2>/dev/null | file - | grep bzip2`" ]; then + decompcmd="bzip2 -dc" + fi + if [ -n "`dd if=${a} skip=${rpmoff} bs=1 count=3 2>/dev/null | file - | grep gzip`" ]; then + decompcmd="gzip -dc" + fi + + dd ibs=${rpmoff} skip=1 if=${a} 2> /dev/null \ + | ${decompcmd} \ + | cpio -idmu --no-preserve-owner --quiet || return 1 + done +} + +# @FUNCTION: srcrpm_unpack +# @USAGE: +# @DESCRIPTION: +# Unpack the contents of the specified rpms like the unpack() function as well +# as any archives that it might contain. Note that the secondary archive +# unpack isn't perfect in that it simply unpacks all archives in the working +# directory (with the assumption that there weren't any to start with). +srcrpm5_unpack() { + [[ $# -eq 0 ]] && set -- ${A} + rpm5_unpack "$@" + + # no .src.rpm files, then nothing to do + [[ "$* " != *".src.rpm " ]] && return 0 + + eshopts_push -s nullglob + + # unpack everything + local a + for a in *.tar.{gz,bz2} *.t{gz,bz2} *.zip *.ZIP ; do + unpack "./${a}" + rm -f "${a}" + done + + eshopts_pop + + return 0 +} + +# @FUNCTION: rpm_src_unpack +# @DESCRIPTION: +# Automatically unpack all archives in ${A} including rpms. If one of the +# archives in a source rpm, then the sub archives will be unpacked as well. +rpm5_src_unpack() { + local a + for a in ${A} ; do + case ${a} in + *.rpm) srcrpm5_unpack "${a}" ;; + *) unpack "${a}" ;; + esac + done +} + +# @FUNCTION: rpm_spec_epatch +# @USAGE: [spec] +# @DESCRIPTION: +# Read the specified spec (defaults to ${PN}.spec) and attempt to apply +# all the patches listed in it. If the spec does funky things like moving +# files around, well this won't handle that. +rpm5_spec_epatch() { + local p spec=${1:-${PN}.spec} + local dir=${spec%/*} + grep '^%patch' "${spec}" | \ + while read line ; do + set -- ${line} + p=$1 + shift + EPATCH_OPTS="$*" + set -- $(grep "^P${p#%p}: " "${spec}") + shift + epatch "${dir:+${dir}/}$*" + done +} + +EXPORT_FUNCTIONS src_unpack diff --git a/header.txt b/header.txt new file mode 100644 index 0000000..46af726 --- /dev/null +++ b/header.txt @@ -0,0 +1,4 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog new file mode 100644 index 0000000..c662674 --- /dev/null +++ b/net-mail/zarafa/ChangeLog @@ -0,0 +1,155 @@ +# ChangeLog for net-mail/zarafa +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*zarafa-6.40.9.27553 (19 Jun 2011) + + 19 Jun 2011; Mario Fetka +zarafa-6.40.9.27553.ebuild: + Bump + + 10 Jun 2011; Mario Fetka + -files/6.40.5.24860/zarafa-6.40.0-package.patch, + -files/6.40.6.25584/zarafa-6.40.1-no-php-conf.patch, + -files/6.40.5.24860/fix-pthread.patch, + -files/6.40.7.26119/zarafa-6.40.1-no-php-conf.patch, + -files/6.40.7.26119/zarafa-6.40.2-libtcmalloc_shared-1.patch, + -files/6.40.6.25584/zarafa-6.40.2-sysconfig2confd-1.patch, + -files/6.40.5.24860/fix-zarafastats-uuid-linkage.patch, + -files/6.40.7.26119/fix-pthread.patch, + -files/6.40.5.24860/zarafa-6.40.1-no-php-conf.patch, + -files/6.40.5.24860/zarafa-6.40.2-libtcmalloc_shared-1.patch, + -files/6.40.5.24860/zarafa-6.40.2-sysconfig2confd-1.patch, + -zarafa-6.40.5.24860.ebuild, + -files/6.40.6.25584/zarafa-6.40.6-force_latin1.patch, + -files/6.40.5.24860/fix-zarafaserver-uuid-linkage.patch, + -files/6.40.6.25584/fix-pthread.patch, + -files/6.40.6.25584/fix-zarafaserver-uuid-linkage.patch, + -files/6.40.7.26119/fix-zarafastats-uuid-linkage.patch, + -files/6.40.7.26119/zarafa-6.40.2-sysconfig2confd-1.patch, + -files/6.40.5.24860/zarafa-6.40.5-add-missing-endif.patch, + -files/6.40.6.25584/fix-zarafastats-uuid-linkage.patch, + -files/6.40.6.25584/zarafa-6.40.2-libtcmalloc_shared-1.patch, + -files/6.40.5.24860/zarafa-6.40.5-fix-missing-installation-file.patch, + -zarafa-6.40.6.25584.ebuild, + -files/6.40.7.26119/zarafa-6.40.6-force_latin1.patch, + -files/6.40.6.25584/zarafa-6.40.6-package.patch, + -files/6.40.7.26119/zarafa-6.40.6-package.patch, -zarafa-6.40.7.26119.ebuild, + -files/6.40.7.26119/fix-zarafaserver-uuid-linkage.patch, + zarafa-6.40.8.27223.ebuild: + delete old + + 08 Jun 2011; Mario Fetka zarafa-6.40.8.27223.ebuild: + cleanup ebuild + + 08 Jun 2011; Mario Fetka zarafa-6.40.8.27223.ebuild: + drop arm support + + 08 Jun 2011; Mario Fetka + +files/6.40.8.27223/Datux-sendas.patch, zarafa-6.40.8.27223.ebuild, + +files/6.40.8.27223/Datux-spamhook.patch, +files/junklearn.dspam: + add spamd handler patch and the send as patch + + 27 May 2011; Mario Fetka + files/6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch, + files/6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch: + correct patch header + +*zarafa-6.40.8.27223 (26 May 2011) +*zarafa-6.40.7.26119 (26 May 2011) + + 26 May 2011; Mario Fetka + -files/6.40.7.1.26050/zarafa-6.40.1-no-php-conf.patch, + -files/6.40.7.1.26050/fix-pthread.patch, + -files/6.40.7.1.26050/zarafa-6.40.2-libtcmalloc_shared-1.patch, + -files/6.40.7.1.26050/zarafa-6.40.6-force_latin1.patch, + +zarafa-6.40.8.27223.ebuild, + -files/6.40.7.1.26050/fix-zarafaserver-uuid-linkage.patch, + -files/6.40.7.1.26050/fix-zarafastats-uuid-linkage.patch, + -files/6.40.7.1.26050/zarafa-6.40.2-sysconfig2confd-1.patch, + -files/6.40.7.1.26050/zarafa-6.40.6-package.patch, + -zarafa-6.40.7.1.26050.ebuild, +zarafa-6.40.7.26119.ebuild: + Bump + +*zarafa-6.40.7.1.26050 (28 Mar 2011) + + 28 Mar 2011; Mario Fetka + +zarafa-6.40.7.1.26050.ebuild: + bump to zarafa 6.40.7beta1 + +*zarafa-7.0.0.3.25734 (22 Mar 2011) + + 22 Mar 2011; Mario Fetka + -files/7.0.0.3.25734/zarafa-6.40.1-no-php-conf.patch, + files/7.0.0.3.25734/fix-zarafaserver-uuid-linkage.patch, + -files/7.0.0.3.25734/zarafa-6.40.6-force_latin1.patch, + -files/7.0.0.3.25734/zarafa-6.40.6-package.patch, + files/7.0.0.3.25734/fix-pthread.patch, + files/7.0.0.3.25734/fix-zarafastats-uuid-linkage.patch, + +zarafa-7.0.0.3.25734.ebuild, + +files/7.0.0.3.25734/zarafa-7.0.0-package.patch: + add devel package + +*zarafa-6.40.6.25584 (20 Mar 2011) + + 20 Mar 2011; Mario Fetka + -files/6.40.6.25584/zarafa-6.40.0-package.patch, + -files/patches/zarafa-6.40.0-package.patch, + -files/patches/zarafa-6.40.1-no-php-conf.patch, + -files/patches/zarafa-6.40.2-libtcmalloc_shared-1.patch, + -files/patches/zarafa-6.40.2-sysconfig2confd-1.patch, + zarafa-6.40.5.24860.ebuild, + -files/6.40.6.25584/zarafa-6.40.5-add-missing-endif.patch, + -files/patches/zarafa-6.40.5-add-missing-endif.patch, + -files/6.40.6.25584/zarafa-6.40.5-fix-missing-installation-file.patch, + -files/patches/zarafa-6.40.5-fix-missing-installation-file.patch, + +zarafa-6.40.6.25584.ebuild, + +files/6.40.6.25584/zarafa-6.40.6-force_latin1.patch, + +files/6.40.6.25584/zarafa-6.40.6-package.patch, + -files/patches/fix-pthread.patch, + -files/patches/fix-zarafaserver-uuid-linkage.patch, + -files/patches/fix-zarafastats-uuid-linkage.patch, + files/6.40.6.25584/fix-pthread.patch: + add more configure parameters + +*zarafa-6.40.5.24860 (29 Jan 2011) + + 29 Jan 2011; Mario Fetka + +files/patches/zarafa-6.40.1-no-php-conf.patch, -zarafa-6.40.2.ebuild, + -zarafa-6.40.3.ebuild, +zarafa-6.40.5.24860.ebuild, + +files/patches/zarafa-6.40.5-add-missing-endif.patch, + +files/patches/zarafa-6.40.5-fix-missing-installation-file.patch: + Bump and remove old + +*zarafa-6.40.3 (11 Nov 2010) + + 11 Nov 2010; Mario Fetka +zarafa-6.40.3.ebuild, + +files/zarafa-dagent.rc6: + bump + + 13 Oct 2010; Mario Fetka ChangeLog: + move package to net mail as in dagger overlay + + 13 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: + finish arm support and mask licensed on arm + + 13 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: + add arm keyword + + 12 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: + repoman cleanup + + 12 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: + add webaccess multiusercalendar + + 12 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: + add QA_* workarounds and finisch licensed install + + 12 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: + first step to integrate binary only licensed server + + 11 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: + add support for direct download + + 11 Oct 2010; Mario Fetka +metadata.xml: + initial checkin based on g.o bug #239514 + diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest new file mode 100644 index 0000000..ca967b8 --- /dev/null +++ b/net-mail/zarafa/Manifest @@ -0,0 +1,52 @@ +AUX 50_zarafa-webaccess-mobile.conf 298 RMD160 06cc5aed60486f78327aa20c0d03fd7ab10b52be SHA1 bef2feeb930d36403a48545045969b2556513dee SHA256 7019d90fae91e2efb54c2b002ff3ee40de5a684686a74753385514b6abbe8581 +AUX 50_zarafa-webaccess.conf 270 RMD160 226eb8c9661ff57347e2f917223a7823e666324a SHA1 fbd9efab7f9a1f85e55df142c0d553317eab1436 SHA256 ddf11e70107c2d6eaf40ba8253e2118822ee66eddaf471afebca248ba71e85a6 +AUX 6.40.8.27223/Datux-sendas.patch 1429 RMD160 bd2b502775fb84bd6899bb3892d36d19ee3d5b8d SHA1 07a5887d02d0ddbd368c46e50eb4267f73aac9f7 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 +AUX 6.40.8.27223/Datux-spamhook.patch 9895 RMD160 b1143f3e2057ee8d1b0a03e757086501769645a6 SHA1 a108a95087ba83f9c1fb0da42ffc5eef1d3755da SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b +AUX 6.40.8.27223/fix-pthread.patch 2101 RMD160 aafbca78c32dc5c248ff044b9fd35ae3e5882649 SHA1 44f7ac8d8e36209c811b0e1cde5dbfdcc1cdab0d SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c +AUX 6.40.8.27223/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 +AUX 6.40.8.27223/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 +AUX 6.40.8.27223/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f +AUX 6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 c9b89cad232b513db8dad25dba9a7a3b6cdcf007 SHA1 c4d332881ab985f817c8d5c4848f4ec2be91d050 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 +AUX 6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch 8495 RMD160 f747da766c1777121f04c12f4cb3bee9ec56b7f8 SHA1 44e5a9487497080933de75d55311c97dfc7fc8fc SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 +AUX 6.40.8.27223/zarafa-6.40.6-force_latin1.patch 618 RMD160 8fc093050c3368c770d11326cf2402511f8d7c14 SHA1 5a7a6669308166ffb8117090411c3df9827408aa SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 +AUX 6.40.8.27223/zarafa-6.40.6-package.patch 2135 RMD160 30804eb455510967a5cfc2f9fe9bd699f906a9df SHA1 725f55210166e3453eae6bb58d1a417c6b0021ad SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d +AUX 6.40.9.27553/Datux-sendas.patch 1429 RMD160 bd2b502775fb84bd6899bb3892d36d19ee3d5b8d SHA1 07a5887d02d0ddbd368c46e50eb4267f73aac9f7 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 +AUX 6.40.9.27553/Datux-spamhook.patch 9895 RMD160 b1143f3e2057ee8d1b0a03e757086501769645a6 SHA1 a108a95087ba83f9c1fb0da42ffc5eef1d3755da SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b +AUX 6.40.9.27553/fix-pthread.patch 2101 RMD160 aafbca78c32dc5c248ff044b9fd35ae3e5882649 SHA1 44f7ac8d8e36209c811b0e1cde5dbfdcc1cdab0d SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c +AUX 6.40.9.27553/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 +AUX 6.40.9.27553/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 +AUX 6.40.9.27553/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f +AUX 6.40.9.27553/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 c9b89cad232b513db8dad25dba9a7a3b6cdcf007 SHA1 c4d332881ab985f817c8d5c4848f4ec2be91d050 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 +AUX 6.40.9.27553/zarafa-6.40.2-sysconfig2confd-1.patch 8495 RMD160 f747da766c1777121f04c12f4cb3bee9ec56b7f8 SHA1 44e5a9487497080933de75d55311c97dfc7fc8fc SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 +AUX 6.40.9.27553/zarafa-6.40.6-force_latin1.patch 618 RMD160 8fc093050c3368c770d11326cf2402511f8d7c14 SHA1 5a7a6669308166ffb8117090411c3df9827408aa SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 +AUX 6.40.9.27553/zarafa-6.40.6-package.patch 2135 RMD160 30804eb455510967a5cfc2f9fe9bd699f906a9df SHA1 725f55210166e3453eae6bb58d1a417c6b0021ad SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d +AUX 7.0.0.3.25734/fix-pthread.patch 2257 RMD160 742d533a64090b865e62dae0ab170c4a66c11896 SHA1 b9a360f9e822bed5547308e96b3635c69012ec26 SHA256 f2ac2d45a8bc7fd91e3df1a8096f0f779cad34a75a205cc98a8faab814243c7a +AUX 7.0.0.3.25734/fix-zarafaserver-uuid-linkage.patch 707 RMD160 18b4c44f603b215e5b01262356c45e30a02dc57b SHA1 a0f6569a25e538f2a8b529fd46bc0e9fe0993590 SHA256 93eb0bfb9e539fe96b6cc936e2096b53e327e7f7c904e91eabedafe6070e18cf +AUX 7.0.0.3.25734/fix-zarafastats-uuid-linkage.patch 542 RMD160 bc73d6373502e2fcff435369a34df87c8dbbd8e9 SHA1 5e4634de179ff03e6527e219066ea1be0711f2c7 SHA256 c9e3a60291c4268635064099856baea58c8340cb37fd7302446a225ed0b45141 +AUX 7.0.0.3.25734/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 7112bfd1b5c1bf628f33521138d76ebdc9e8fa84 SHA1 638f39aa252c644362952becd5eb28fe06db8743 SHA256 c66f888d89a07c2c962f60aae81dee5b97cc2f0c0d4b5f725309f9f7509bea55 +AUX 7.0.0.3.25734/zarafa-6.40.2-sysconfig2confd-1.patch 8497 RMD160 1838567e668a32833d22e286defa73877cb515d2 SHA1 4ce13564cfc80598636b1c94028db3613feeb98c SHA256 cd1128ec66f18c887b6b304648e3a94b9aea782e363a303fc636b8f66b43fc5f +AUX 7.0.0.3.25734/zarafa-7.0.0-package.patch 1784 RMD160 758723bb63c1cfcac251f73aa8141a93a912f37f SHA1 e201be373c5840021dfaf9ecd59078e3547578d1 SHA256 91850122f5abb6754d726fb447d8fa03be134d823232397c6934facff28dfdde +AUX junklearn.dspam 924 RMD160 84a39d3297c075f3e4906b40cd84be8e47b90690 SHA1 cfd81182aaec691e7f415709d0db3189bbf9366c SHA256 5060aa1c0fd3e103c0243f5372ec4a393d4aebc7ed7c69a9475adead50d6b37e +AUX zarafa-dagent.rc6 2016 RMD160 45cbcb81da30a34be4202f3d9b84f38b12ecf57b SHA1 aaccebd9658dc8da88a32f7300922557fd4c621c SHA256 696d0f7b0c41814ca15d775b0595eb46b95fc59e1cf2a30935eba2c717ff16d6 +AUX zarafa-gateway.rc6 747 RMD160 c6094f036814bb289eade6f309b9c48ed6b683d5 SHA1 6182824447f9373badf2b2536d41190451fbceb0 SHA256 d08eb9eb5e548dca24e644aee4196aa135ef79d74d244675eeb9ea47594311b0 +AUX zarafa-ical.rc6 663 RMD160 db306a10e7777889e9460488575cbdd1ddc9037e SHA1 8fa807d0da22ab4fc1f3156c3a7dc0fe3cdab1ad SHA256 1eec0c538a0264eb2757b5687c8285394f899740bc4cba913115f82ccab703e2 +AUX zarafa-indexer.rc6 720 RMD160 93d56a3be2c13e98a4aed6b6cc930a500d297d37 SHA1 7626c82c7f76163ba440c893ef84748d128e46c4 SHA256 39db611a8f3f0952dfb72b00b77bd3dbe760d99c21551e5a6769c7011722ae5a +AUX zarafa-licensed.rc6 719 RMD160 8c52c285698bdf307335fbd34b3cf745c4aa5f59 SHA1 ac6933fa631b57f81526a6da4242c5525f7d4882 SHA256 84d511f27ed2a024d670ce042359dc9489ce4041ca447fe98e006bd53345c25f +AUX zarafa-monitor.rc6 705 RMD160 d1e524b7ed48ec5b53594595a35d4fb3c02b1a5a SHA1 d9cbd4df039ae95048bc53edcd4c1968166fdde4 SHA256 6d7cc1b2f0c7049f28dccf0d65530f1075e932898ab9b7d68cd73ffc2e4dd6e9 +AUX zarafa-server.rc6 706 RMD160 d3734a455367d93d316fca873e79467f624b97a2 SHA1 e819806ba99c5b5d4c195cfbace7b4027b053976 SHA256 5a8553127bc529350cf56ea35b558e1d276ca0d4bde92a32583d62d0d790fa4f +AUX zarafa-spooler.rc6 705 RMD160 a2981b8e9b60df19d5adce5507ec51ac6d5b12e8 SHA1 09527095beb3891986656cb0e1c53414b7f038bf SHA256 4cf183daf6d86e2bb39073993af8f244bc28ee90feb4cf1ba34e5302894aa2fe +AUX zarafa.logrotate 1857 RMD160 d295f5307be6577d3f8fdc89edc7995adae2fd47 SHA1 7188133da91ad6d453811ff5e67d84fde49b4fb9 SHA256 44e26d9ad5eff2e159388698a068df72d9626d91e9be478be00b3e3eaa15913f +DIST zcp-6.40.8-27223-sles-11-i586-free.tar.gz 24048189 RMD160 442e433cb7a0da8081a5def4c8c6ac6770a24b10 SHA1 dec7d3e8fa8ad4bf5fd162ebb3b1fd2e2d3d71b4 SHA256 99a010e216e7d49d2d6b07fd33f265a08829f01d7ed85f2dd832e8809c1c72a1 +DIST zcp-6.40.8-27223-sles-11-x86_64-free.tar.gz 24001656 RMD160 d4f8474b47378b28e8e8374141c03eedff9b3666 SHA1 775f53bb7d5c35cfb596f87e99b5278ef77420eb SHA256 ba5fed41d6fee39dc969e711a7edbf76e7640ca5c77e28c9be6d11f026a99b30 +DIST zcp-6.40.8.tar.gz 5428506 RMD160 36ce2095a1d0126a43405ac50b289107910feeaf SHA1 6c342a725610fb38dc6a5cef6e0d9bc160252fd4 SHA256 206bb736731f5b3c3fdc0d34c495b8c2af9e3245770d8636bc97d06ff7363023 +DIST zcp-6.40.9-27553-sles-11-i586-free.tar.gz 24074176 RMD160 f540590d7f371c9b51ca15cd562a77e7fc5d7cbc SHA1 2094481bcbe976d2ed8b63d9e951091033763edb SHA256 1f3fd302b6c3f79f14798da21a61ae3e63f836e0545e4a7e6bdecba26a9a6479 +DIST zcp-6.40.9-27553-sles-11-x86_64-free.tar.gz 24027236 RMD160 f1612ccf825eed9ea8eaf1fb675460eca9b2ac25 SHA1 5de01cbc7d1d3d2051be9a897de18223abccc3e2 SHA256 ef21788f2864210d801c9d258ec97fad670c8fb00c9200dbb9e0c023e22ce035 +DIST zcp-6.40.9.tar.gz 5434001 RMD160 6a14d627dfbdf77c17839e1ab8840695af9e3b34 SHA1 7cf5b7d08d521571d00e06c9f97a8498b8fe49eb SHA256 23653649497b0b26322b8152c639eec1087727d2370947050c239dc3d7c1f03d +DIST zcp-7.0.0.tar.gz 5898702 RMD160 dfc0958b69ebe4931e07de50f63c236b38f08aaf SHA1 fefc92f21a609bdfcab8de635076476045141c4c SHA256 3f48614df5faf151cd8eb32adce8fd23253a22d3c52b10a4bcb003968da3a900 +DIST zcp-7.0.0beta3-25734-sles-11-i586-free.tar.gz 25242652 RMD160 8f3710fc09b0b2ca80e80ae4f3c3a041d2808b19 SHA1 d601974e823700623c0d8b3e3496b43f3dbca115 SHA256 1648c3200d9249baa50ed8d43e46f78535a643d9042a3a5d7e8bfff27aa0fc2a +DIST zcp-7.0.0beta3-25734-sles-11-x86_64-free.tar.gz 25165278 RMD160 8925b89c1107d4530397275bfd14bf14e7ae55d9 SHA1 f4e5877ab6b47c6e2e57a805d308720842b2e24e SHA256 6d9db4530621cffc40797511fb4757f3c259a48c9f9d4a3515aefd0ec7437e4d +EBUILD zarafa-6.40.8.27223.ebuild 6562 RMD160 0d88521a3df488a6a4f6db647650e36b9dcbc5a2 SHA1 39b80abe3e75efc224756c795502d01b6d6b4861 SHA256 f1dced5ca8ce4b69ae4ff5b9c8972dd97619f271bbb679195c440de24f9893be +EBUILD zarafa-6.40.9.27553.ebuild 6562 RMD160 0d88521a3df488a6a4f6db647650e36b9dcbc5a2 SHA1 39b80abe3e75efc224756c795502d01b6d6b4861 SHA256 f1dced5ca8ce4b69ae4ff5b9c8972dd97619f271bbb679195c440de24f9893be +EBUILD zarafa-7.0.0.3.25734.ebuild 6767 RMD160 7cfdab79030913daa2f8c64114a25db32dbda881 SHA1 b159c7d13e2b7f50a8aa9e5e0f7b730b25b422f8 SHA256 a51e0f2b582e03f2f3d755cbf0ae3aded472edacd614fbfbedb758e34f8e1ec7 +MISC ChangeLog 6309 RMD160 2a5ec7b8aaadf920c8fb55121b3407f5a99005f5 SHA1 890a7dc6d847646f9e9b955d232c2163a2f8fc53 SHA256 5852a02af3efc2da467d5496dae249273c8804a367f853c2bda01e2055f72124 +MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/net-mail/zarafa/files/50_zarafa-webaccess-mobile.conf b/net-mail/zarafa/files/50_zarafa-webaccess-mobile.conf new file mode 100644 index 0000000..cf63fef --- /dev/null +++ b/net-mail/zarafa/files/50_zarafa-webaccess-mobile.conf @@ -0,0 +1,12 @@ + + Alias /webaccess-mobile /usr/share/zarafa-webaccess-mobile + + + DirectoryIndex index.php + Options -Indexes +FollowSymLinks + AllowOverride Options + + Order allow,deny + Allow from all + + diff --git a/net-mail/zarafa/files/50_zarafa-webaccess.conf b/net-mail/zarafa/files/50_zarafa-webaccess.conf new file mode 100644 index 0000000..b96147d --- /dev/null +++ b/net-mail/zarafa/files/50_zarafa-webaccess.conf @@ -0,0 +1,12 @@ + + Alias /webaccess /usr/share/zarafa-webaccess + + + DirectoryIndex index.php + Options -Indexes +FollowSymLinks + AllowOverride Options + + Order allow,deny + Allow from all + + diff --git a/net-mail/zarafa/files/6.40.8.27223/Datux-sendas.patch b/net-mail/zarafa/files/6.40.8.27223/Datux-sendas.patch new file mode 100644 index 0000000..d42326f --- /dev/null +++ b/net-mail/zarafa/files/6.40.8.27223/Datux-sendas.patch @@ -0,0 +1,25 @@ +diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp +--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000 ++++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000 +@@ -935,6 +935,7 @@ + { "fax_domain", "", CONFIGSETTING_RELOADABLE }, + { "fax_international", "+", CONFIGSETTING_RELOADABLE }, + { "always_send_delegates", "no", CONFIGSETTING_RELOADABLE }, ++ { "always_send_as", "no", CONFIGSETTING_RELOADABLE }, + { "always_send_tnef", "no", CONFIGSETTING_RELOADABLE }, + { "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE }, + { "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE }, +diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp +--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000 ++++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000 +@@ -1949,6 +1949,10 @@ + HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b) + { + bAllowSendAs = true; ++ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) { ++ //use always_send_as to allow everybody to send as someone else. ++ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration) ++ bAllowSendAs = true; + } else { + + hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner); diff --git a/net-mail/zarafa/files/6.40.8.27223/Datux-spamhook.patch b/net-mail/zarafa/files/6.40.8.27223/Datux-spamhook.patch new file mode 100644 index 0000000..c35d6d2 --- /dev/null +++ b/net-mail/zarafa/files/6.40.8.27223/Datux-spamhook.patch @@ -0,0 +1,199 @@ +diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp +--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200 ++++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200 +@@ -7244,6 +7244,166 @@ typedef struct{ + SOURCEKEY sSourceKey; + SOURCEKEY sParentSourceKey; + }COPYITEM; ++//SPAM HOOK ++//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments: ++//ham or spam ++//message id ++//and pipes the mail header to the script. ++//This script wil be inhaled by MoveObjects(); ++///////////////////////////////////////////////////////////////////////////////////////////////// ++int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId) ++{ ++ ++ ALLOC_DBRESULT(); ++ ECRESULT er = erSuccess; ++ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script"); ++ ++ //If shScriptPath doesn't exist skip spam hook. ++ if(fopen(shScriptPath.c_str(),"r")) { ++ ++ //Get store object ID via message object id ++ unsigned int storeId; ++ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL); ++ if(er != erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder."); ++ goto exit; ++ } ++ ++ //get deleted items folder entry id ++ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID)); ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult); ++ int shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ if(shNumRows<1) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result."); ++ goto exit; ++ } ++ ++ //Convert 'deleted items' entryid to objectid. ++ entryId* wasteBucketEntryId = new entryId[0]; ++ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0]; ++ wasteBucketEntryId->__size=lpDBLen[0]; ++ unsigned int wasteBucketFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId); ++ delete wasteBucketEntryId; ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID."); ++ goto exit; ++ } ++ FREE_DBRESULT(); ++ ++ //Get 'junk folder' entryId. ++ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4"; ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult); ++ shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ if(shNumRows<1) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result."); ++ goto exit; ++ } ++ ++ //Convert 'junk folder' entryid to objectid. ++ entryId* junkFolderEntryId = new entryId[0]; ++ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0]; ++ junkFolderEntryId->__size=lpDBLen[0]; ++ unsigned int junkFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId); ++ delete junkFolderEntryId; ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID."); ++ goto exit; ++ } ++ FREE_DBRESULT(); ++ ++ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.) ++ unsigned int srcFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId); ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id."); ++ goto exit; ++ } ++ ++ //Check if object is ham or spam ++ string shMailStatus; ++ //if destination folder is junk, mark as spam ++ if(ulDestFolderId==junkFolderId) ++ shMailStatus="spam"; ++ else ++ { ++ //if destination folder is not TRASH and de source folder is JUNK, mark as ham ++ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId) ++ shMailStatus="ham"; ++ } ++ ++ //Only call hook script if the mail is marked as ham or spam. ++ if(!shMailStatus.empty()) { ++ ++ //Get the mail from the DB. ++ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId); ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ int shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ ++ if(shNumRows>0) { ++ ++ // Execute the hook: ++ FILE *shFilePtr; ++ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId); ++ shFilePtr=popen(shScriptPath.c_str(),"w"); ++ fputs(lpDBRow[0],shFilePtr); ++ int shExitCode=pclose(shFilePtr); ++ if(!WIFEXITED(shExitCode)) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally."); ++ goto exit; ++ } ++ //If script exit with non 0, exit.. ++ if(WEXITSTATUS(shExitCode)!=0) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode)); ++ er=ZARAFA_E_UNKNOWN; ++ goto exit; ++ } ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed."); ++ er=erSuccess; ++ } ++ else { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail"); ++ } ++ ++ // Free database results ++ FREE_DBRESULT(); ++ } ++ } ++ else { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found"); ++ er=erSuccess; ++ } ++exit: ++ // Free database results ++ FREE_DBRESULT(); ++ ++ return er; ++} ++ + + // Move one or more messages and/or moved a softdeleted message to a normal message + ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId) +@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result, + + // @note The object type checking wille be done in MoveObjects or CopyObject + ++//SPAMHOOK ++///////////////////////////////////// ++ //Iterate over all mail ids and initiate spamhook. ++ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++) ++ { ++ //Ignore the result ++ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId); ++ } ++//SPAMHOOK END ++//////////////////////////////////// ++ + //check copy or a move + if(ulFlags & FOLDER_MOVE ) { // A move + er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId); +diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp +--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200 ++++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200 +@@ -670,6 +670,7 @@ int running_server(char *szName, char *s + { "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE}, + { "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE }, + { "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE }, ++ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE }, + { "user_safe_mode", "no", CONFIGSETTING_RELOADABLE }, + + // Storename format diff --git a/net-mail/zarafa/files/6.40.8.27223/fix-pthread.patch b/net-mail/zarafa/files/6.40.8.27223/fix-pthread.patch new file mode 100644 index 0000000..b374366 --- /dev/null +++ b/net-mail/zarafa/files/6.40.8.27223/fix-pthread.patch @@ -0,0 +1,51 @@ +diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh +--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100 ++++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100 +@@ -1628,7 +1628,7 @@ + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) +- # Do not include libc_r directly, use -pthread flag. ++ # Do not include libc_r directly, use -lpthread flag. + continue + ;; + esac +@@ -1647,7 +1647,7 @@ + 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 @@ + 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" +diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac +--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100 ++++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100 +@@ -407,7 +407,7 @@ + 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" +@@ -561,7 +561,7 @@ + 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 diff --git a/net-mail/zarafa/files/6.40.8.27223/fix-zarafaserver-uuid-linkage.patch b/net-mail/zarafa/files/6.40.8.27223/fix-zarafaserver-uuid-linkage.patch new file mode 100644 index 0000000..610b74d --- /dev/null +++ b/net-mail/zarafa/files/6.40.8.27223/fix-zarafaserver-uuid-linkage.patch @@ -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 \ diff --git a/net-mail/zarafa/files/6.40.8.27223/fix-zarafastats-uuid-linkage.patch b/net-mail/zarafa/files/6.40.8.27223/fix-zarafastats-uuid-linkage.patch new file mode 100644 index 0000000..05e1406 --- /dev/null +++ b/net-mail/zarafa/files/6.40.8.27223/fix-zarafastats-uuid-linkage.patch @@ -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 diff --git a/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.1-no-php-conf.patch b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.1-no-php-conf.patch new file mode 100644 index 0000000..9e51f09 --- /dev/null +++ b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.1-no-php-conf.patch @@ -0,0 +1,44 @@ +--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100 ++++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100 +@@ -34,7 +34,7 @@ + build_triplet = @build@ + host_triplet = @host@ + subdir = php-ext +-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \ ++DIST_COMMON = $(dist_data_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -86,7 +86,7 @@ + DIST_SOURCES = $(mapi_la_SOURCES) + dist_dataDATA_INSTALL = $(INSTALL_DATA) + dist_sysconfDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(dist_data_DATA) $(dist_sysconf_DATA) ++DATA = $(dist_data_DATA) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -406,23 +406,6 @@ + echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \ + rm -f "$(DESTDIR)$(datadir)/$$f"; \ + done +-install-dist_sysconfDATA: $(dist_sysconf_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" +- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ +- done +- +-uninstall-dist_sysconfDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \ +- done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ diff --git a/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch new file mode 100644 index 0000000..0c69fa7 --- /dev/null +++ b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch @@ -0,0 +1,19 @@ +Submitted By: Mario Fetka ( mario.fetka@gmaail.com) +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 diff --git a/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch new file mode 100644 index 0000000..ed8f328 --- /dev/null +++ b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch @@ -0,0 +1,187 @@ +Submitted By: Mario Fetka (mario.fetka@gmail.com) +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 diff --git a/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-force_latin1.patch b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-force_latin1.patch new file mode 100644 index 0000000..82ada47 --- /dev/null +++ b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-force_latin1.patch @@ -0,0 +1,14 @@ +diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp +--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100 ++++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100 +@@ -343,6 +343,10 @@ + // this option was introduced in mysql 5.0, so let's not even try on 4.1 servers + strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'"; + Query(strQuery); // ignore error ++ ++ // Latin1 is default charset ++ strQuery = "SET NAMES 'latin1'"; ++ Query(strQuery); + } + + exit: diff --git a/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-package.patch b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-package.patch new file mode 100644 index 0000000..e311bb2 --- /dev/null +++ b/net-mail/zarafa/files/6.40.8.27223/zarafa-6.40.6-package.patch @@ -0,0 +1,65 @@ +Patch by Robert Scheck 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. + +forward patch by Mario Fetka + +diff -uNr zarafa-6.40.6,orig//ECtools/Makefile.am zarafa-6.40.6/ECtools/Makefile.am +--- zarafa-6.40.6,orig//ECtools/Makefile.am 2011-03-20 08:34:03.000000000 +0100 ++++ zarafa-6.40.6/ECtools/Makefile.am 2011-03-20 08:36:31.000000000 +0100 +@@ -1,7 +1,3 @@ +-if ! OSS_ONLY +-PROSUBS = zarafa-backup zarafa-report +-endif +- + if WITH_TESTTOOLS + TESTSUBS = ECTestTools + endif +diff -uNr zarafa-6.40.6,orig//Makefile.am zarafa-6.40.6/Makefile.am +--- zarafa-6.40.6,orig//Makefile.am 2011-03-20 08:34:03.000000000 +0100 ++++ zarafa-6.40.6/Makefile.am 2011-03-20 08:35:57.000000000 +0100 +@@ -1,10 +1,6 @@ + AUTOMAKE_OPTIONS = 1.9 foreign + ACLOCAL_AMFLAGS = -Iautoconf + +-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_SWIG +@@ -26,10 +22,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 +diff -uNr zarafa-6.40.6,orig//configure.ac zarafa-6.40.6/configure.ac +--- zarafa-6.40.6,orig//configure.ac 2011-03-20 08:34:03.000000000 +0100 ++++ zarafa-6.40.6/configure.ac 2011-03-20 08:35:16.000000000 +0100 +@@ -808,17 +808,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 +- debian/zarafa.install +-]) +-fi + + AC_OUTPUT + diff --git a/net-mail/zarafa/files/6.40.9.27553/Datux-sendas.patch b/net-mail/zarafa/files/6.40.9.27553/Datux-sendas.patch new file mode 100644 index 0000000..d42326f --- /dev/null +++ b/net-mail/zarafa/files/6.40.9.27553/Datux-sendas.patch @@ -0,0 +1,25 @@ +diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp +--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000 ++++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000 +@@ -935,6 +935,7 @@ + { "fax_domain", "", CONFIGSETTING_RELOADABLE }, + { "fax_international", "+", CONFIGSETTING_RELOADABLE }, + { "always_send_delegates", "no", CONFIGSETTING_RELOADABLE }, ++ { "always_send_as", "no", CONFIGSETTING_RELOADABLE }, + { "always_send_tnef", "no", CONFIGSETTING_RELOADABLE }, + { "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE }, + { "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE }, +diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp +--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000 ++++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000 +@@ -1949,6 +1949,10 @@ + HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b) + { + bAllowSendAs = true; ++ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) { ++ //use always_send_as to allow everybody to send as someone else. ++ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration) ++ bAllowSendAs = true; + } else { + + hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner); diff --git a/net-mail/zarafa/files/6.40.9.27553/Datux-spamhook.patch b/net-mail/zarafa/files/6.40.9.27553/Datux-spamhook.patch new file mode 100644 index 0000000..c35d6d2 --- /dev/null +++ b/net-mail/zarafa/files/6.40.9.27553/Datux-spamhook.patch @@ -0,0 +1,199 @@ +diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp +--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200 ++++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200 +@@ -7244,6 +7244,166 @@ typedef struct{ + SOURCEKEY sSourceKey; + SOURCEKEY sParentSourceKey; + }COPYITEM; ++//SPAM HOOK ++//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments: ++//ham or spam ++//message id ++//and pipes the mail header to the script. ++//This script wil be inhaled by MoveObjects(); ++///////////////////////////////////////////////////////////////////////////////////////////////// ++int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId) ++{ ++ ++ ALLOC_DBRESULT(); ++ ECRESULT er = erSuccess; ++ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script"); ++ ++ //If shScriptPath doesn't exist skip spam hook. ++ if(fopen(shScriptPath.c_str(),"r")) { ++ ++ //Get store object ID via message object id ++ unsigned int storeId; ++ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL); ++ if(er != erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder."); ++ goto exit; ++ } ++ ++ //get deleted items folder entry id ++ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID)); ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult); ++ int shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ if(shNumRows<1) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result."); ++ goto exit; ++ } ++ ++ //Convert 'deleted items' entryid to objectid. ++ entryId* wasteBucketEntryId = new entryId[0]; ++ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0]; ++ wasteBucketEntryId->__size=lpDBLen[0]; ++ unsigned int wasteBucketFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId); ++ delete wasteBucketEntryId; ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID."); ++ goto exit; ++ } ++ FREE_DBRESULT(); ++ ++ //Get 'junk folder' entryId. ++ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4"; ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult); ++ shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ if(shNumRows<1) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result."); ++ goto exit; ++ } ++ ++ //Convert 'junk folder' entryid to objectid. ++ entryId* junkFolderEntryId = new entryId[0]; ++ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0]; ++ junkFolderEntryId->__size=lpDBLen[0]; ++ unsigned int junkFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId); ++ delete junkFolderEntryId; ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID."); ++ goto exit; ++ } ++ FREE_DBRESULT(); ++ ++ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.) ++ unsigned int srcFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId); ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id."); ++ goto exit; ++ } ++ ++ //Check if object is ham or spam ++ string shMailStatus; ++ //if destination folder is junk, mark as spam ++ if(ulDestFolderId==junkFolderId) ++ shMailStatus="spam"; ++ else ++ { ++ //if destination folder is not TRASH and de source folder is JUNK, mark as ham ++ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId) ++ shMailStatus="ham"; ++ } ++ ++ //Only call hook script if the mail is marked as ham or spam. ++ if(!shMailStatus.empty()) { ++ ++ //Get the mail from the DB. ++ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId); ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ int shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ ++ if(shNumRows>0) { ++ ++ // Execute the hook: ++ FILE *shFilePtr; ++ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId); ++ shFilePtr=popen(shScriptPath.c_str(),"w"); ++ fputs(lpDBRow[0],shFilePtr); ++ int shExitCode=pclose(shFilePtr); ++ if(!WIFEXITED(shExitCode)) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally."); ++ goto exit; ++ } ++ //If script exit with non 0, exit.. ++ if(WEXITSTATUS(shExitCode)!=0) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode)); ++ er=ZARAFA_E_UNKNOWN; ++ goto exit; ++ } ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed."); ++ er=erSuccess; ++ } ++ else { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail"); ++ } ++ ++ // Free database results ++ FREE_DBRESULT(); ++ } ++ } ++ else { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found"); ++ er=erSuccess; ++ } ++exit: ++ // Free database results ++ FREE_DBRESULT(); ++ ++ return er; ++} ++ + + // Move one or more messages and/or moved a softdeleted message to a normal message + ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId) +@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result, + + // @note The object type checking wille be done in MoveObjects or CopyObject + ++//SPAMHOOK ++///////////////////////////////////// ++ //Iterate over all mail ids and initiate spamhook. ++ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++) ++ { ++ //Ignore the result ++ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId); ++ } ++//SPAMHOOK END ++//////////////////////////////////// ++ + //check copy or a move + if(ulFlags & FOLDER_MOVE ) { // A move + er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId); +diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp +--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200 ++++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200 +@@ -670,6 +670,7 @@ int running_server(char *szName, char *s + { "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE}, + { "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE }, + { "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE }, ++ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE }, + { "user_safe_mode", "no", CONFIGSETTING_RELOADABLE }, + + // Storename format diff --git a/net-mail/zarafa/files/6.40.9.27553/fix-pthread.patch b/net-mail/zarafa/files/6.40.9.27553/fix-pthread.patch new file mode 100644 index 0000000..b374366 --- /dev/null +++ b/net-mail/zarafa/files/6.40.9.27553/fix-pthread.patch @@ -0,0 +1,51 @@ +diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh +--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100 ++++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100 +@@ -1628,7 +1628,7 @@ + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) +- # Do not include libc_r directly, use -pthread flag. ++ # Do not include libc_r directly, use -lpthread flag. + continue + ;; + esac +@@ -1647,7 +1647,7 @@ + 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 @@ + 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" +diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac +--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100 ++++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100 +@@ -407,7 +407,7 @@ + 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" +@@ -561,7 +561,7 @@ + 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 diff --git a/net-mail/zarafa/files/6.40.9.27553/fix-zarafaserver-uuid-linkage.patch b/net-mail/zarafa/files/6.40.9.27553/fix-zarafaserver-uuid-linkage.patch new file mode 100644 index 0000000..610b74d --- /dev/null +++ b/net-mail/zarafa/files/6.40.9.27553/fix-zarafaserver-uuid-linkage.patch @@ -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 \ diff --git a/net-mail/zarafa/files/6.40.9.27553/fix-zarafastats-uuid-linkage.patch b/net-mail/zarafa/files/6.40.9.27553/fix-zarafastats-uuid-linkage.patch new file mode 100644 index 0000000..05e1406 --- /dev/null +++ b/net-mail/zarafa/files/6.40.9.27553/fix-zarafastats-uuid-linkage.patch @@ -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 diff --git a/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.1-no-php-conf.patch b/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.1-no-php-conf.patch new file mode 100644 index 0000000..9e51f09 --- /dev/null +++ b/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.1-no-php-conf.patch @@ -0,0 +1,44 @@ +--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100 ++++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100 +@@ -34,7 +34,7 @@ + build_triplet = @build@ + host_triplet = @host@ + subdir = php-ext +-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \ ++DIST_COMMON = $(dist_data_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -86,7 +86,7 @@ + DIST_SOURCES = $(mapi_la_SOURCES) + dist_dataDATA_INSTALL = $(INSTALL_DATA) + dist_sysconfDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(dist_data_DATA) $(dist_sysconf_DATA) ++DATA = $(dist_data_DATA) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -406,23 +406,6 @@ + echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \ + rm -f "$(DESTDIR)$(datadir)/$$f"; \ + done +-install-dist_sysconfDATA: $(dist_sysconf_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" +- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ +- done +- +-uninstall-dist_sysconfDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \ +- done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ diff --git a/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.2-libtcmalloc_shared-1.patch b/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.2-libtcmalloc_shared-1.patch new file mode 100644 index 0000000..0c69fa7 --- /dev/null +++ b/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.2-libtcmalloc_shared-1.patch @@ -0,0 +1,19 @@ +Submitted By: Mario Fetka ( mario.fetka@gmaail.com) +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 diff --git a/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.2-sysconfig2confd-1.patch b/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.2-sysconfig2confd-1.patch new file mode 100644 index 0000000..ed8f328 --- /dev/null +++ b/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.2-sysconfig2confd-1.patch @@ -0,0 +1,187 @@ +Submitted By: Mario Fetka (mario.fetka@gmail.com) +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 diff --git a/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.6-force_latin1.patch b/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.6-force_latin1.patch new file mode 100644 index 0000000..82ada47 --- /dev/null +++ b/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.6-force_latin1.patch @@ -0,0 +1,14 @@ +diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp +--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100 ++++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100 +@@ -343,6 +343,10 @@ + // this option was introduced in mysql 5.0, so let's not even try on 4.1 servers + strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'"; + Query(strQuery); // ignore error ++ ++ // Latin1 is default charset ++ strQuery = "SET NAMES 'latin1'"; ++ Query(strQuery); + } + + exit: diff --git a/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.6-package.patch b/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.6-package.patch new file mode 100644 index 0000000..e311bb2 --- /dev/null +++ b/net-mail/zarafa/files/6.40.9.27553/zarafa-6.40.6-package.patch @@ -0,0 +1,65 @@ +Patch by Robert Scheck 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. + +forward patch by Mario Fetka + +diff -uNr zarafa-6.40.6,orig//ECtools/Makefile.am zarafa-6.40.6/ECtools/Makefile.am +--- zarafa-6.40.6,orig//ECtools/Makefile.am 2011-03-20 08:34:03.000000000 +0100 ++++ zarafa-6.40.6/ECtools/Makefile.am 2011-03-20 08:36:31.000000000 +0100 +@@ -1,7 +1,3 @@ +-if ! OSS_ONLY +-PROSUBS = zarafa-backup zarafa-report +-endif +- + if WITH_TESTTOOLS + TESTSUBS = ECTestTools + endif +diff -uNr zarafa-6.40.6,orig//Makefile.am zarafa-6.40.6/Makefile.am +--- zarafa-6.40.6,orig//Makefile.am 2011-03-20 08:34:03.000000000 +0100 ++++ zarafa-6.40.6/Makefile.am 2011-03-20 08:35:57.000000000 +0100 +@@ -1,10 +1,6 @@ + AUTOMAKE_OPTIONS = 1.9 foreign + ACLOCAL_AMFLAGS = -Iautoconf + +-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_SWIG +@@ -26,10 +22,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 +diff -uNr zarafa-6.40.6,orig//configure.ac zarafa-6.40.6/configure.ac +--- zarafa-6.40.6,orig//configure.ac 2011-03-20 08:34:03.000000000 +0100 ++++ zarafa-6.40.6/configure.ac 2011-03-20 08:35:16.000000000 +0100 +@@ -808,17 +808,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 +- debian/zarafa.install +-]) +-fi + + AC_OUTPUT + diff --git a/net-mail/zarafa/files/7.0.0.3.25734/fix-pthread.patch b/net-mail/zarafa/files/7.0.0.3.25734/fix-pthread.patch new file mode 100644 index 0000000..0d743c0 --- /dev/null +++ b/net-mail/zarafa/files/7.0.0.3.25734/fix-pthread.patch @@ -0,0 +1,53 @@ +diff -uNr zarafa-7.0.0.orig//autoconf/ltmain.sh zarafa-7.0.0/autoconf/ltmain.sh +--- zarafa-7.0.0.orig//autoconf/ltmain.sh 2011-03-22 06:51:06.000000000 +0100 ++++ zarafa-7.0.0/autoconf/ltmain.sh 2011-03-22 06:52:20.000000000 +0100 +@@ -1628,7 +1628,7 @@ + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) +- # Do not include libc_r directly, use -pthread flag. ++ # Do not include libc_r directly, use -lpthread flag. + continue + ;; + esac +@@ -1647,7 +1647,7 @@ + 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 @@ + 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" +diff -uNr zarafa-7.0.0.orig//configure.ac zarafa-7.0.0/configure.ac +--- zarafa-7.0.0.orig//configure.ac 2011-03-22 06:51:05.000000000 +0100 ++++ zarafa-7.0.0/configure.ac 2011-03-22 06:52:44.000000000 +0100 +@@ -99,8 +99,8 @@ + fi + + # Everything uses pthread +-# check lib, but do not set in link list, but use -pthread instead (gnu c/c++ only?) +-AC_CHECK_LIB([pthread], [pthread_create], [ZCXXFLAGS="$ZCXXFLAGS -pthread"], AC_MSG_ERROR([required library libpthread missing or unusable])) ++# check lib, but do not set in link list, but use -lpthread instead (gnu c/c++ only?) ++AC_CHECK_LIB([pthread], [pthread_create], [ZCXXFLAGS="$ZCXXFLAGS -lpthread"], AC_MSG_ERROR([required library libpthread missing or unusable])) + + # + # enable/disable options +@@ -392,7 +392,7 @@ + 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" diff --git a/net-mail/zarafa/files/7.0.0.3.25734/fix-zarafaserver-uuid-linkage.patch b/net-mail/zarafa/files/7.0.0.3.25734/fix-zarafaserver-uuid-linkage.patch new file mode 100644 index 0000000..575c35d --- /dev/null +++ b/net-mail/zarafa/files/7.0.0.3.25734/fix-zarafaserver-uuid-linkage.patch @@ -0,0 +1,12 @@ +diff -uNr zarafa-7.0.0.orig//provider/server/Makefile.am zarafa-7.0.0/provider/server/Makefile.am +--- zarafa-7.0.0.orig//provider/server/Makefile.am 2011-03-22 06:55:33.000000000 +0100 ++++ zarafa-7.0.0/provider/server/Makefile.am 2011-03-22 06:56:44.000000000 +0100 +@@ -20,7 +20,7 @@ + ${top_builddir}/common/libcommon_ssl.la \ + $(PROG_LIBS) \ + $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(ICU_LIBS) $(DL_LIBS) \ +- $(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 \ diff --git a/net-mail/zarafa/files/7.0.0.3.25734/fix-zarafastats-uuid-linkage.patch b/net-mail/zarafa/files/7.0.0.3.25734/fix-zarafastats-uuid-linkage.patch new file mode 100644 index 0000000..0039d89 --- /dev/null +++ b/net-mail/zarafa/files/7.0.0.3.25734/fix-zarafastats-uuid-linkage.patch @@ -0,0 +1,12 @@ +diff -uNr zarafa-7.0.0.orig//ECtools/zarafa-stats/Makefile.am zarafa-7.0.0/ECtools/zarafa-stats/Makefile.am +--- zarafa-7.0.0.orig//ECtools/zarafa-stats/Makefile.am 2011-03-22 06:59:53.000000000 +0100 ++++ zarafa-7.0.0/ECtools/zarafa-stats/Makefile.am 2011-03-22 07:00:47.000000000 +0100 +@@ -13,7 +13,7 @@ + ${top_builddir}/mapi4linux/src/libmapi.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_util.la \ +- $(PROG_LIBS) -lncurses ++ $(PROG_LIBS) -lncurses -luuid + + zarafa_stats_SOURCES = zarafa-stats.cpp + diff --git a/net-mail/zarafa/files/7.0.0.3.25734/zarafa-6.40.2-libtcmalloc_shared-1.patch b/net-mail/zarafa/files/7.0.0.3.25734/zarafa-6.40.2-libtcmalloc_shared-1.patch new file mode 100644 index 0000000..28dcc78 --- /dev/null +++ b/net-mail/zarafa/files/7.0.0.3.25734/zarafa-6.40.2-libtcmalloc_shared-1.patch @@ -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 diff --git a/net-mail/zarafa/files/7.0.0.3.25734/zarafa-6.40.2-sysconfig2confd-1.patch b/net-mail/zarafa/files/7.0.0.3.25734/zarafa-6.40.2-sysconfig2confd-1.patch new file mode 100644 index 0000000..93e4d0f --- /dev/null +++ b/net-mail/zarafa/files/7.0.0.3.25734/zarafa-6.40.2-sysconfig2confd-1.patch @@ -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 diff --git a/net-mail/zarafa/files/7.0.0.3.25734/zarafa-7.0.0-package.patch b/net-mail/zarafa/files/7.0.0.3.25734/zarafa-7.0.0-package.patch new file mode 100644 index 0000000..5785000 --- /dev/null +++ b/net-mail/zarafa/files/7.0.0.3.25734/zarafa-7.0.0-package.patch @@ -0,0 +1,53 @@ +diff -uNr zarafa-7.0.0.orig//ECtools/Makefile.am zarafa-7.0.0/ECtools/Makefile.am +--- zarafa-7.0.0.orig//ECtools/Makefile.am 2011-03-22 07:04:14.000000000 +0100 ++++ zarafa-7.0.0/ECtools/Makefile.am 2011-03-22 07:04:34.000000000 +0100 +@@ -1,5 +1,2 @@ +-if ! OSS_ONLY +-PROSUBS = zarafa-backup zarafa-report +-endif + + SUBDIRS = $(PROSUBS) zarafa-admin zarafa-monitor zarafa-passwd zarafa-fsck zarafa-cfgchecker zarafa-stats zarafa-archiver zarafa-indexer +diff -uNr zarafa-7.0.0.orig//Makefile.am zarafa-7.0.0/Makefile.am +--- zarafa-7.0.0.orig//Makefile.am 2011-03-22 07:04:14.000000000 +0100 ++++ zarafa-7.0.0/Makefile.am 2011-03-22 07:05:00.000000000 +0100 +@@ -1,9 +1,5 @@ + ACLOCAL_AMFLAGS = -I autoconf + +-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_SWIG +@@ -33,10 +29,6 @@ + # we force a clean, since if it's not clean, something will loop and eat up gigabytes of diskspace + (cd webaccess && ant clean && ant && ant deploy) + +-if ! OSS_ONLY +-CLEANFILES=common/ecversion.h +-endif +- + dist-hook: webaccess/deploy + find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true + if OSS_ONLY +diff -uNr zarafa-7.0.0.orig//configure.ac zarafa-7.0.0/configure.ac +--- zarafa-7.0.0.orig//configure.ac 2011-03-22 07:04:14.000000000 +0100 ++++ zarafa-7.0.0/configure.ac 2011-03-22 07:06:06.000000000 +0100 +@@ -737,16 +737,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 +-]) +-fi + + AC_OUTPUT + diff --git a/net-mail/zarafa/files/junklearn.dspam b/net-mail/zarafa/files/junklearn.dspam new file mode 100755 index 0000000..489c49f --- /dev/null +++ b/net-mail/zarafa/files/junklearn.dspam @@ -0,0 +1,35 @@ +#!/bin/bash + +#WARNING: Don't trust the piped input, its from the end-user. use filtering! + +IFS=$' '; + +DSPAM_CMD="/usr/bin/dspamc"; + +#Catch stdin en fetch signature and recipient. +DSPAM_HEADER="`sed 's/[^a-zA-Z0-9 :_.-]//g' | grep -i -e ^X-DSPAM-Signature: -e ^X-DSPAM-Recipient: | tail -n2` " || exit 1 +DSPAM_USER="`echo \"$DSPAM_HEADER\" | grep -i ^X-DSPAM-Recipient: | cut -d ' ' -f 2`"; +DSPAM_SIGNATURE="`echo \"$DSPAM_HEADER\" | grep -i ^X-DSPAM-Signature: | cut -d ' ' -f 2`"; + +#Catch parameters +STATUS="$1"; +MAIL_ID="$2"; + + +if [[ "$DSPAM_SIGNATURE" && "$DSPAM_USER" && "$STATUS" && "$MAIL_ID" ]]; then + if [ "$STATUS" == "ham" ]; then + CLASS="innocent"; + else + CLASS="spam"; + fi + + logger "$DSPAM_CMD --source=error --class=\"$CLASS\" --signature=\"$DSPAM_SIGNATURE\" --user \"$DSPAM_USER\"" + + $DSPAM_CMD --source=error --class="$CLASS" --signature="$DSPAM_SIGNATURE" --user "$DSPAM_USER"; + exit $?; +fi +exit 1; + + + + diff --git a/net-mail/zarafa/files/zarafa-dagent.rc6 b/net-mail/zarafa/files/zarafa-dagent.rc6 new file mode 100644 index 0000000..4e124fe --- /dev/null +++ b/net-mail/zarafa/files/zarafa-dagent.rc6 @@ -0,0 +1,69 @@ +#!/sbin/runscript +# +# zarafa-dagent Zarafa Outlook Sharing LMTP Delivery agent +# +# chkconfig: - 86 24 +# description: The Zarafa Delivery agent in LMTP mode can be used to \ +# run the zarafa-dagent in daemon mode and let your SMTP \ +# server connect to it to deliver email to users using \ +# the LMTP protocol. The Zarafa Delivery agent can also \ +# be used as a standalone program. +# processname: /usr/bin/zarafa-dagent +# config: /etc/zarafa/dagent.cfg +# pidfile: /var/run/zarafa-dagent.pid + +### BEGIN INIT INFO +# Provides: zarafa-dagent +# Required-Start: $local_fs $network $remote_fs $syslog +# Required-Stop: $local_fs $network $remote_fs $syslog +# Should-Start: zarafa-server +# Should-Stop: zarafa-server +# Short-Description: Zarafa Outlook Sharing LMTP Delivery agent +# Description: The Zarafa Delivery agent in LMTP mode can be used to run +# the zarafa-dagent in daemon mode and let your SMTP server +# connect to it to deliver email to users using the LMTP +# protocol. The Zarafa Delivery agent can also be used as a +# standalone program. +### END INIT INFO + +DAGENTCONFIG=/etc/zarafa/dagent.cfg +DAGENTPROGRAM=/usr/bin/zarafa-dagent + +# Sanity checks. +[ -x $DAGENTPROGRAM ] || exit 0 + +# the -d option is required to run LMTP mode deamonized +DAGENTCONFIG_OPT="-d" +[ ! -z $DAGENTCONFIG -a -f $DAGENTCONFIG ] && DAGENTCONFIG_OPT="$DAGENTCONFIG_OPT -c $DAGENTCONFIG" + +PIDFILE=/var/run/"${SVCNAME}".pid + +opts="${opts} reload" + +depend() { + need mta +} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start \ + --pidfile ${PIDFILE} \ + --exec ${DAGENTPROGRAM} -- ${DAGENTCONFIG_OPT} + eend $? +} + +stop() { + ebegin $"Stopping ${SVCNAME}" + start-stop-daemon --stop \ + --pidfile ${PIDFILE} \ + --exec ${DAGENTPROGRAM} -- ${DAGENTCONFIG_OPT} + eend $? +} + +reload() { + ebegin $"Reloading ${SVCNAME}" + start-stop-daemon --stop --signal HUP --oknodo\ + --pidfile ${PIDFILE} \ + --exec ${DAGENTPROGRAM} + eend $? +} diff --git a/net-mail/zarafa/files/zarafa-gateway.rc6 b/net-mail/zarafa/files/zarafa-gateway.rc6 new file mode 100644 index 0000000..9399ae7 --- /dev/null +++ b/net-mail/zarafa/files/zarafa-gateway.rc6 @@ -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 $? +} diff --git a/net-mail/zarafa/files/zarafa-ical.rc6 b/net-mail/zarafa/files/zarafa-ical.rc6 new file mode 100644 index 0000000..fec3b5c --- /dev/null +++ b/net-mail/zarafa/files/zarafa-ical.rc6 @@ -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 $? +} diff --git a/net-mail/zarafa/files/zarafa-indexer.rc6 b/net-mail/zarafa/files/zarafa-indexer.rc6 new file mode 100644 index 0000000..ea89f4b --- /dev/null +++ b/net-mail/zarafa/files/zarafa-indexer.rc6 @@ -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 $? +} diff --git a/net-mail/zarafa/files/zarafa-licensed.rc6 b/net-mail/zarafa/files/zarafa-licensed.rc6 new file mode 100644 index 0000000..b15e8d5 --- /dev/null +++ b/net-mail/zarafa/files/zarafa-licensed.rc6 @@ -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 $? +} diff --git a/net-mail/zarafa/files/zarafa-monitor.rc6 b/net-mail/zarafa/files/zarafa-monitor.rc6 new file mode 100644 index 0000000..0b9b790 --- /dev/null +++ b/net-mail/zarafa/files/zarafa-monitor.rc6 @@ -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 $? +} diff --git a/net-mail/zarafa/files/zarafa-server.rc6 b/net-mail/zarafa/files/zarafa-server.rc6 new file mode 100644 index 0000000..2ae2da8 --- /dev/null +++ b/net-mail/zarafa/files/zarafa-server.rc6 @@ -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 $? +} diff --git a/net-mail/zarafa/files/zarafa-spooler.rc6 b/net-mail/zarafa/files/zarafa-spooler.rc6 new file mode 100644 index 0000000..0a24b9c --- /dev/null +++ b/net-mail/zarafa/files/zarafa-spooler.rc6 @@ -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 $? +} diff --git a/net-mail/zarafa/files/zarafa.logrotate b/net-mail/zarafa/files/zarafa.logrotate new file mode 100644 index 0000000..3cf6a82 --- /dev/null +++ b/net-mail/zarafa/files/zarafa.logrotate @@ -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 +} diff --git a/net-mail/zarafa/metadata.xml b/net-mail/zarafa/metadata.xml new file mode 100644 index 0000000..46a44e5 --- /dev/null +++ b/net-mail/zarafa/metadata.xml @@ -0,0 +1,34 @@ + + + + +no-herd + + @gentoo.org + + + + + diff --git a/net-mail/zarafa/zarafa-6.40.8.27223.ebuild b/net-mail/zarafa/zarafa-6.40.8.27223.ebuild new file mode 100644 index 0000000..f0fff6a --- /dev/null +++ b/net-mail/zarafa/zarafa-6.40.8.27223.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +PHP_EXT_NAME="mapi" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +USE_PHP="php5-3" + +inherit php-ext-source-r2 eutils autotools rpm5 versionator + +MY_PV=$(replace_version_separator 3 '-' ) +MY_PVV=$(replace_version_separator 3 'beta' $MY_PV ) +MY_PVM=$(get_version_component_range 1-2 ) +MY_PVR=$(get_version_component_range 1-3 ) + +DESCRIPTION="Open Source Groupware Solution" +HOMEPAGE="http://zarafa.com/" +SRC_URI="http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/sourcecode/zcp-${MY_PVR}.tar.gz + licensed? ( + amd64? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tar.gz ) + x86? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tar.gz ) )" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="" +IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash" + +RDEPEND=">=dev-libs/libical-0.44 + dev-cpp/libvmime:0.7 + app-text/catdoc + app-text/poppler + dev-cpp/clucene + dev-db/mysql + dev-libs/libxml2 + dev-libs/openssl + net-misc/curl + sys-libs/e2fsprogs-libs + sys-libs/zlib + sys-libs/ncurses + sys-libs/pam + dev-libs/boost + kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) + ldap? ( net-nds/openldap ) + logrotate? ( app-admin/logrotate ) + tcmalloc? ( dev-util/google-perftools ) + sparsehash? ( dev-cpp/sparsehash ) + perl? ( dev-lang/perl ) + python? ( dev-lang/python ) + swig? ( dev-lang/swig ) + testtools? ( dev-python/testtools ) + !arm? ( licensed? ( + dev-libs/openssl:0.9.8 + >=sys-libs/zlib-1.2.4 + ) )" + +S="${WORKDIR}"/zarafa-${MY_PVR}/ + +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/gettext + dev-lang/php" + +QA_PRESTRIPPED=" + usr/bin/zarafa-restore + usr/bin/zarafa-report + usr/bin/zarafa-backup + usr/bin/zarafa-licensed + usr/lib/zarafa/ldapmsplugin.so + usr/lib64/zarafa/ldapmsplugin.so" + +QA_DT_HASH=" + usr/bin/zarafa-restore + usr/bin/zarafa-report + usr/bin/zarafa-backup + usr/bin/zarafa-licensed + usr/lib/zarafa/ldapmsplugin.so + usr/lib64/zarafa/ldapmsplugin.so" + +src_unpack() { + unpack ${A} + if use licensed; then + cd "${WORKDIR}" + mkdir licensed + cd licensed + rpm5_unpack $(find ./../ -name "zarafa-licensed*.rpm") + cd "${S}" + fi +} + +src_prepare() { + EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + edos2unix php-webclient-ajax/config.php.dist + AT_M4DIR="autoconf" eautoreconf +} + +src_configure() { + econf \ + --enable-oss \ + --disable-testtools \ + --enable-release \ + --with-userscript-prefix=/etc/zarafa/userscripts \ + --with-quotatemplate-prefix=/etc/zarafa/quotamails \ + --with-indexerscripts-prefix=/etc/zarafa/indexerscripts \ + $(use_with pic) \ + $(use_enable perl) \ + $(use_enable python) \ + $(use_enable profiling) \ + $(use_enable static) \ + $(use_enable swig) \ + $(use_enable sparsehash) \ + $(use_enable tcmalloc) \ + $(use_enable testtools) \ + $(use_enable debug) +} + + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + make DESTDIR="${D}" install-ajax-webaccess || die "make install-ajax-webaccess failed" + make DESTDIR="${D}" install-mobile-webaccess || die "make install-mobile-webaccess failed" + + insinto /etc/apache2/modules.d + newins "${FILESDIR}/50_zarafa-webaccess-mobile.conf" 50_zarafa-webaccess-mobile.conf || die "Failed to install apache config files" + newins "${FILESDIR}/50_zarafa-webaccess.conf" 50_zarafa-webaccess.conf || die "Failed to install apache config files" + + rm "${D}"/usr/share/zarafa-webaccess/*.conf || die "Failed to remove apache config files" + rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf || die "Failed to remove apache config files" + + # Use only some parts of PHP eclass + php-ext-source-r2_buildinilist php${slot} + php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" + + # Symlink the .ini files from ext/ to ext-active/ + for inifile in ${PHPINIFILELIST} ; do + inidir="${inifile/${PHP_EXT_NAME}.ini/}" + inidir="${inidir/ext/ext-active}" + dodir "/${inidir}" + dosym "/${inifile}" "/${inifile/ext/ext-active}" + done + + # Install PHP module + php-ext-source-r2_addtoinifiles ";mapi.cache_max_sessions" "128" + php-ext-source-r2_addtoinifiles ";mapi.cache_lifetime" "300" + + if use logrotate; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate" + fi + + # install ldap files + if use ldap; then + insinto /etc/openldap/schema + doins installer/ldap/zarafa.* || die "Failed to install ldap schema files" + fi + + insinto /etc/zarafa + doins installer/linux/*.cfg || die "Failed to install config files" + + exeinto /etc/zarafa/userscripts/ + newexe "${FILESDIR}"/junklearn.dspam junklearn + + dodir /var/log/zarafa + keepdir /var/log/zarafa + + if use licensed; then + dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries" + exeinto /usr/$(get_libdir)/zarafa/ + doexe "${WORKDIR}"/licensed/usr/$(get_libdir)/zarafa/*.so || die "Failed to install licensed lib" + doman "${WORKDIR}"/licensed/usr/share/man/*/*.gz || die "Failed to install man files" + exeinto /usr/share/zarafa/zarafa-backup-helpers/ + doexe "${WORKDIR}"/licensed/usr/share/zarafa/zarafa-backup-helpers/* || die "Failed to install helper scripts" + dodoc "${WORKDIR}"/licensed/usr/share/doc/packages/zarafa-licensed/* || die "Failed to install docs" + insinto /etc/zarafa + doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files" + insinto /etc/cron.d + doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files" +# insinto /usr/share/zarafa-webaccess/ +# doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files" + newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files" + fi + + newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-dagent.rc6 zarafa-dagent || die "Failed to install init.d files" +} diff --git a/net-mail/zarafa/zarafa-6.40.9.27553.ebuild b/net-mail/zarafa/zarafa-6.40.9.27553.ebuild new file mode 100644 index 0000000..f0fff6a --- /dev/null +++ b/net-mail/zarafa/zarafa-6.40.9.27553.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +PHP_EXT_NAME="mapi" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +USE_PHP="php5-3" + +inherit php-ext-source-r2 eutils autotools rpm5 versionator + +MY_PV=$(replace_version_separator 3 '-' ) +MY_PVV=$(replace_version_separator 3 'beta' $MY_PV ) +MY_PVM=$(get_version_component_range 1-2 ) +MY_PVR=$(get_version_component_range 1-3 ) + +DESCRIPTION="Open Source Groupware Solution" +HOMEPAGE="http://zarafa.com/" +SRC_URI="http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/sourcecode/zcp-${MY_PVR}.tar.gz + licensed? ( + amd64? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tar.gz ) + x86? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tar.gz ) )" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="" +IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash" + +RDEPEND=">=dev-libs/libical-0.44 + dev-cpp/libvmime:0.7 + app-text/catdoc + app-text/poppler + dev-cpp/clucene + dev-db/mysql + dev-libs/libxml2 + dev-libs/openssl + net-misc/curl + sys-libs/e2fsprogs-libs + sys-libs/zlib + sys-libs/ncurses + sys-libs/pam + dev-libs/boost + kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) + ldap? ( net-nds/openldap ) + logrotate? ( app-admin/logrotate ) + tcmalloc? ( dev-util/google-perftools ) + sparsehash? ( dev-cpp/sparsehash ) + perl? ( dev-lang/perl ) + python? ( dev-lang/python ) + swig? ( dev-lang/swig ) + testtools? ( dev-python/testtools ) + !arm? ( licensed? ( + dev-libs/openssl:0.9.8 + >=sys-libs/zlib-1.2.4 + ) )" + +S="${WORKDIR}"/zarafa-${MY_PVR}/ + +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/gettext + dev-lang/php" + +QA_PRESTRIPPED=" + usr/bin/zarafa-restore + usr/bin/zarafa-report + usr/bin/zarafa-backup + usr/bin/zarafa-licensed + usr/lib/zarafa/ldapmsplugin.so + usr/lib64/zarafa/ldapmsplugin.so" + +QA_DT_HASH=" + usr/bin/zarafa-restore + usr/bin/zarafa-report + usr/bin/zarafa-backup + usr/bin/zarafa-licensed + usr/lib/zarafa/ldapmsplugin.so + usr/lib64/zarafa/ldapmsplugin.so" + +src_unpack() { + unpack ${A} + if use licensed; then + cd "${WORKDIR}" + mkdir licensed + cd licensed + rpm5_unpack $(find ./../ -name "zarafa-licensed*.rpm") + cd "${S}" + fi +} + +src_prepare() { + EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + edos2unix php-webclient-ajax/config.php.dist + AT_M4DIR="autoconf" eautoreconf +} + +src_configure() { + econf \ + --enable-oss \ + --disable-testtools \ + --enable-release \ + --with-userscript-prefix=/etc/zarafa/userscripts \ + --with-quotatemplate-prefix=/etc/zarafa/quotamails \ + --with-indexerscripts-prefix=/etc/zarafa/indexerscripts \ + $(use_with pic) \ + $(use_enable perl) \ + $(use_enable python) \ + $(use_enable profiling) \ + $(use_enable static) \ + $(use_enable swig) \ + $(use_enable sparsehash) \ + $(use_enable tcmalloc) \ + $(use_enable testtools) \ + $(use_enable debug) +} + + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + make DESTDIR="${D}" install-ajax-webaccess || die "make install-ajax-webaccess failed" + make DESTDIR="${D}" install-mobile-webaccess || die "make install-mobile-webaccess failed" + + insinto /etc/apache2/modules.d + newins "${FILESDIR}/50_zarafa-webaccess-mobile.conf" 50_zarafa-webaccess-mobile.conf || die "Failed to install apache config files" + newins "${FILESDIR}/50_zarafa-webaccess.conf" 50_zarafa-webaccess.conf || die "Failed to install apache config files" + + rm "${D}"/usr/share/zarafa-webaccess/*.conf || die "Failed to remove apache config files" + rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf || die "Failed to remove apache config files" + + # Use only some parts of PHP eclass + php-ext-source-r2_buildinilist php${slot} + php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" + + # Symlink the .ini files from ext/ to ext-active/ + for inifile in ${PHPINIFILELIST} ; do + inidir="${inifile/${PHP_EXT_NAME}.ini/}" + inidir="${inidir/ext/ext-active}" + dodir "/${inidir}" + dosym "/${inifile}" "/${inifile/ext/ext-active}" + done + + # Install PHP module + php-ext-source-r2_addtoinifiles ";mapi.cache_max_sessions" "128" + php-ext-source-r2_addtoinifiles ";mapi.cache_lifetime" "300" + + if use logrotate; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate" + fi + + # install ldap files + if use ldap; then + insinto /etc/openldap/schema + doins installer/ldap/zarafa.* || die "Failed to install ldap schema files" + fi + + insinto /etc/zarafa + doins installer/linux/*.cfg || die "Failed to install config files" + + exeinto /etc/zarafa/userscripts/ + newexe "${FILESDIR}"/junklearn.dspam junklearn + + dodir /var/log/zarafa + keepdir /var/log/zarafa + + if use licensed; then + dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries" + exeinto /usr/$(get_libdir)/zarafa/ + doexe "${WORKDIR}"/licensed/usr/$(get_libdir)/zarafa/*.so || die "Failed to install licensed lib" + doman "${WORKDIR}"/licensed/usr/share/man/*/*.gz || die "Failed to install man files" + exeinto /usr/share/zarafa/zarafa-backup-helpers/ + doexe "${WORKDIR}"/licensed/usr/share/zarafa/zarafa-backup-helpers/* || die "Failed to install helper scripts" + dodoc "${WORKDIR}"/licensed/usr/share/doc/packages/zarafa-licensed/* || die "Failed to install docs" + insinto /etc/zarafa + doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files" + insinto /etc/cron.d + doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files" +# insinto /usr/share/zarafa-webaccess/ +# doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files" + newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files" + fi + + newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-dagent.rc6 zarafa-dagent || die "Failed to install init.d files" +} diff --git a/net-mail/zarafa/zarafa-7.0.0.3.25734.ebuild b/net-mail/zarafa/zarafa-7.0.0.3.25734.ebuild new file mode 100644 index 0000000..53ddf14 --- /dev/null +++ b/net-mail/zarafa/zarafa-7.0.0.3.25734.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +PHP_EXT_NAME="mapi" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +USE_PHP="php5-3" + +inherit php-ext-source-r2 eutils autotools rpm5 versionator + +MY_PV=$(replace_version_separator 4 '-' ) +MY_PVV=$(replace_version_separator 3 'beta' $MY_PV ) +MY_PVM=$(get_version_component_range 1-2 ) +MY_PVR=$(get_version_component_range 1-3 ) + +DESCRIPTION="Open Source Groupware Solution" +HOMEPAGE="http://zarafa.com/" +SRC_URI="http://download.zarafa.com/community/beta/${MY_PVM}/${MY_PVV}/sourcecode/zcp-${MY_PVR}.tar.gz + !arm? ( licensed? ( + amd64? ( http://download.zarafa.com/community/beta/${MY_PVM}/${MY_PVV}/zcp-${MY_PVV}-sles-11-x86_64-free.tar.gz ) + x86? ( http://download.zarafa.com/community/beta/${MY_PVM}/${MY_PVV}/zcp-${MY_PVV}-sles-11-i586-free.tar.gz ) ) )" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="" +RESTRICT="" +IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash" + +RDEPEND=">=dev-libs/libical-0.44 + >=dev-cpp/libvmime-0.9.1 + app-text/catdoc + app-text/poppler + dev-cpp/clucene + dev-db/mysql + dev-libs/libxml2 + dev-libs/openssl + net-misc/curl + sys-libs/e2fsprogs-libs + sys-libs/zlib + sys-libs/ncurses + sys-libs/pam + kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) + ldap? ( net-nds/openldap ) + logrotate? ( app-admin/logrotate ) + tcmalloc? ( dev-util/google-perftools ) + sparsehash? ( dev-cpp/sparsehash ) + perl? ( dev-lang/perl ) + python? ( dev-lang/python ) + swig? ( dev-lang/swig ) + testtools? ( dev-python/testtools ) + !arm? ( licensed? ( + dev-libs/openssl:0.9.8 + >=sys-libs/zlib-1.2.4 + ) )" + +S="${WORKDIR}"/zarafa-${MY_PVR}/ + +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/gettext + dev-lang/php" + +QA_PRESTRIPPED=" + usr/bin/zarafa-restore + usr/bin/zarafa-report + usr/bin/zarafa-backup + usr/bin/zarafa-licensed + usr/lib/zarafa/ldapmsplugin.so + usr/lib64/zarafa/ldapmsplugin.so" + +QA_DT_HASH=" + usr/bin/zarafa-restore + usr/bin/zarafa-report + usr/bin/zarafa-backup + usr/bin/zarafa-licensed + usr/lib/zarafa/ldapmsplugin.so + usr/lib64/zarafa/ldapmsplugin.so" + +src_unpack() { + unpack ${A} + if ! use arm; then + if use licensed; then + cd "${WORKDIR}" + mkdir licensed + cd licensed + if use x86; then + rpm5_unpack $(find ./../ -name "zarafa-licensed*") +# rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*") + fi + if use amd64; then + rpm5_unpack $(find ./../ -name "zarafa-licensed*") +# rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*") + fi + cd "${S}" + fi + fi +} + +src_prepare() { + EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + edos2unix php-webclient-ajax/config.php.dist + AT_M4DIR="autoconf" eautoreconf +} + +src_configure() { + econf \ + --enable-oss \ + --disable-testtools \ + --enable-release \ + --with-userscript-prefix=/etc/zarafa/userscripts \ + --with-quotatemplate-prefix=/etc/zarafa/quotamails \ + --with-indexerscripts-prefix=/etc/zarafa/indexerscripts \ + $(use_with pic) \ + $(use_enable perl) \ + $(use_enable python) \ + $(use_enable profiling) \ + $(use_enable static) \ + $(use_enable swig) \ + $(use_enable sparsehash) \ + $(use_enable tcmalloc) \ + $(use_enable testtools) \ + $(use_enable debug) +} + + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + make DESTDIR="${D}" install-ajax-webaccess || die "make install-ajax-webaccess failed" + make DESTDIR="${D}" install-mobile-webaccess || die "make install-mobile-webaccess failed" + + insinto /etc/apache2/modules.d + newins "${FILESDIR}/50_zarafa-webaccess-mobile.conf" 50_zarafa-webaccess-mobile.conf || die "Failed to install apache config files" + newins "${FILESDIR}/50_zarafa-webaccess.conf" 50_zarafa-webaccess.conf || die "Failed to install apache config files" + + rm "${D}"/usr/share/zarafa-webaccess/*.conf || die "Failed to remove apache config files" + rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf || die "Failed to remove apache config files" + + # Use only some parts of PHP eclass + php-ext-source-r2_buildinilist php${slot} + php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" + + # Symlink the .ini files from ext/ to ext-active/ + for inifile in ${PHPINIFILELIST} ; do + inidir="${inifile/${PHP_EXT_NAME}.ini/}" + inidir="${inidir/ext/ext-active}" + dodir "/${inidir}" + dosym "/${inifile}" "/${inifile/ext/ext-active}" + done + + # Install PHP module + php-ext-source-r2_addtoinifiles ";mapi.cache_max_sessions" "128" + php-ext-source-r2_addtoinifiles ";mapi.cache_lifetime" "300" + + if use logrotate; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate" + fi + + # install ldap files + if use ldap; then + insinto /etc/openldap/schema + doins installer/ldap/zarafa.* || die "Failed to install ldap schema files" + fi + + insinto /etc/zarafa + doins installer/linux/*.cfg || die "Failed to install config files" + + dodir /var/log/zarafa + keepdir /var/log/zarafa + + if ! use arm; then + if use licensed; then + dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries" + exeinto /usr/$(get_libdir)/zarafa/ + doexe "${WORKDIR}"/licensed/usr/$(get_libdir)/zarafa/*.so || die "Failed to install licensed lib" + doman "${WORKDIR}"/licensed/usr/share/man/*/*.gz || die "Failed to install man files" + exeinto /usr/share/zarafa/zarafa-backup-helpers/ + doexe "${WORKDIR}"/licensed/usr/share/zarafa/zarafa-backup-helpers/* || die "Failed to install helper scripts" + dodoc "${WORKDIR}"/licensed/usr/share/doc/packages/zarafa-licensed/* || die "Failed to install docs" + insinto /etc/zarafa + doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files" + insinto /etc/cron.d + doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files" +# insinto /usr/share/zarafa-webaccess/ +# doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files" + newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files" + fi + fi + + newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-dagent.rc6 zarafa-dagent || die "Failed to install init.d files" +} diff --git a/profiles/package.mask b/profiles/package.mask new file mode 100644 index 0000000..24a4ab7 --- /dev/null +++ b/profiles/package.mask @@ -0,0 +1,8 @@ +##################################################################### +# $Header: $ +# When you add an entry to this file, add your name, the date, and an +# explanation of why something is getting masked +# +# NOTE: Please add your entry at the top! +# + diff --git a/profiles/repo_name b/profiles/repo_name new file mode 100644 index 0000000..799caaf --- /dev/null +++ b/profiles/repo_name @@ -0,0 +1 @@ +zarafa \ No newline at end of file diff --git a/profiles/updates/3Q-2010 b/profiles/updates/3Q-2010 new file mode 100644 index 0000000..dec8dcd --- /dev/null +++ b/profiles/updates/3Q-2010 @@ -0,0 +1 @@ +move www-apps/zarafa net-mail/zarafa diff --git a/profiles/use.desc b/profiles/use.desc new file mode 100644 index 0000000..97aa7e2 --- /dev/null +++ b/profiles/use.desc @@ -0,0 +1,6 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# Keep them sorted + diff --git a/profiles/use.local.desc b/profiles/use.local.desc new file mode 100644 index 0000000..89aaa87 --- /dev/null +++ b/profiles/use.local.desc @@ -0,0 +1,9 @@ +# Copyright 1999-2007 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# This file contains descriptions of local USE flags, and the ebuilds which +# contain them. + +# Keep it sorted. + diff --git a/sets.conf b/sets.conf new file mode 100644 index 0000000..2d829eb --- /dev/null +++ b/sets.conf @@ -0,0 +1,5 @@ +[zarafa sets] +class = portage.sets.files.StaticFileSet +multiset = true +directory = ${repository:zarafa}/sets/ + diff --git a/skel.ChangeLog b/skel.ChangeLog new file mode 100644 index 0000000..c3d77a8 --- /dev/null +++ b/skel.ChangeLog @@ -0,0 +1,67 @@ +# ChangeLog for / +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*-- (DD MMM YYYY) + + DD MMM YYYY; YOUR_NAME changed_file1, changed_file2 : + Initial import. Ebuild submitted by submitter_name . + Note that the "changed_file" listing is optional if you are simply bumping + the rev of the ebuild and are only making changes to the .ebuild file + itself. Also note that we now have a single unified paragraph rather than + having the first line separated from the rest by a newline. Everything + should be in one block like this. (note by drobbins, 16 Jul 2002) + + DD MMM YYYY; YOUR_NAME changed_file1, changed_file2: this is + an earlier ChangeLog entry. + +-- Explanation of ChangeLog format: + + *************************************************************************** + THIS IS IMPORTANT: The ChangeLog format is a *chronological* account of all + changes made to a set of ebuilds. That means that the most recent ChangeLog + entry *always* goes at the top of the file. More explanation below. + *************************************************************************** + + *************************************************************************** + ANOTHER IMPORTANT NOTE: There are some ChangeLogs that don't follow this + format and organize all changes under the "correct" "*" entry. This is not + correct. However, rather than making a concerted effort to fix these + ChangeLogs, we should spend our energy defining a comprehensive and strict + XML-based ChangeLog format which we then migrate to. But for any entries to + any ChangeLog that *you* make, please make sure to always add entries to the + top of the file like a good boy/girl. Even do this if it's clear that you're + adding an entry to a b0rked ChangeLog. + *************************************************************************** + + This changelog is targeted to users. This means that the comments should be + well explained and written in clean English. + + Every new version or revision of the package should be marked by a '*' + separator line as above to indicate where in the chronology it was first + added to our CVS tree. Any changes since the last revision, really _any + changes at all_ have to be added to the top of the file, underneath the + initial copyright and cvs header comments, in exactly the same format as this + comment. If you are modifying older ebuilds, simply note them as changed + files and add your entry to the top of the ChangeLog. Resist the temptation + to "organize" your ChangeLog entries by placing them under the "correct" "*" + entries -- this isn't the purpose of the "*" entries. + + This means that you start with header line that has the following format, + indented two spaces: + + DD MMM YYYY; your_name changed_file1, changed_file2: Your + explanation should follow. It should be indented and wrapped at a line width + of 80 characters. The changed_files can be omitted if they are obvious; for + example, if you are only modifying the .ebuild file and committing a new rev + of a package. Any details about what exactly changed in the code should be + added as a message when the changes are committed to cvs, not in this file. + +-- A word regarding credit: + + Please add credit information ("ebuild submitted by ...", "patch submitted + by ...") to the ChangeLog. Do not add this information to the ebuilds + themselves. + + And remember: Give credit where credit is due. We're all doing this for + free, so the best we can hope (and expect!) to receive is credit. diff --git a/skel.ebuild b/skel.ebuild new file mode 100644 index 0000000..f7a3536 --- /dev/null +++ b/skel.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# NOTE: The comments in this file are for instruction and documentation. +# They're not meant to appear with your final, production ebuild. Please +# remember to remove them before submitting or committing your ebuild. That +# doesn't mean you can't add your own comments though. + +# The 'Header' on the third line should just be left alone. When your ebuild +# will be committed to cvs, the details on that line will be automatically +# generated to contain the correct data. + +# The EAPI variable tells the ebuild format in use. +# Defaults to 0 if not specified. The current PMS draft contains details on +# a proposed EAPI=0 definition but is not finalized yet. +# Eclasses will test for this variable if they need to use EAPI > 0 features. +# Ebuilds should not define EAPI > 0 unless they absolutely need to use +# features added in that version. +#EAPI=0 + +# inherit lists eclasses to inherit functions from. Almost all ebuilds should +# inherit eutils, as a large amount of important functionality has been +# moved there. For example, the $(get_libdir) mentioned below wont work +# without the following line: +inherit eutils +# A well-used example of an eclass function that needs eutils is epatch. If +# your source needs patches applied, it's suggested to put your patch in the +# 'files' directory and use: +# +# epatch ${FILESDIR}/patch-name-here +# +# eclasses tend to list descriptions of how to use their functions properly. +# take a look at /usr/portage/eclasses/ for more examples. + +# Short one-line description of this package. +DESCRIPTION="This is a sample skeleton ebuild file" + +# Homepage, not used by Portage directly but handy for developer reference +HOMEPAGE="http://foo.bar.com/" + +# Point to any required sources; these will be automatically downloaded by +# Portage. +SRC_URI="ftp://foo.bar.com/${P}.tar.gz" + +# License of the package. This must match the name of file(s) in +# /usr/portage/licenses/. For complex license combination see the developer +# docs on gentoo.org for details. +LICENSE="" + +# The SLOT variable is used to tell Portage if it's OK to keep multiple +# versions of the same package installed at the same time. For example, +# if we have a libfoo-1.2.2 and libfoo-1.3.2 (which is not compatible +# with 1.2.2), it would be optimal to instruct Portage to not remove +# libfoo-1.2.2 if we decide to upgrade to libfoo-1.3.2. To do this, +# we specify SLOT="1.2" in libfoo-1.2.2 and SLOT="1.3" in libfoo-1.3.2. +# emerge clean understands SLOTs, and will keep the most recent version +# of each SLOT and remove everything else. +# Note that normal applications should use SLOT="0" if possible, since +# there should only be exactly one version installed at a time. +# DO NOT USE SLOT=""! This tells Portage to disable SLOTs for this package. +SLOT="0" + +# Using KEYWORDS, we can record masking information *inside* an ebuild +# instead of relying on an external package.mask file. Right now, you should +# set the KEYWORDS variable for every ebuild so that it contains the names of +# all the architectures with which the ebuild works. All of the official +# architectures can be found in the keywords.desc file which is in +# /usr/portage/profiles/. Usually you should just set this to "~x86". The ~ +# in front of the architecture indicates that the package is new and should be +# considered unstable until testing proves its stability. So, if you've +# confirmed that your ebuild works on x86 and ppc, you'd specify: +# KEYWORDS="~x86 ~ppc" +# Once packages go stable, the ~ prefix is removed. +# For binary packages, use -* and then list the archs the bin package +# exists for. If the package was for an x86 binary package, then +# KEYWORDS would be set like this: KEYWORDS="-* x86" +# DO NOT USE KEYWORDS="*". This is deprecated and only for backward +# compatibility reasons. +KEYWORDS="~x86" + +# Comprehensive list of any and all USE flags leveraged in the ebuild, +# with the exception of any ARCH specific flags, i.e. "ppc", "sparc", +# "x86" and "alpha". This is a required variable. If the ebuild doesn't +# use any USE flags, set to "". +IUSE="gnome X" + +# A space delimited list of portage features to restrict. man 5 ebuild +# for details. Usually not needed. +#RESTRICT="strip" + +# Build-time dependencies, such as +# ssl? ( >=dev-libs/openssl-0.9.6b ) +# >=dev-lang/perl-5.6.1-r1 +# It is advisable to use the >= syntax show above, to reflect what you +# had installed on your system when you tested the package. Then +# other users hopefully won't be caught without the right version of +# a dependency. +DEPEND="" + +# Run-time dependencies. Must be defined to whatever this depends on to run. +# The below is valid if the same run-time depends are required to compile. +RDEPEND="${DEPEND}" + +# Source directory; the dir where the sources can be found (automatically +# unpacked) inside ${WORKDIR}. The default value for S is ${WORKDIR}/${P} +# If you don't need to change it, leave the S= line out of the ebuild +# to keep it tidy. +#S="${WORKDIR}/${P}" + +src_compile() { + # Most open-source packages use GNU autoconf for configuration. + # The quickest (and preferred) way of running configure is: + econf || die "econf failed" + # + # You could use something similar to the following lines to + # configure your package before compilation. The "|| die" portion + # at the end will stop the build process if the command fails. + # You should use this at the end of critical commands in the build + # process. (Hint: Most commands are critical, that is, the build + # process should abort if they aren't successful.) + #./configure \ + # --host=${CHOST} \ + # --prefix=/usr \ + # --infodir=/usr/share/info \ + # --mandir=/usr/share/man || die "./configure failed" + # Note the use of --infodir and --mandir, above. This is to make + # this package FHS 2.2-compliant. For more information, see + # http://www.pathname.com/fhs/ + + # emake (previously known as pmake) is a script that calls the + # standard GNU make with parallel building options for speedier + # builds (especially on SMP systems). Try emake first. It might + # not work for some packages, because some makefiles have bugs + # related to parallelism, in these cases, use emake -j1 to limit + # make to a single process. The -j1 is a visual clue to others + # that the makefiles have bugs that have been worked around. + emake || die "emake failed" +} + +src_install() { + # You must *personally verify* that this trick doesn't install + # anything outside of DESTDIR; do this by reading and + # understanding the install part of the Makefiles. + # This is the preferred way to install. + emake DESTDIR="${D}" install || die "emake install failed" + + # When you hit a failure with emake, do not just use make. It is + # better to fix the Makefiles to allow proper parallelization. + # If you fail with that, use "emake -j1", it's still better than make. + + # For Makefiles that don't make proper use of DESTDIR, setting + # prefix is often an alternative. However if you do this, then + # you also need to specify mandir and infodir, since they were + # passed to ./configure as absolute paths (overriding the prefix + # setting). + #emake \ + # prefix="${D}"/usr \ + # mandir="${D}"/usr/share/man \ + # infodir="${D}"/usr/share/info \ + # libdir="${D}"/usr/$(get_libdir) \ + # install || die "emake install failed" + # Again, verify the Makefiles! We don't want anything falling + # outside of ${D}. + + # The portage shortcut to the above command is simply: + # + #einstall || die "einstall failed" +} diff --git a/skel.metadata.xml b/skel.metadata.xml new file mode 100644 index 0000000..46a44e5 --- /dev/null +++ b/skel.metadata.xml @@ -0,0 +1,34 @@ + + + + +no-herd + + @gentoo.org + + + + +