From 0e06676a53dee7a53c816a827b381871804c7138 Mon Sep 17 00:00:00 2001 From: geos_one Date: Tue, 26 Jul 2011 05:45:09 +0000 Subject: [PATCH] net-mail/zarafa: zarafa-licensed 7.0 broken peace of crap (Portage version: 2.1.10.7/svn/Linux x86_64, RepoMan options: --force) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/zarafa@2986 6952d904-891a-0410-993b-d76249ca496b --- net-mail/zarafa/ChangeLog | 5 + net-mail/zarafa/Manifest | 12 +- .../zarafa-6.40.10-package.patch | 183 ----------------- .../7.0.0.27791/zarafa-7.0.0-package.patch | 185 ------------------ net-mail/zarafa/zarafa-7.0.0.27791.ebuild | 27 +-- 5 files changed, 27 insertions(+), 385 deletions(-) diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog index ce7a39c..de17c83 100644 --- a/net-mail/zarafa/ChangeLog +++ b/net-mail/zarafa/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Jul 2011; Mario Fetka + files/6.40.10.28214/zarafa-6.40.10-package.patch, zarafa-7.0.0.27791.ebuild, + files/7.0.0.27791/zarafa-7.0.0-package.patch: + zarafa-licensed 7.0 broken peace of crap + *zarafa-6.40.10.28214 (25 Jul 2011) 25 Jul 2011; Mario Fetka diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest index 4866738..e0e7e71 100644 --- a/net-mail/zarafa/Manifest +++ b/net-mail/zarafa/Manifest @@ -6,7 +6,7 @@ AUX 6.40.10.28214/fix-pthread.patch 2101 RMD160 aafbca78c32dc5c248ff044b9fd35ae3 AUX 6.40.10.28214/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 AUX 6.40.10.28214/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 AUX 6.40.10.28214/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f -AUX 6.40.10.28214/zarafa-6.40.10-package.patch 9476 RMD160 9d5bbf6ac07a90b54a76192b27a3118177cf173e SHA1 1e0a47f1b8259a858a0424dffd75bfe75fcae4ea SHA256 b6fbd8ac8a4e8fabba4513882ebb946a92393e790e01ed1a2cf89397cc42db23 +AUX 6.40.10.28214/zarafa-6.40.10-package.patch 2221 RMD160 a03f42b8d307baadb9af2b9cb94ca702edae7a09 SHA1 710d52510b6e53344830b74b44dd6489f3ba065e SHA256 763cf76396090f830fb3f27f69c9e4f787b4792c6db9216d9e0998189bd26843 AUX 6.40.10.28214/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 c9b89cad232b513db8dad25dba9a7a3b6cdcf007 SHA1 c4d332881ab985f817c8d5c4848f4ec2be91d050 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 AUX 6.40.10.28214/zarafa-6.40.2-sysconfig2confd-1.patch 8495 RMD160 f747da766c1777121f04c12f4cb3bee9ec56b7f8 SHA1 44e5a9487497080933de75d55311c97dfc7fc8fc SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 AUX 6.40.10.28214/zarafa-6.40.6-force_latin1.patch 618 RMD160 8fc093050c3368c770d11326cf2402511f8d7c14 SHA1 5a7a6669308166ffb8117090411c3df9827408aa SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 @@ -35,7 +35,7 @@ AUX 7.0.0.27791/Datux-spamhook.patch 9895 RMD160 b1143f3e2057ee8d1b0a03e75708650 AUX 7.0.0.27791/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f AUX 7.0.0.27791/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 c9b89cad232b513db8dad25dba9a7a3b6cdcf007 SHA1 c4d332881ab985f817c8d5c4848f4ec2be91d050 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 AUX 7.0.0.27791/zarafa-6.40.2-sysconfig2confd-1.patch 8495 RMD160 f747da766c1777121f04c12f4cb3bee9ec56b7f8 SHA1 44e5a9487497080933de75d55311c97dfc7fc8fc SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 -AUX 7.0.0.27791/zarafa-7.0.0-package.patch 9932 RMD160 2519e3d369ea51900f111d10d7c4ee1b484912c0 SHA1 8904c844cdd5926b1fda1980c9af7265006d85a1 SHA256 30e2cc55036843a7b260a95f14924195f745a93773c4e45eb3bfed92138693f7 +AUX 7.0.0.27791/zarafa-7.0.0-package.patch 2285 RMD160 ad3f385e60a3d4b52ee831bb7c47739d7324569b SHA1 1bb2a88bd8c25be566f169688b41d583eae4d0a8 SHA256 01a0b3a7acc54273bfdd6d84b67e6fd90d85b63f981f687035897d0516ef86fb 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 @@ -79,12 +79,12 @@ 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-27791-sles-11-i586-free.tar.gz 25773688 RMD160 f4af1f58e03f1853b4249af74678c3384c05adfd SHA1 cf840dd2724bb1b3bf009def81ec872f79fe733d SHA256 813cb6c4bfa817fba75a265a6ed35e041c7cab8e40469d05a1f1ae34709b9f72 -DIST zcp-7.0.0-27791-sles-11-x86_64-free.tar.gz 25667099 RMD160 f8b22619758c83aeb2c66c9a83b4e44b54d106a6 SHA1 7e7092fa0292bcf43e116018f17d9f8344dab494 SHA256 54fa222f7173e7a7a360cf0c59c22b21764c26a336b5b798550f73c100c67f5d +DIST zcp-7.0.0-27791-debian-6.0-i386-free.tar.gz 27636281 RMD160 30d08eafe085e8106efdc70ff51f6ee58b5d4e2a SHA1 653cc9286a38bbd85d10773b561f5d2c51c18fa0 SHA256 36196351606491141ec1d14e10b68f9987339e292c880891d0ce6ab0651d4efa +DIST zcp-7.0.0-27791-debian-6.0-x86_64-free.tar.gz 27687012 RMD160 f4e55ea58e3017b06133a1e6f69f238afd6737c8 SHA1 a7492bc1655f92c73ecfacb0b1e0bcf7ebd30fbe SHA256 c6740cd2b6e60c2ab83779bf5598a8afb2ff584aa5ace355d80d0cca328488a2 DIST zcp-7.0.0.tar.gz 6006829 RMD160 584b5593696f850ae8299806e447e61af389ec46 SHA1 e7463593cee89343b2129b8bd6977f95cc778279 SHA256 b7c3c85c0578eb5ca0c5f5d22bbef315f2f52e22208d6e1193ffa505b05e952e EBUILD zarafa-6.40.10.28214.ebuild 9054 RMD160 84c3d9d212f1582bd6bb1ce3b055f30f8f173496 SHA1 f2e92a8c214884b0e6d6a5da56ac3174629696b6 SHA256 e6addb81a27872cd0242a6c115e4d84be1c8acaf7cb5d947db791b23e7b8f2b0 EBUILD zarafa-6.40.8.27223.ebuild 6567 RMD160 83e20fc877c6d5f50d4b85f7b9d6b957c97a5e15 SHA1 7b7637509d64c46bb52e1208e553a298cbb6e939 SHA256 74ab1f9061cada56505cd39e861d348f5b9007e85fa94d3dd48c811005dc4f95 EBUILD zarafa-6.40.9.27553.ebuild 9033 RMD160 bc86e8eadf58d619774ea62aaf869d00b477df5d SHA1 23d7461f0614ccabe5fe7377ee1590291937d5b7 SHA256 bcf13aaaeb85e536a6aed59ae670bef33c562c5d7efc6a38d79fd04b0bba8716 -EBUILD zarafa-7.0.0.27791.ebuild 9067 RMD160 e4ce4891d8a99e4a0482fc432ebefa67e8b1a772 SHA1 923fe5b8bf3be89d16c03412e95be3752c6895a3 SHA256 c093ec89f9ec2cdd2616177901f9690ac1ae76a717d2f3427b443d2e54402873 -MISC ChangeLog 7670 RMD160 0956c6d37c2725ef85efd02faf75bfaf1f7f296c SHA1 6dd1f10e4dc3942807ee5f2bc5e92bfc55ff1840 SHA256 eae458f81cb5b1e2b58ab6458f5c0d607983cbc749b2d3d8b8808423037d41f8 +EBUILD zarafa-7.0.0.27791.ebuild 9270 RMD160 c8a1a06ac51657aeba4fe0d91e8f7432df8931a6 SHA1 4464186b8de6948bbbe933d3a467040a12e18974 SHA256 5c2710c8c7a4c2e9f59768398291e57903e53fb41c497bd839bbeec0455a5ab1 +MISC ChangeLog 7892 RMD160 f830f0c4710d93b82973ba0f0098d786cd662053 SHA1 e7ace8639a952f3cbe0ed56d0851483bc71df8ff SHA256 f376ea657ed892c3389ba8bd01de1c43f80ceb6a518696ef3f1949e053ec3368 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/net-mail/zarafa/files/6.40.10.28214/zarafa-6.40.10-package.patch b/net-mail/zarafa/files/6.40.10.28214/zarafa-6.40.10-package.patch index 5ea6a40..a55300b 100644 --- a/net-mail/zarafa/files/6.40.10.28214/zarafa-6.40.10-package.patch +++ b/net-mail/zarafa/files/6.40.10.28214/zarafa-6.40.10-package.patch @@ -20,53 +20,6 @@ diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefi if WITH_TESTTOOLS TESTSUBS = ECTestTools endif -diff -uNr zarafa-6.40.10.orig//ECtools/zarafa-archiver/Makefile.am zarafa-6.40.10/ECtools/zarafa-archiver/Makefile.am ---- zarafa-6.40.10.orig//ECtools/zarafa-archiver/Makefile.am 2011-07-25 20:03:46.549000045 +0200 -+++ zarafa-6.40.10/ECtools/zarafa-archiver/Makefile.am 2011-07-25 20:08:24.531000049 +0200 -@@ -27,15 +27,6 @@ - - - --if ! OSS_ONLY --bin_PROGRAMS = zarafa-archiver -- --zarafa_archiver_LDADD = ${top_builddir}/common/libcommon_util.la \ -- libarchiver.la \ -- $(PROG_LIBS) -- --zarafa_archiver_SOURCES = main.cpp --endif - - - check-syntax: -diff -uNr zarafa-6.40.10.orig//ECtools/zarafa-stats/Makefile.am zarafa-6.40.10/ECtools/zarafa-stats/Makefile.am ---- zarafa-6.40.10.orig//ECtools/zarafa-stats/Makefile.am 2011-07-25 20:03:46.555000045 +0200 -+++ zarafa-6.40.10/ECtools/zarafa-stats/Makefile.am 2011-07-25 20:11:41.436000030 +0200 -@@ -1,9 +1,5 @@ - bin_PROGRAMS = zarafa-stats - --if ! OSS_ONLY --dist_noinst_DATA = zarafa-ssm zarafa-ssm.default zarafa-ssm.cron --endif -- - AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \ - -I${top_srcdir}/mapi4linux/include \ - -I${top_srcdir}/libfreebusy \ -@@ -18,14 +14,6 @@ - zarafa_stats_SOURCES = zarafa-stats.cpp - - install-data-hook: --if ! OSS_ONLY -- mkdir -p $(DESTDIR)/$(sysconfdir)/default -- install -m 644 zarafa-ssm.default $(DESTDIR)/$(sysconfdir)/default/zarafa-ssm -- mkdir -p $(DESTDIR)/$(sysconfdir)/cron.d -- install -m 644 zarafa-ssm.cron $(DESTDIR)/$(sysconfdir)/cron.d/zarafa-ssm -- mkdir -p $(DESTDIR)/$(bindir) -- install -m 755 zarafa-ssm $(DESTDIR)/$(bindir) --endif - - check-syntax: - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am --- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200 +++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200 @@ -114,139 +67,3 @@ diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac AC_OUTPUT -diff -uNr zarafa-6.40.10.orig//installer/linux/Makefile.am zarafa-6.40.10/installer/linux/Makefile.am ---- zarafa-6.40.10.orig//installer/linux/Makefile.am 2011-07-25 20:03:46.564000045 +0200 -+++ zarafa-6.40.10/installer/linux/Makefile.am 2011-07-25 20:09:04.792000046 +0200 -@@ -59,19 +59,6 @@ - dist_sysconf_rotate_DATA = zarafa.logrotate zarafa-indexer.logrotate - - sysconf_certdir = ${sysconfdir}/zarafa/report-ca --if ! OSS_ONLY --BUILT_SOURCES += ldapms.openldap.cfg ldapms.active-directory.cfg -- --config_files += licensed.cfg archiver.cfg --rhel_initscript_files += zarafa-licensed.init.rhel --suse_initscript_files += zarafa-licensed.init.suse --cbs4_initscript_files += zarafa-licensed.init.cbs4 --rhel_sysconfig_files += sysconfig-licensed.rhel --suse_sysconfig_files += sysconfig-licensed.suse -- --dist_sysconf_cert_DATA = addtrust.crt --dist_sysconf_rotate_DATA += zarafa-licensed.logrotate --endif - - config_files += $(BUILT_SOURCES) - EXTRA_DIST = $(BUILT_SOURCES) ldap.m4 \ -diff -uNr zarafa-6.40.10.orig//provider/plugins/Makefile.am zarafa-6.40.10/provider/plugins/Makefile.am ---- zarafa-6.40.10.orig//provider/plugins/Makefile.am 2011-07-25 20:03:46.473000045 +0200 -+++ zarafa-6.40.10/provider/plugins/Makefile.am 2011-07-25 20:07:32.946000045 +0200 -@@ -21,14 +21,6 @@ - ldapplugin_la_LDFLAGS = -module -avoid-version - ldapplugin_la_LIBADD = ${top_builddir}/common/libcommon_util.la $(LDAP_LIBS) - --if ! OSS_ONLY --pkglib_LTLIBRARIES += ldapmsplugin.la --ldapmsplugin_la_CXXFLAGS = $(ldapplugin_la_CXXFLAGS) -DWITH_MULTISERVER --ldapmsplugin_la_SOURCES = $(ldapplugin_la_SOURCES) --ldapmsplugin_la_LDFLAGS = $(ldapplugin_la_LDFLAGS) --ldapmsplugin_la_LIBADD = $(ldapplugin_la_LIBADD) --endif -- - endif - - # default plugin -diff -uNr zarafa-6.40.10.orig//swig/Makefile.am zarafa-6.40.10/swig/Makefile.am ---- zarafa-6.40.10.orig//swig/Makefile.am 2011-07-25 20:03:46.706000046 +0200 -+++ zarafa-6.40.10/swig/Makefile.am 2011-07-25 20:11:26.644000114 +0200 -@@ -15,10 +15,6 @@ - - EXTRA_DIST = edkmdb.i mapi.i mapiutil.i mapidefs.i mapicode.i mapix.i mapinotifsink.i typemap.i helpers.i IECServiceAdmin.i IECLicense.i inetmapi.i icalmapi.i swig_iunknown.h ecdefs.i archiver.i licenseclient.i - --if ! OSS_ONLY --EXTRA_DIST += licensereq.i --endif -- - check-syntax: - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ - -fsyntax-only -fmessage-length=0 ${CHK_SOURCES} -Wall -Wformat=2 -diff -uNr zarafa-6.40.10.orig//swig/python/Makefile.am zarafa-6.40.10/swig/python/Makefile.am ---- zarafa-6.40.10.orig//swig/python/Makefile.am 2011-07-25 20:03:46.701000046 +0200 -+++ zarafa-6.40.10/swig/python/Makefile.am 2011-07-25 20:10:26.313000045 +0200 -@@ -1,9 +1,6 @@ - pythonexeclib_LTLIBRARIES = _MAPICore.la _inetmapi.la _icalmapi.la _licenseclient.la - noinst_LTLIBRARIES = _archiver.la - --if ! OSS_ONLY --pythonexeclib_LTLIBRARIES += _licensereq.la --endif - - # disable warnings since code is mostly generated - AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common $(PYTHON_INCLUDES) -I${top_srcdir}/swig -w -@@ -50,15 +47,6 @@ - ${top_builddir}/mapi4linux/src/libmapi.la \ - $(PROG_LIBS) $(PYTHON_LIBS) $(SSL_LIBS) - --if ! OSS_ONLY --_licensereq_la_CXXFLAGS = -I${top_srcdir}/provider/common -I${top_builddir}/provider/soap -I${top_srcdir}/provider/soap -I${top_srcdir}/liblicense --_licensereq_la_LDFLAGS = -module -avoid-version --_licensereq_la_LIBADD = ${top_builddir}/liblicense/liblicense.la \ -- ${top_builddir}/common/libcommon_mapi.la \ -- ${top_builddir}/common/libcommon_util.la \ -- $(PROG_LIBS) $(PYTHON_LIBS) $(SSL_LIBS) --endif -- - BUILT_SOURCES = mapi_wrap.cxx \ - mapi_wrap.h \ - inetmapi_wrap.cxx \ -@@ -66,10 +54,6 @@ - archiver_wrap.cxx \ - licenseclient_wrap.cxx - --if ! OSS_ONLY --BUILT_SOURCES += licensereq_wrap.cxx --endif -- - CLEANFILES = $(BUILT_SOURCES) \ - MAPICore.py \ - inetmapi.py \ -@@ -77,10 +61,6 @@ - archiver.py \ - licenseclient.py - --if ! OSS_ONLY --CLEANFILES += licensereq.py --endif -- - # wait for full output of swig - MAPICore.py: $(BUILT_SOURCES) - inetmapi.py: $(BUILT_SOURCES) -@@ -88,29 +68,16 @@ - archiver.py: $(BUILT_SOURCES) - licenseclient.py: $(BUILT_SOURCES) - --if ! OSS_ONLY --licensereq.py: $(BUILT_SOURCES) --endif -- - _MAPICore_la_SOURCES = conversion.h conversion.cpp mapi_wrap.cxx mapi_wrap.h scl.h ../director_util.h ../director_util.cpp - _inetmapi_la_SOURCES = conversion.h conversion.cpp inetmapi_wrap.cxx - _icalmapi_la_SOURCES = conversion.h conversion.cpp icalmapi_wrap.cxx - _archiver_la_SOURCES = archiver_wrap.cxx archiver_conv.h archiver_conv.cpp - _licenseclient_la_SOURCES = licenseclient_wrap.cxx licenseclient_conv.cpp licenseclient_conv.h - --if ! OSS_ONLY --_licensereq_la_SOURCES = licensereq_wrap.cxx --endif -- - EXTRA_DIST = typemap_python.i helpers_python.i setup.py $(BUILT_SOURCES) MAPICore.py inetmapi.py icalmapi.py licenseclient.py MAPI/Defs.py MAPI/__init__.py MAPI/Struct.py MAPI/Tags.py MAPI/Time.py MAPI/Util/__init__.py MAPI/Util/Generators.py MAPI/Util/Iterators.py archiver_python.i - datadir = $(pythonexeclibdir) - data_DATA = MAPICore.py inetmapi.py icalmapi.py licenseclient.py - --if ! OSS_ONLY --EXTRA_DIST += licensereq.py --data_DATA += licensereq.py --endif -- - mapi_wrap.h: mapi_wrap.cxx - mapi_wrap.cxx: ../mapi.i ../mapiutil.i ../mapidefs.i ../mapicode.i ../mapix.i ../mapinotifsink.i ../mapiutil.i ../typemap.i ../helpers.i ../edkmdb.i ../IECServiceAdmin.i ../ecdefs.i typemap_python.i helpers_python.i - if test "x$(SWIG_EXEC)" = "x"; then echo "swig is required for 'make dist'"; exit 1; fi diff --git a/net-mail/zarafa/files/7.0.0.27791/zarafa-7.0.0-package.patch b/net-mail/zarafa/files/7.0.0.27791/zarafa-7.0.0-package.patch index 404ab5e..a205d5b 100644 --- a/net-mail/zarafa/files/7.0.0.27791/zarafa-7.0.0-package.patch +++ b/net-mail/zarafa/files/7.0.0.27791/zarafa-7.0.0-package.patch @@ -15,55 +15,6 @@ diff -uNr zarafa-7.0.0.orig//ECtools/Makefile.am zarafa-7.0.0/ECtools/Makefile.a -endif - SUBDIRS = $(PROSUBS) zarafa-archiver zarafa-admin zarafa-monitor zarafa-passwd zarafa-fsck zarafa-cfgchecker zarafa-stats zarafa-indexer -diff -uNr zarafa-7.0.0.orig//ECtools/zarafa-archiver/Makefile.am zarafa-7.0.0/ECtools/zarafa-archiver/Makefile.am ---- zarafa-7.0.0.orig//ECtools/zarafa-archiver/Makefile.am 2011-07-26 02:33:33.780000103 +0200 -+++ zarafa-7.0.0/ECtools/zarafa-archiver/Makefile.am 2011-07-26 02:35:35.898000128 +0200 -@@ -24,17 +24,6 @@ - - - --if ! OSS_ONLY --bin_PROGRAMS = zarafa-archiver -- --zarafa_archiver_LDADD = ${top_builddir}/common/libcommon_util.la \ -- libarchiver.la \ -- $(PROG_LIBS) -- --zarafa_archiver_SOURCES = main.cpp --endif -- -- - check-syntax: - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ - -fsyntax-only -fmessage-length=0 ${CHK_SOURCES} -Wall -Wformat=2 -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-07-26 02:33:33.781000103 +0200 -+++ zarafa-7.0.0/ECtools/zarafa-stats/Makefile.am 2011-07-26 02:35:57.185000102 +0200 -@@ -1,9 +1,5 @@ - bin_PROGRAMS = zarafa-stats - --if ! OSS_ONLY --dist_noinst_DATA = zarafa-ssm zarafa-ssm.default zarafa-ssm.cron --endif -- - AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX \ - -I${top_srcdir}/mapi4linux/include \ - -I${top_srcdir}/libfreebusy \ -@@ -18,14 +14,6 @@ - zarafa_stats_SOURCES = zarafa-stats.cpp - - install-data-hook: --if ! OSS_ONLY -- mkdir -p $(DESTDIR)/$(sysconfdir)/default -- install -m 644 ${top_srcdir}/ECtools/zarafa-stats/zarafa-ssm.default $(DESTDIR)/$(sysconfdir)/default/zarafa-ssm -- mkdir -p $(DESTDIR)/$(sysconfdir)/cron.d -- install -m 644 ${top_srcdir}/ECtools/zarafa-stats/zarafa-ssm.cron $(DESTDIR)/$(sysconfdir)/cron.d/zarafa-ssm -- mkdir -p $(DESTDIR)/$(bindir) -- install -m 755 ${top_srcdir}/ECtools/zarafa-stats/zarafa-ssm $(DESTDIR)/$(bindir) --endif - - check-syntax: - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ diff -uNr zarafa-7.0.0.orig//Makefile.am zarafa-7.0.0/Makefile.am --- zarafa-7.0.0.orig//Makefile.am 2011-07-26 02:33:33.804000103 +0200 +++ zarafa-7.0.0/Makefile.am 2011-07-26 02:34:14.491000119 +0200 @@ -109,139 +60,3 @@ diff -uNr zarafa-7.0.0.orig//configure.ac zarafa-7.0.0/configure.ac AC_OUTPUT -diff -uNr zarafa-7.0.0.orig//installer/linux/Makefile.am zarafa-7.0.0/installer/linux/Makefile.am ---- zarafa-7.0.0.orig//installer/linux/Makefile.am 2011-07-26 02:33:33.790000103 +0200 -+++ zarafa-7.0.0/installer/linux/Makefile.am 2011-07-26 02:36:23.032000098 +0200 -@@ -59,16 +59,6 @@ - dist_sysconf_rotate_DATA = zarafa.logrotate - - sysconf_certdir = ${sysconfdir}/zarafa/report-ca --if ! OSS_ONLY --BUILT_SOURCES += ldapms.openldap.cfg ldapms.active-directory.cfg -- --config_files += licensed.cfg archiver.cfg --rhel_initscript_files += zarafa-licensed.init.rhel --suse_initscript_files += zarafa-licensed.init.suse --cbs4_initscript_files += zarafa-licensed.init.cbs4 -- --dist_sysconf_cert_DATA = addtrust.crt --endif - - config_files += $(BUILT_SOURCES) - EXTRA_DIST = $(BUILT_SOURCES) ldap.m4 \ -diff -uNr zarafa-7.0.0.orig//provider/plugins/Makefile.am zarafa-7.0.0/provider/plugins/Makefile.am ---- zarafa-7.0.0.orig//provider/plugins/Makefile.am 2011-07-26 02:33:33.739000103 +0200 -+++ zarafa-7.0.0/provider/plugins/Makefile.am 2011-07-26 02:35:06.831000114 +0200 -@@ -20,15 +20,6 @@ - ldapplugin_la_SOURCES = LDAPUserPlugin.cpp LDAPUserPlugin.h LDAPCache.cpp LDAPCache.h ldappasswords.cpp ldappasswords.h $(COMMON_PLUGIN_FILES) - ldapplugin_la_LDFLAGS = -module -avoid-version - ldapplugin_la_LIBADD = ${top_builddir}/common/libcommon_util.la $(LDAP_LIBS) -- --if ! OSS_ONLY --pkglib_LTLIBRARIES += ldapmsplugin.la --ldapmsplugin_la_CXXFLAGS = $(ldapplugin_la_CXXFLAGS) -DWITH_MULTISERVER --ldapmsplugin_la_SOURCES = $(ldapplugin_la_SOURCES) --ldapmsplugin_la_LDFLAGS = $(ldapplugin_la_LDFLAGS) --ldapmsplugin_la_LIBADD = $(ldapplugin_la_LIBADD) --endif -- - endif - - # default plugin -diff -uNr zarafa-7.0.0.orig//swig/Makefile.am zarafa-7.0.0/swig/Makefile.am ---- zarafa-7.0.0.orig//swig/Makefile.am 2011-07-26 02:33:33.835000103 +0200 -+++ zarafa-7.0.0/swig/Makefile.am 2011-07-26 02:34:33.381000111 +0200 -@@ -19,10 +19,6 @@ - - EXTRA_DIST = edkmdb.i mapi.i mapiutil.i mapidefs.i mapicode.i mapix.i mapinotifsink.i typemap.i helpers.i IECMultiStoreTable.i IECServiceAdmin.i IECSpooler.i IECTestProtocol.i IECLicense.i inetmapi.i icalmapi.i swig_iunknown.h ecdefs.i libcommon.i archiver.i licenseclient.i - --if ! OSS_ONLY --EXTRA_DIST += licensereq.i --endif -- - check-syntax: - $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ - -fsyntax-only -fmessage-length=0 ${CHK_SOURCES} -Wall -Wformat=2 -diff -uNr zarafa-7.0.0.orig//swig/python/Makefile.am zarafa-7.0.0/swig/python/Makefile.am ---- zarafa-7.0.0.orig//swig/python/Makefile.am 2011-07-26 02:33:33.828000103 +0200 -+++ zarafa-7.0.0/swig/python/Makefile.am 2011-07-26 02:37:15.620000128 +0200 -@@ -1,10 +1,6 @@ - pythonexeclib_LTLIBRARIES = _MAPICore.la _inetmapi.la _icalmapi.la _licenseclient.la - noinst_LTLIBRARIES = _libcommon.la _archiver.la - --if ! OSS_ONLY --pythonexeclib_LTLIBRARIES += _licensereq.la --endif -- - # disable warnings since code is mostly generated - AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common $(PYTHON_INCLUDES) -I${top_srcdir}/swig -w -DSWIG_PYTHON_OUTPUT_TUPLE - -@@ -50,14 +46,6 @@ - ${top_builddir}/mapi4linux/src/libmapi.la \ - $(PROG_LIBS) $(PYTHON_LIBS) $(SSL_LIBS) - --if ! OSS_ONLY --_licensereq_la_CXXFLAGS = -I${top_srcdir}/provider/common -I${top_builddir}/provider/soap -I${top_srcdir}/provider/soap -I${top_srcdir}/liblicense --_licensereq_la_LDFLAGS = -module -avoid-version --_licensereq_la_LIBADD = ${top_builddir}/liblicense/liblicense.la \ -- ${top_builddir}/common/libcommon_mapi.la \ -- ${top_builddir}/common/libcommon_util.la \ -- $(PROG_LIBS) $(PYTHON_LIBS) $(SSL_LIBS) --endif - - # noinst_ and rpath will generate the _libcommon.so file - _libcommon_la_LDFLAGS = -module -avoid-version -rpath '$(libdir)' -@@ -76,10 +64,6 @@ - libcommon_wrap.cxx \ - licenseclient_wrap.cxx - --if ! OSS_ONLY --BUILT_SOURCES += licensereq_wrap.cxx --endif -- - CLEANFILES = $(BUILT_SOURCES) \ - MAPICore.py \ - inetmapi.py \ -@@ -88,10 +72,6 @@ - libcommon.py \ - licenseclient.py - --if ! OSS_ONLY --CLEANFILES += licensereq.py --endif -- - # wait for full output of swig - MAPICore.py: $(BUILT_SOURCES) - inetmapi.py: $(BUILT_SOURCES) -@@ -100,10 +80,6 @@ - libcommon.py: $(BUILT_SOURCES) - licenseclient.py: $(BUILT_SOURCES) - --if ! OSS_ONLY --licensereq.py: $(BUILT_SOURCES) --endif -- - _MAPICore_la_SOURCES = conversion.h conversion.cpp mapi_wrap.cxx mapi_wrap.h scl.h ../director_util.h ../director_util.cpp - _inetmapi_la_SOURCES = conversion.h conversion.cpp inetmapi_wrap.cxx - _icalmapi_la_SOURCES = conversion.h conversion.cpp icalmapi_wrap.cxx -@@ -111,20 +87,11 @@ - _libcommon_la_SOURCES = libcommon_wrap.cxx - _licenseclient_la_SOURCES = licenseclient_wrap.cxx licenseclient_conv.cpp licenseclient_conv.h - --if ! OSS_ONLY --_licensereq_la_SOURCES = licensereq_wrap.cxx --endif -- - EXTRA_DIST = typemap_python.i helpers_python.i setup.py $(BUILT_SOURCES) MAPICore.py inetmapi.py icalmapi.py licenseclient.py MAPI/Defs.py MAPI/__init__.py MAPI/Struct.py MAPI/Tags.py MAPI/Time.py MAPI/Util/__init__.py MAPI/Util/Generators.py MAPI/Util/Iterators.py archiver_python.i - datadir = $(pythonexeclibdir) - data_DATA = MAPICore.py inetmapi.py icalmapi.py licenseclient.py - noinst_datadir = libcommon.py - --if ! OSS_ONLY --EXTRA_DIST += licensereq.py --data_DATA += licensereq.py --endif -- - mapi_wrap.h: mapi_wrap.cxx - mapi_wrap.cxx: ../mapi.i ../mapiutil.i ../mapidefs.i ../mapicode.i ../mapix.i ../mapinotifsink.i ../mapiutil.i ../typemap.i ../helpers.i ../edkmdb.i ../IECServiceAdmin.i ../ecdefs.i typemap_python.i helpers_python.i - if test "x$(SWIG_EXEC)" = "x"; then echo "swig is required for 'make dist'"; exit 1; fi diff --git a/net-mail/zarafa/zarafa-7.0.0.27791.ebuild b/net-mail/zarafa/zarafa-7.0.0.27791.ebuild index 3633e29..c72a1a2 100644 --- a/net-mail/zarafa/zarafa-7.0.0.27791.ebuild +++ b/net-mail/zarafa/zarafa-7.0.0.27791.ebuild @@ -9,7 +9,7 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" USE_PHP="php5-3" -inherit php-ext-source-r2 eutils autotools rpm5 versionator +inherit php-ext-source-r2 eutils autotools versionator rpm5 MY_PV=$(replace_version_separator 3 '-' ) MY_PVV=$(replace_version_separator 3 'beta' $MY_PV ) @@ -19,8 +19,8 @@ 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 - amd64? ( licensed? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tar.gz ) ) - x86? ( licensed? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tar.gz ) ) + amd64? ( licensed? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-debian-6.0-x86_64-free.tar.gz ) ) + x86? ( licensed? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-debian-6.0-i386-free.tar.gz ) ) bash-completion? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=434 -> ${PN}-bash-completion-${PV}.zip ) smime? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=554 -> ${PN}-webaccess-plugin-smime-${PV}.zip ) dspam? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=125 -> ${PN}-webaccess-plugin-dspam-${PV}.tar.gz ) @@ -35,9 +35,9 @@ SRC_URI="http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/sourcecod LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="" RESTRICT="" -IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash bash-completion smime dspam google-maps themes mobile-device archive" +IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash bash-completion smime dspam google-maps themes mobile-device archive icu unicode" RDEPEND=">=dev-libs/libical-0.44 dev-cpp/libvmime @@ -66,7 +66,8 @@ RDEPEND=">=dev-libs/libical-0.44 testtools? ( dev-python/testtools ) licensed? ( dev-libs/openssl:0.9.8 - dev-libs/icu + dev-libs/icu:4.4 + dev-libs/boost:1.42 >=sys-libs/zlib-1.2.4 ) bash-completion? ( app-shells/bash-completion )" @@ -100,7 +101,8 @@ src_unpack() { cd "${WORKDIR}" mkdir licensed cd licensed - rpm5_unpack $(find ./../ -name "zarafa-licensed*.rpm") + unpack $(find ./../ -name "zarafa-licensed*.deb") + unpack ./data.tar.gz cd "${S}" fi } @@ -129,7 +131,9 @@ src_configure() { $(use_enable sparsehash) \ $(use_enable tcmalloc) \ $(use_enable testtools) \ - $(use_enable debug) + $(use_enable debug) \ + $(use_enable icu) \ + $(use_enable unicode) } @@ -187,15 +191,16 @@ src_install() { # 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" + #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/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" + doconfd "${WORKDIR}"/licensed/etc/default/zarafa-ssm || die "Failed to install sysconfig files" newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files" fi fi