summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-09-10 04:11:17 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-09-10 04:11:17 +0800
commitfc207350d817f713d7bf643ef64f44b007b579c1 (patch)
tree9033b0d3c43b5d9163f3ec9891f4e65b6617fdfd
parent4ddcf53ce437c08f237a3c204fe886f0f5350cd7 (diff)
downloadmarcuscom-ports-fc207350d817f713d7bf643ef64f44b007b579c1.tar
marcuscom-ports-fc207350d817f713d7bf643ef64f44b007b579c1.tar.gz
marcuscom-ports-fc207350d817f713d7bf643ef64f44b007b579c1.tar.bz2
marcuscom-ports-fc207350d817f713d7bf643ef64f44b007b579c1.tar.lz
marcuscom-ports-fc207350d817f713d7bf643ef64f44b007b579c1.tar.xz
marcuscom-ports-fc207350d817f713d7bf643ef64f44b007b579c1.tar.zst
marcuscom-ports-fc207350d817f713d7bf643ef64f44b007b579c1.zip
Map the nickname attribute to "nickname" instead of "displayName" for the
LDAP backend. This fixes LDAP for me at work, but may break other implementations. PLEASE, if LDAP addressbooks (straight LDAP, not Exchange) were working for you, make sure they still do. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4807 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--databases/evolution-data-server/Makefile3
-rw-r--r--databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c13
2 files changed, 15 insertions, 1 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 96f08a55c..3bdb3993b 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.60 2005/08/29 03:24:21 marcus Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.61 2005/09/05 17:02:12 kwm Exp $
#
PORTNAME= evolution-data-server
PORTVERSION= 1.4.0
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4
diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
new file mode 100644
index 000000000..51f468867
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
@@ -0,0 +1,13 @@
+--- addressbook/backends/ldap/e-book-backend-ldap.c.orig Fri Sep 9 16:06:37 2005
++++ addressbook/backends/ldap/e-book-backend-ldap.c Fri Sep 9 16:08:21 2005
+@@ -301,8 +301,8 @@ struct prop_info {
+
+ /* misc fields */
+ STRING_PROP (E_CONTACT_HOMEPAGE_URL, "labeledURI"),
+- /* map nickname to displayName */
+- STRING_PROP (E_CONTACT_NICKNAME, "displayName"),
++ /* map nickname to nickname */
++ STRING_PROP (E_CONTACT_NICKNAME, "nickname"),
+ E_STRING_PROP (E_CONTACT_SPOUSE, "spouseName"),
+ E_STRING_PROP (E_CONTACT_NOTE, "note"),
+ E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare),