diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog index 3bcf485..7028b31 100644 --- a/net-mail/zarafa/ChangeLog +++ b/net-mail/zarafa/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Jun 2011; Mario Fetka + -files/7.0.0.3.25734/fix-pthread.patch, + -files/7.0.0.3.25734/fix-zarafaserver-uuid-linkage.patch, + -files/7.0.0.3.25734/fix-zarafastats-uuid-linkage.patch, + -files/7.0.0.3.25734/zarafa-6.40.2-libtcmalloc_shared-1.patch, + -files/7.0.0.3.25734/zarafa-6.40.2-sysconfig2confd-1.patch, + -zarafa-7.0.0.3.25734.ebuild, + -files/7.0.0.3.25734/zarafa-7.0.0-package.patch: + cleanup + 19 Jun 2011; Mario Fetka zarafa-6.40.9.27553.ebuild: correct arm support diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest index 7422aa4..6f1bee1 100644 --- a/net-mail/zarafa/Manifest +++ b/net-mail/zarafa/Manifest @@ -20,12 +20,6 @@ AUX 6.40.9.27553/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 c9b89cad232 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 @@ -49,11 +43,7 @@ DIST zcp-6.40.8.tar.gz 5428506 RMD160 36ce2095a1d0126a43405ac50b289107910feeaf S 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 6567 RMD160 83e20fc877c6d5f50d4b85f7b9d6b957c97a5e15 SHA1 7b7637509d64c46bb52e1208e553a298cbb6e939 SHA256 74ab1f9061cada56505cd39e861d348f5b9007e85fa94d3dd48c811005dc4f95 EBUILD zarafa-6.40.9.27553.ebuild 8772 RMD160 b93c8246ab0150529dbfe4400bd6c9f9f396a7d0 SHA1 4c983d6e7af343372494ae6f3dbaaa4d5d14f51a SHA256 f7c33ad460b73677daa7e00fdfcb0e1321010e2fe93283776eef3c7f2dcb3af3 -EBUILD zarafa-7.0.0.3.25734.ebuild 6771 RMD160 9923dce5531900ea87cdc3e45ba7a04a85d104b5 SHA1 72fb520c61c5c607fe604578c2c5b14913a05e35 SHA256 e59fd928c329e5f380246f525c1422736a27a7e03613a538097386b579c5e311 -MISC ChangeLog 6801 RMD160 495fafc36026f5a53f220fe13827cbdebfb163a4 SHA1 a9568909c333eb457bf8c1fdc9c43bb7ae841932 SHA256 7568c85ee36b1466a5d96604a4d96bf594a2425e59f30d48e762dacdc924b01c +MISC ChangeLog 7234 RMD160 81b41ea41753db46edd9af59008bed65270ba941 SHA1 0d781bc5eb95af1960eb0d3220c5b018699a6735 SHA256 09d8c58c5dd27c2ff087ffa6f77c7d8ff0a7c88b74a59a8800c05c664e865a75 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 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 deleted file mode 100644 index 0d743c0..0000000 --- a/net-mail/zarafa/files/7.0.0.3.25734/fix-pthread.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 deleted file mode 100644 index 575c35d..0000000 --- a/net-mail/zarafa/files/7.0.0.3.25734/fix-zarafaserver-uuid-linkage.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 0039d89..0000000 --- a/net-mail/zarafa/files/7.0.0.3.25734/fix-zarafastats-uuid-linkage.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 28dcc78..0000000 --- a/net-mail/zarafa/files/7.0.0.3.25734/zarafa-6.40.2-libtcmalloc_shared-1.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 93e4d0f..0000000 --- a/net-mail/zarafa/files/7.0.0.3.25734/zarafa-6.40.2-sysconfig2confd-1.patch +++ /dev/null @@ -1,187 +0,0 @@ -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 deleted file mode 100644 index 5785000..0000000 --- a/net-mail/zarafa/files/7.0.0.3.25734/zarafa-7.0.0-package.patch +++ /dev/null @@ -1,53 +0,0 @@ -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/zarafa-7.0.0.3.25734.ebuild b/net-mail/zarafa/zarafa-7.0.0.3.25734.ebuild deleted file mode 100644 index 619eb97..0000000 --- a/net-mail/zarafa/zarafa-7.0.0.3.25734.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# 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="~arm" -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" -}