- update evolution-data-server to 1.10.1

- enable ssl by default

please note that some regression tests still fail, these will be addressed later.

help and ok kurt@
This commit is contained in:
jasper 2007-05-17 14:40:53 +00:00
parent e2865d8ded
commit 3b1121bd22
9 changed files with 995 additions and 927 deletions

View File

@ -1,24 +1,26 @@
# $OpenBSD: Makefile,v 1.16 2006/12/16 12:22:33 espie Exp $
# $OpenBSD: Makefile,v 1.17 2007/05/17 14:40:53 jasper Exp $
SHARED_ONLY= Yes
COMMENT= "data backends for the Evolution mail/PIM suite"
R= 1.2
DISTNAME= evolution-data-server-$R.3
PKGNAME= ${DISTNAME}p1
R= 1.10
DISTNAME= evolution-data-server-${R}.1
CATEGORIES= databases
SHARED_LIBS += edataserver-$R 4.1 # .4.1
SHARED_LIBS += egroupwise-$R 5.1 # .5.1
SHARED_LIBS += camel-$R 0.0 # .0.0
SHARED_LIBS += camel-provider-$R 4.3 # .4.3
SHARED_LIBS += ebook-$R 4.2 # .4.2
SHARED_LIBS += edata-book-$R 3.1 # .3.1
SHARED_LIBS += ecal-$R 3.1 # .3.1
SHARED_LIBS += edata-cal-$R 3.2 # .3.2
SHARED_LIBS += edataserverui-$R 5.3 # .5.3
SHARED_LIBS += edataserver-1.2 9.0 # .9.0
SHARED_LIBS += egroupwise-1.2 13.0 # .13.0
SHARED_LIBS += exchange-storage-1.2 3.0 # .3.0
SHARED_LIBS += camel-1.2 10.0 # .10.0
SHARED_LIBS += camel-provider-1.2 10.0 # .10.0
SHARED_LIBS += ebook-1.2 9.1 # .9.1
SHARED_LIBS += edata-book-1.2 6.0 # .6.0
SHARED_LIBS += ecal-1.2 7.1 # .7.1
SHARED_LIBS += edata-cal-1.2 6.1 # .6.1
SHARED_LIBS += edataserverui-1.2 8.1 # .8.1
HOMEPAGE= http://www.gnome.org
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-data-server/1.2/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-data-server/${R}/}
EXTRACT_SUFX= .tar.bz2
# GPL
@ -26,35 +28,45 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ORBit-2 ORBitCosNaming-2 \
audiofile esd \
bonobo-2 bonobo-activation \
c crypto m pthread ssl z \
gconf-2 glib-2.0 gmodule-2.0 \
gnomevfs-2 gobject-2.0 gthread-2.0 \
popt xml2
WANTLIB= ORBit-2 ORBitCosNaming-2 X11 Xau Xcursor Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender asn1 atk-1.0 audiofile \
bonobo-2 bonobo-activation c cairo com_err crypto dbus-1 \
dbus-glib-1 esd expat fontconfig freetype gconf-2 glib-2.0 \
glitz gmodule-2.0 gnomevfs-2 gobject-2.0 gssapi gthread-2.0 \
krb5 m nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 plc4 plds4 \
png popt pthread sasl2 ssl util xml2 z
MODULES= devel/gettext
MODULES= devel/gettext \
lang/python
BUILD_DEPENDS= :bison-*:devel/bison \
:p5-XML-Parser-*:textproc/p5-XML-Parser \
:openldap-client-*:databases/openldap \
:libgnomeui-*:x11/gnome/libgnomeui
LIB_DEPENDS= gnome-2::x11/gnome/libgnome \
soup-2.2.>=7.0::devel/libsoup
LIB_DEPENDS= ldap,lber::databases/openldap \
glade-2.0::devel/libglade2 \
soup-2.2.>=7.0::devel/libsoup \
gnome-2::x11/gnome/libgnome \
gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
YACC= bison
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evolution-data-server
CONFIGURE_ARGS+= --with-openldap=${LOCALBASE}
CONFIGURE_ARGS+= --disable-nss
CONFIGURE_ARGS+= --disable-smime
CONFIGURE_ARGS+= --disable-dependency-tracking
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evolution-data-server \
--with-openldap=${LOCALBASE} \
--enable-gnome-keyring=no \
--enable-nss=yes \
--enable-smime=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
SUBST_VARS= R
post-extract:
@perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},' \
${WRKSRC}/addressbook/libebook/gen-western-table.py
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (evolution-data-server-1.2.3.tar.bz2) = Bn2AiVfUs6xgFZ+MjBNY+w==
RMD160 (evolution-data-server-1.2.3.tar.bz2) = 6ymxiQWcieSmha+dzq31yRFOTEw=
SHA1 (evolution-data-server-1.2.3.tar.bz2) = b3LNG/4uhr034pAIZVQbZq3ub78=
SHA256 (evolution-data-server-1.2.3.tar.bz2) = y1i9AbCVBmfWo3Cx4mLCZbnm6ThRrV3GxrAT5LOyxno=
SIZE (evolution-data-server-1.2.3.tar.bz2) = 14152903
MD5 (evolution-data-server-1.10.1.tar.bz2) = EXW/dnVgCZdfaEEW52Y4ww==
RMD160 (evolution-data-server-1.10.1.tar.bz2) = 7fVcdMRY7YSWNazlI0BhUBetam0=
SHA1 (evolution-data-server-1.10.1.tar.bz2) = aWkc9vy+Q9X/SFxJdV7/2PqGgb4=
SHA256 (evolution-data-server-1.10.1.tar.bz2) = KJpUGXT7N+0+I5Kxn9PoNCm/7NaHPbUtRZitTbXR6QU=
SIZE (evolution-data-server-1.10.1.tar.bz2) = 7120388

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-addressbook_backends_groupwise_e-book-backend-groupwise_c,v 1.4 2005/05/24 22:10:45 marcm Exp $
--- addressbook/backends/groupwise/e-book-backend-groupwise.c.orig Mon Mar 14 17:26:35 2005
+++ addressbook/backends/groupwise/e-book-backend-groupwise.c Tue Apr 5 20:57:51 2005
@@ -2231,7 +2231,7 @@ update_cache (EBookBackendGroupwise *ebg
stat (cache_file_name, &buf);
mod_time = buf.st_mtime;
tm = gmtime (&mod_time);
- strftime (time_string, 100, "%Y-%m-%dT%H:%M:%SZ", tm);
+ strftime (time_string, 25, "%Y-%m-%dT%H:%M:%SZ", tm);
filter = e_gw_filter_new ();
e_gw_filter_add_filter_component (filter, E_GW_FILTER_OP_GREATERTHAN, "modified", time_string);

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-calendar_libical_src_libical_icalrecur_c,v 1.1.1.1 2004/06/25 16:21:32 marcm Exp $
--- calendar/libical/src/libical/icalrecur.c.orig 2003-12-11 18:44:25.000000000 -0800
+++ calendar/libical/src/libical/icalrecur.c 2003-12-11 18:46:39.000000000 -0800
@@ -154,6 +154,7 @@ typedef long intptr_t;
$OpenBSD: patch-calendar_libical_src_libical_icalrecur_c,v 1.2 2007/05/17 14:40:53 jasper Exp $
--- calendar/libical/src/libical/icalrecur.c.orig Wed Jan 3 16:02:32 2007
+++ calendar/libical/src/libical/icalrecur.c Sun Apr 22 21:11:41 2007
@@ -148,6 +148,7 @@
#include <string.h> /* for strdup and strchr*/
#include <assert.h>
#include <stddef.h> /* For offsetof() macro */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libdb_dist_configure,v 1.2 2004/12/11 06:03:08 marcm Exp $
--- libdb/dist/configure.orig Mon Oct 11 12:04:13 2004
+++ libdb/dist/configure Wed Oct 13 21:17:46 2004
@@ -7756,7 +7756,7 @@ _ACEOF
$OpenBSD: patch-libdb_dist_configure,v 1.3 2007/05/17 14:40:53 jasper Exp $
--- libdb/dist/configure.orig Wed Jan 3 11:10:02 2007
+++ libdb/dist/configure Sun Apr 22 21:11:41 2007
@@ -7768,7 +7768,7 @@ _ACEOF
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@ -10,7 +10,7 @@ $OpenBSD: patch-libdb_dist_configure,v 1.2 2004/12/11 06:03:08 marcm Exp $
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
@@ -7766,7 +7766,7 @@ _ACEOF
@@ -7778,7 +7778,7 @@ _ACEOF
hardcode_libdir_flag_spec='-R$libdir'
;;
*)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-servers_groupwise_e-gw-connection_c,v 1.1 2006/01/06 00:10:41 pvalchev Exp $
--- servers/groupwise/e-gw-connection.c.orig Thu Jan 5 12:35:48 2006
+++ servers/groupwise/e-gw-connection.c Thu Jan 5 12:36:10 2006
@@ -1764,8 +1764,8 @@ e_gw_connection_get_categories (EGwConne
$OpenBSD: patch-servers_groupwise_e-gw-connection_c,v 1.2 2007/05/17 14:40:53 jasper Exp $
--- servers/groupwise/e-gw-connection.c.orig Wed Jan 3 11:09:26 2007
+++ servers/groupwise/e-gw-connection.c Sun Apr 22 21:11:41 2007
@@ -1996,8 +1996,8 @@ e_gw_connection_get_categories (EGwConnection *cnc, GH
EGwConnectionPrivate *priv;
SoupSoapParameter *param, *subparam, *second_level_child;
char *id, *name;

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-servers_groupwise_e-gw-item_c,v 1.1 2006/01/06 00:10:41 pvalchev Exp $
--- servers/groupwise/e-gw-item.c.orig Thu Jan 5 12:39:13 2006
+++ servers/groupwise/e-gw-item.c Thu Jan 5 12:41:18 2006
@@ -2757,8 +2757,8 @@ e_gw_item_set_calendar_item_elements (EG
/*attachments*/
if (priv->attach_list) {
- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
GSList *al ;
+ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
for (al = priv->attach_list ; al != NULL ; al = al->next) {
EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ;
add_attachment_to_soap_message (attachment, msg) ;
@@ -2825,8 +2825,8 @@ e_gw_item_append_to_soap_message (EGwIte
/*attachments*/
if (priv->attach_list) {
- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
GSList *al ;
+ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ;
for (al = priv->attach_list ; al != NULL ; al = al->next) {
EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ;
add_attachment_to_soap_message (attachment, msg) ;

View File

@ -1,27 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2005/12/26 19:15:21 sturm Exp $
lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.so
lib/evolution-data-server-1.2/camel-providers/libcamelimap.so
lib/evolution-data-server-1.2/camel-providers/libcamelimap4.so
lib/evolution-data-server-1.2/camel-providers/libcamellocal.so
lib/evolution-data-server-1.2/camel-providers/libcamelnntp.so
lib/evolution-data-server-1.2/camel-providers/libcamelpop3.so
lib/evolution-data-server-1.2/camel-providers/libcamelsendmail.so
lib/evolution-data-server-1.2/camel-providers/libcamelsmtp.so
lib/evolution-data-server-1.2/extensions/libebookbackendfile.so
lib/evolution-data-server-1.2/extensions/libebookbackendgroupwise.so
@comment lib/evolution-data-server-1.2/extensions/libebookbackendldap.so
lib/evolution-data-server-1.2/extensions/libebookbackendvcf.so
lib/evolution-data-server-1.2/extensions/libecalbackendcontacts.so
lib/evolution-data-server-1.2/extensions/libecalbackendfile.so
lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.so
lib/evolution-data-server-1.2/extensions/libecalbackendhttp.so
lib/evolution-data-server-1.2/extensions/libecalbackendweather.so
@lib lib/libcamel-1.2.so.${LIBcamel-1.2_VERSION}
@lib lib/libcamel-provider-1.2.so.${LIBcamel-provider-1.2_VERSION}
@lib lib/libebook-1.2.so.${LIBebook-1.2_VERSION}
@lib lib/libecal-1.2.so.${LIBecal-1.2_VERSION}
@lib lib/libedata-book-1.2.so.${LIBedata-book-1.2_VERSION}
@lib lib/libedata-cal-1.2.so.${LIBedata-cal-1.2_VERSION}
@lib lib/libedataserver-1.2.so.${LIBedataserver-1.2_VERSION}
@lib lib/libedataserverui-1.2.so.${LIBedataserverui-1.2_VERSION}
@lib lib/libegroupwise-1.2.so.${LIBegroupwise-1.2_VERSION}

File diff suppressed because it is too large Load Diff