Bugfix update to zarafa-6.30.4.

This commit is contained in:
ajacoutot 2009-10-21 09:59:54 +00:00
parent 457d86509c
commit 4b5489ce86
16 changed files with 78 additions and 78 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.24 2009/10/20 22:34:26 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.25 2009/10/21 09:59:54 ajacoutot Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-php= MAPI extensions for php5
V= 6.30.3
V= 6.30.4
DISTNAME= zarafa-${V}
PKGNAME-main= ${DISTNAME}

View File

@ -1,5 +1,5 @@
MD5 (zarafa/zarafa-6.30.3.tar.gz) = +qtG/Jab1PwszGZ54syypg==
RMD160 (zarafa/zarafa-6.30.3.tar.gz) = UZMF5+wDjDQuk2JGPqEB3hsATZs=
SHA1 (zarafa/zarafa-6.30.3.tar.gz) = GBlc6oD/QEQymh0FfqEn7AM5bPk=
SHA256 (zarafa/zarafa-6.30.3.tar.gz) = q2q3OP7fvWnjkLvD2fKP+HjRoKKRah+qgYtY7xOEY78=
SIZE (zarafa/zarafa-6.30.3.tar.gz) = 2282646
MD5 (zarafa/zarafa-6.30.4.tar.gz) = E50tUsOVz/ymHGarRkYLSA==
RMD160 (zarafa/zarafa-6.30.4.tar.gz) = WYI118oIKYBdZggWrYjyRfjXYJI=
SHA1 (zarafa/zarafa-6.30.4.tar.gz) = PORnpmMNMdSj1T/eAau2Bd9gt78=
SHA256 (zarafa/zarafa-6.30.4.tar.gz) = DQHVHZTdQFMYQ0KxejZ5qEQDHXfwFoahQTvLR+N+o60=
SIZE (zarafa/zarafa-6.30.4.tar.gz) = 2284024

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.3 2009/10/20 22:34:26 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig Fri Oct 9 22:08:27 2009
+++ ECtools/ECTestTools/IMAPTest/Makefile.in Tue Oct 20 23:41:36 2009
@@ -236,7 +236,7 @@ sharedstatedir = @sharedstatedir@
$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.4 2009/10/21 09:59:54 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig Fri Oct 16 20:39:17 2009
+++ ECtools/ECTestTools/IMAPTest/Makefile.in Wed Oct 21 11:32:04 2009
@@ -237,7 +237,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.2 2009/10/20 22:34:26 ajacoutot Exp $
--- ECtools/zarafa-cfgchecker/Makefile.in.orig Fri Oct 9 22:08:30 2009
+++ ECtools/zarafa-cfgchecker/Makefile.in Tue Oct 20 23:41:36 2009
@@ -257,7 +257,9 @@ sharedstatedir = @sharedstatedir@
$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.3 2009/10/21 09:59:54 ajacoutot Exp $
--- ECtools/zarafa-cfgchecker/Makefile.in.orig Fri Oct 16 20:39:20 2009
+++ ECtools/zarafa-cfgchecker/Makefile.in Wed Oct 21 11:32:04 2009
@@ -258,7 +258,9 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I${top_srcdir}/common

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_Makefile_in,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
--- common/Makefile.in.orig Fri Oct 9 22:08:32 2009
+++ common/Makefile.in Tue Oct 20 23:41:36 2009
@@ -290,7 +290,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-common_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
--- common/Makefile.in.orig Fri Oct 16 20:39:22 2009
+++ common/Makefile.in Wed Oct 21 11:32:04 2009
@@ -291,7 +291,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/libfreebusy
@ -10,7 +10,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
rtfutil.cpp \
codepage.cpp \
@@ -305,7 +305,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
@@ -306,7 +306,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
ZarafaCode.cpp \
ECABEntryID.cpp
@ -19,7 +19,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
libcommon_util_la_SOURCES = platform.cpp \
platform.linux.cpp \
md5.cpp \
@@ -323,7 +323,7 @@ libcommon_util_la_SOURCES = platform.cpp \
@@ -324,7 +324,7 @@ libcommon_util_la_SOURCES = platform.cpp \
RecurrenceState.cpp \
recurrence.cpp

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
--- configure.orig Fri Oct 9 22:08:24 2009
+++ configure Tue Oct 20 23:41:36 2009
@@ -21643,12 +21643,7 @@ else
$OpenBSD: patch-configure,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
--- configure.orig Fri Oct 16 20:39:15 2009
+++ configure Wed Oct 21 11:32:04 2009
@@ -21647,12 +21647,7 @@ else
want_release=no
fi
@ -12,9 +12,9 @@ $OpenBSD: patch-configure,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
CXXFLAGS="$CXXFLAGS -fPIC"
-fi
# Check whether --enable-oss was given.
if test "${enable_oss+set}" = set; then
@@ -22482,7 +22477,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
# Check whether --enable-tcmalloc was given.
if test "${enable_tcmalloc+set}" = set; then
@@ -22494,7 +22489,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
_ACEOF
VMIME_CFLAGS=-I$VMIME_PREFIX
@ -23,7 +23,7 @@ $OpenBSD: patch-configure,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
else
@@ -22766,7 +22761,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -22778,7 +22773,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
ICAL_CFLAGS=-I$ICAL_PREFIX
@ -32,7 +32,7 @@ $OpenBSD: patch-configure,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
else
WITH_ICAL=no
fi
@@ -23541,13 +23536,13 @@ LIBS=$libs_keep
@@ -23647,13 +23642,13 @@ LIBS=$libs_keep
libs_keep=$LIBS
# check lib, but do not set in link list
@ -49,7 +49,7 @@ $OpenBSD: patch-configure,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -23607,7 +23602,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
@@ -23713,7 +23708,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
#define HAVE_LIBPTHREAD 1
_ACEOF

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
--- doc/Makefile.in.orig Fri Oct 9 22:08:32 2009
+++ doc/Makefile.in Tue Oct 20 23:41:36 2009
@@ -373,12 +373,12 @@ uninstall-man5:
$OpenBSD: patch-doc_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
--- doc/Makefile.in.orig Fri Oct 16 20:39:22 2009
+++ doc/Makefile.in Wed Oct 21 11:32:04 2009
@@ -374,12 +374,12 @@ uninstall-man5:
done
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)
@ -17,7 +17,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
done
uninstall-dist_dataDATA:
@@ -523,7 +523,7 @@ $(BUILT_SOURCES): manual.xml
@@ -524,7 +524,7 @@ $(BUILT_SOURCES): manual.xml
@if [ -z $(PROG_XMLTO) ]; then \
echo Please install xmlto to generate manual pages; \
else \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-installer_Makefile_in,v 1.3 2009/10/20 22:34:26 ajacoutot Exp $
--- installer/Makefile.in.orig Fri Oct 9 22:08:33 2009
+++ installer/Makefile.in Tue Oct 20 23:41:36 2009
@@ -272,12 +272,12 @@ distclean-libtool:
$OpenBSD: patch-installer_Makefile_in,v 1.4 2009/10/21 09:59:54 ajacoutot Exp $
--- installer/Makefile.in.orig Fri Oct 16 20:39:23 2009
+++ installer/Makefile.in Wed Oct 21 11:32:04 2009
@@ -273,12 +273,12 @@ distclean-libtool:
uninstall-info-am:
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_Makefile_in,v 1.5 2009/10/20 22:34:26 ajacoutot Exp $
--- installer/linux/Makefile.in.orig Fri Oct 9 22:08:33 2009
+++ installer/linux/Makefile.in Tue Oct 20 23:42:54 2009
$OpenBSD: patch-installer_linux_Makefile_in,v 1.6 2009/10/21 09:59:54 ajacoutot Exp $
--- installer/linux/Makefile.in.orig Fri Oct 16 20:39:23 2009
+++ installer/linux/Makefile.in Wed Oct 21 11:32:04 2009
@@ -57,22 +57,11 @@ SOURCES =
DIST_SOURCES =
am__dist_data_DATA_DIST = server.cfg unix.cfg ldap.openldap.cfg \
@ -26,7 +26,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.5 2009/10/20 22:34:26 ajacoutot
dist_dataDATA_INSTALL = $(INSTALL_DATA)
am__dist_sysconf_DATA_DIST = ipsseg.crt
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
@@ -219,6 +208,7 @@ datadir = ${docdir}
@@ -220,6 +209,7 @@ datadir = ${docdir}
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
@ -34,7 +34,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.5 2009/10/20 22:34:26 ajacoutot
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -248,12 +238,8 @@ sysconfdir = /etc/zarafa/report-ca
@@ -249,12 +239,8 @@ sysconfdir = /etc/zarafa/report-ca
target_alias = @target_alias@
dist_data_DATA = server.cfg unix.cfg ldap.openldap.cfg ldap.active-directory.cfg \
spooler.cfg gateway.cfg monitor.cfg dagent.cfg ical.cfg zarafa.logrotate \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.3 2009/10/20 22:34:26 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig Fri Oct 9 22:08:34 2009
+++ libfreebusy/Makefile.in Tue Oct 20 23:41:37 2009
@@ -255,7 +255,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.4 2009/10/21 09:59:54 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig Fri Oct 16 20:39:24 2009
+++ libfreebusy/Makefile.in Wed Oct 21 11:32:04 2009
@@ -256,7 +256,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/common

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.3 2009/10/20 22:34:26 ajacoutot Exp $
--- mapi4linux/src/Makefile.in.orig Fri Oct 9 22:08:35 2009
+++ mapi4linux/src/Makefile.in Tue Oct 20 23:41:37 2009
@@ -253,7 +253,7 @@ AM_LDFLAGS = $(DL_LIBS) -export-symbols ${top_srcdir}/
$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.4 2009/10/21 09:59:54 ajacoutot Exp $
--- mapi4linux/src/Makefile.in.orig Fri Oct 16 20:39:25 2009
+++ mapi4linux/src/Makefile.in Wed Oct 21 11:32:04 2009
@@ -254,7 +254,7 @@ AM_LDFLAGS = $(DL_LIBS) -export-symbols ${top_srcdir}/
libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la
# required because we're exporting extern "C" functions and want to filter with 'export-symbols'

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-perl_Makefile_in,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
--- perl/Makefile.in.orig Fri Oct 9 22:08:35 2009
+++ perl/Makefile.in Tue Oct 20 23:41:37 2009
@@ -537,7 +537,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARI
$OpenBSD: patch-perl_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
--- perl/Makefile.in.orig Fri Oct 16 20:39:25 2009
+++ perl/Makefile.in Wed Oct 21 11:32:04 2009
@@ -538,7 +538,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARI
.xs.cpp: typemap

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-php-ext_Makefile_in,v 1.6 2009/10/20 22:34:26 ajacoutot Exp $
--- php-ext/Makefile.in.orig Fri Oct 9 22:08:36 2009
+++ php-ext/Makefile.in Tue Oct 20 23:41:37 2009
@@ -225,7 +225,7 @@ build_alias = @build_alias@
$OpenBSD: patch-php-ext_Makefile_in,v 1.7 2009/10/21 09:59:54 ajacoutot Exp $
--- php-ext/Makefile.in.orig Fri Oct 16 20:39:25 2009
+++ php-ext/Makefile.in Wed Oct 21 11:32:04 2009
@@ -226,7 +226,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@ -10,7 +10,7 @@ $OpenBSD: patch-php-ext_Makefile_in,v 1.6 2009/10/20 22:34:26 ajacoutot Exp $
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
@@ -269,7 +269,7 @@ mapi_la_LDFLAGS = -module -avoid-version \
@@ -270,7 +270,7 @@ mapi_la_LDFLAGS = -module -avoid-version \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/libfreebusy/libfreebusy.la \
${top_builddir}/inetmapi/libinetmapi.la \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_client_Makefile_in,v 1.5 2009/10/20 22:34:26 ajacoutot Exp $
--- provider/client/Makefile.in.orig Fri Oct 9 22:08:36 2009
+++ provider/client/Makefile.in Tue Oct 20 23:41:37 2009
@@ -329,7 +329,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-provider_client_Makefile_in,v 1.6 2009/10/21 09:59:54 ajacoutot Exp $
--- provider/client/Makefile.in.orig Fri Oct 16 20:39:26 2009
+++ provider/client/Makefile.in Wed Oct 21 11:32:04 2009
@@ -330,7 +330,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/libfreebusy \
-I${top_srcdir}/common
@ -10,7 +10,7 @@ $OpenBSD: patch-provider_client_Makefile_in,v 1.5 2009/10/20 22:34:26 ajacoutot
libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS) \
${top_builddir}/provider/soap/libgsoap.la \
${top_builddir}/provider/soap/libsoapclient.la \
@@ -341,7 +341,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)
@@ -342,7 +342,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)
${top_builddir}/mapi4linux/src/libmapi.la \
-lstdc++ $(UUID_LIBS)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_Makefile_in,v 1.4 2009/10/20 22:34:26 ajacoutot Exp $
--- provider/server/Makefile.in.orig Wed Oct 14 10:44:57 2009
+++ provider/server/Makefile.in Wed Oct 14 10:46:28 2009
@@ -273,10 +273,11 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICON
$OpenBSD: patch-provider_server_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
--- provider/server/Makefile.in.orig Wed Oct 21 11:30:44 2009
+++ provider/server/Makefile.in Wed Oct 21 11:31:47 2009
@@ -274,10 +274,11 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICON
${top_builddir}/provider/soap/libgsoap.la \
${top_builddir}/provider/soap/libsoapserver.la \
${top_builddir}/provider/common/libzarafacommon.la \
@ -9,9 +9,9 @@ $OpenBSD: patch-provider_server_Makefile_in,v 1.4 2009/10/20 22:34:26 ajacoutot
+ ${top_builddir}/mapi4linux/src/libmapi.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_ssl.la \
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) -lrt
+ ${top_builddir}/common/libcommon_util.la \
+ $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS)
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+ ${top_builddir}/common/libcommon_util.la \
+ $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS)
zarafa_server_SOURCES = ECServer.cpp \
ECSoapServerConnection.h ECSoapServerConnection.cpp \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-spooler_Makefile_in,v 1.2 2009/10/20 22:34:26 ajacoutot Exp $
--- spooler/Makefile.in.orig Fri Oct 9 22:08:38 2009
+++ spooler/Makefile.in Tue Oct 20 23:41:37 2009
@@ -279,7 +279,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
$OpenBSD: patch-spooler_Makefile_in,v 1.3 2009/10/21 09:59:54 ajacoutot Exp $
--- spooler/Makefile.in.orig Fri Oct 16 20:39:28 2009
+++ spooler/Makefile.in Wed Oct 21 11:32:05 2009
@@ -280,7 +280,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_ssl.la \