Update to 2.91.90.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15259 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 11 insertions, 241 deletions

diff --git a/mail/evolution3/Makefile b/mail/evolution3/Makefile
index 5ff84645a..dfd739d2a 100644
--- a/mail/evolution3/Makefile
+++ b/mail/evolution3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution3/Makefile,v 1.4 2011/02/03 09:39:12 kwm Exp $
+#   $MCom: ports/mail/evolution3/Makefile,v 1.5 2011/02/11 19:36:31 kwm Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.91.6.2
+PORTVERSION=	2.91.90
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -48,6 +48,7 @@ GCONF_SCHEMAS=	apps_evolution_addressbook.schemas \
 		apps-evolution-attachment-reminder.schemas \
 		apps_evolution_calendar.schemas \
 		apps_evolution_email_custom_header.schemas \
+		apps_evolution_eplugin_face.schemas \
 		apps-evolution-mail-notification.schemas \
 		apps-evolution-mail-prompts-checkdefault.schemas \
 		apps_evolution_shell.schemas \
diff --git a/mail/evolution3/distinfo b/mail/evolution3/distinfo
index d62ef9e2c..87d963bb4 100644
--- a/mail/evolution3/distinfo
+++ b/mail/evolution3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/evolution-2.91.6.2.tar.bz2) = 6ddacd232ca4ff6463aa882293e7a7918c227c1bf9f6493b75ffc16692fba084
-SIZE (gnome3/evolution-2.91.6.2.tar.bz2) = 31734818
+SHA256 (gnome3/evolution-2.91.90.tar.bz2) = a9577fca8a10280c3a0303ebca8b861893f01031f74b92e8838e0f5dcd0a2935
+SIZE (gnome3/evolution-2.91.90.tar.bz2) = 31757574
diff --git a/mail/evolution3/files/patch-plugins_tnef-attachments_tnef-plugin.c b/mail/evolution3/files/patch-plugins_tnef-attachments_tnef-plugin.c
deleted file mode 100644
index 122bfd281..000000000
--- a/mail/evolution3/files/patch-plugins_tnef-attachments_tnef-plugin.c
+++ /dev/null
@@ -1,220 +0,0 @@
-From a9fb511ced4cfaffb7109e58a9db66e6279e309c Mon Sep 17 00:00:00 2001
-From: Punit Jain <jpunit@novell.com>
-Date: Tue, 01 Feb 2011 06:47:05 +0000
-Subject: bug #641069 - tnef plugin vulnerabilities
-
-Resolves directory traversal and buffer overflow vulnerabilities.
----
-diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
-index e25bff8..4148008 100644
---- plugins/tnef-attachments/tnef-plugin.c
-+++ plugins/tnef-attachments/tnef-plugin.c
-@@ -25,6 +25,7 @@
- 
- /* We include gi18n-lib.h so that we have strings translated directly for this package */
- #include <glib/gi18n-lib.h>
-+#include <glib/gprintf.h>
- #include <string.h>
- #include <stdio.h>
- 
-@@ -67,6 +68,19 @@ guchar getRruleCount (guchar a, guchar b);
- guchar getRruleMonthNum (guchar a, guchar b);
- gchar * getRruleDayname (guchar a);
- 
-+static gchar* 
-+sanitize_filename (const gchar *filename)
-+{
-+	gchar * sanitized_name;
-+	sanitized_name = g_path_get_basename (filename);
-+	if (sanitized_name == NULL || !g_strcmp0 (sanitized_name, ".")) {
-+		g_free (sanitized_name);
-+		return NULL;
-+	} else {
-+		return g_strdelimit (sanitized_name, " ", '_');
-+	}
-+}
-+
- void
- org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t)
- {
-@@ -216,8 +230,9 @@ void processTnef (TNEFStruct *tnef, const gchar *tmpdir) {
-     Attachment *p;
-     gint RealAttachment;
-     gint object;
--    gchar ifilename[256];
--    gint i, count;
-+    gchar *ifilename = NULL;
-+    gchar *absfilename, *file;
-+    gint count;
-     gint foundCal=0;
- 
-     FILE *fptr;
-@@ -255,10 +270,13 @@ void processTnef (TNEFStruct *tnef, const gchar *tmpdir) {
-                     != MAPI_UNDEFINED) {
-                 variableLength buf;
-                 if ((buf.data = (gchar *) DecompressRTF (filename, &buf.size)) != NULL) {
--                    sprintf(ifilename, "%s/%s.rtf", tmpdir, tnef->subject.data);
--                    for (i=0; i<strlen (ifilename); i++)
--                        if (ifilename[i] == ' ')
--                            ifilename[i] = '_';
-+                    file = sanitize_filename (tnef->subject.data);
-+		    if (!file)
-+			    return;
-+                    absfilename = g_strconcat (file, ".rtf", NULL);
-+                    ifilename = g_build_filename (tmpdir, file, NULL);
-+		    g_free (absfilename);
-+		    g_free (file);
- 
-                     if ((fptr = fopen(ifilename, "wb"))==NULL) {
-                         printf("ERROR: Error writing file to disk!");
-@@ -347,13 +365,14 @@ void processTnef (TNEFStruct *tnef, const gchar *tmpdir) {
-                 }
-                 if (filename->size == 1) {
-                     filename->size = 20;
--                    sprintf(tmpname, "file_%03i.dat", count);
-+                    g_sprintf(tmpname, "file_%03i.dat", count);
-                     filename->data = tmpname;
-                 }
--                sprintf(ifilename, "%s/%s", tmpdir, filename->data);
--                for (i=0; i<strlen (ifilename); i++)
--                    if (ifilename[i] == ' ')
--                        ifilename[i] = '_';
-+                absfilename = sanitize_filename (filename->data);
-+		if (!absfilename)
-+		    return;
-+		ifilename = g_build_filename (tmpdir, absfilename, NULL);
-+                g_free (absfilename);
- 
- 		if ((fptr = fopen(ifilename, "wb"))==NULL) {
- 		    printf("ERROR: Error writing file to disk!");
-@@ -375,33 +394,43 @@ void processTnef (TNEFStruct *tnef, const gchar *tmpdir) {
-         } /* if size>0 */
-         p=p->next;
-     } /* while p!= null */
-+    g_free (ifilename);
- }
- 
- void saveVCard (TNEFStruct *tnef, const gchar *tmpdir) {
--    gchar ifilename[512];
-+    gchar *ifilename;
-+    gchar *absfilename, *file=NULL;
-     FILE *fptr;
-     variableLength *vl;
-     variableLength *pobox, *street, *city, *state, *zip, *country;
-     dtr thedate;
--    gint boolean, i;
-+    gint boolean;
- 
-     if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DISPLAY_NAME))) == MAPI_UNDEFINED) {
-         if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COMPANY_NAME))) == MAPI_UNDEFINED) {
-             if (tnef->subject.size > 0) {
--                sprintf(ifilename, "%s/%s.vcard", tmpdir, tnef->subject.data);
--            } else {
--                sprintf(ifilename, "%s/unknown.vcard", tmpdir);
--            }
--        } else {
--            sprintf(ifilename, "%s/%s.vcard", tmpdir, vl->data);
-+    	       file = sanitize_filename (tnef->subject.data);
-+		if (!file)
-+		    return;
-+		absfilename = g_strconcat (file, ".vcard", NULL);
-+            } else
-+                absfilename = g_strdup ("unknown.vcard");       
-+     } else {
-+            file = sanitize_filename (vl->data);
-+	    if (!file)
-+		return;
-+	    absfilename = g_strconcat (file, ".vcard", NULL);
-         }
-     } else {
--        sprintf(ifilename, "%s/%s.vcard", tmpdir, vl->data);
-+        file = sanitize_filename (vl->data);
-+	if (!file)
-+	    return;
-+	absfilename = g_strconcat (file, ".vcard", NULL);
-     }
--    for (i=0; i<strlen (ifilename); i++)
--        if (ifilename[i] == ' ')
--            ifilename[i] = '_';
--    printf("%s\n", ifilename);
-+
-+    ifilename = g_build_filename (tmpdir, absfilename, NULL);
-+    g_free (file);
-+    g_free (absfilename);
- 
-     if ((fptr = fopen(ifilename, "wb"))==NULL) {
-             printf("Error writing file to disk!");
-@@ -657,6 +686,7 @@ void saveVCard (TNEFStruct *tnef, const gchar *tmpdir) {
-         fprintf(fptr, "END:VCARD\n");
-         fclose (fptr);
-     }
-+    g_free (ifilename);
- }
- 
- guchar getRruleCount (guchar a, guchar b) {
-@@ -842,7 +872,7 @@ void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef)
- }
- 
- void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
--    gchar ifilename[256];
-+    gchar *ifilename;
-     variableLength *filename;
-     gchar *charptr, *charptr2;
-     FILE *fptr;
-@@ -851,7 +881,7 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
-     DWORD dword_val;
-     dtr thedate;
- 
--    sprintf(ifilename, "%s/calendar.ics", tmpdir);
-+    ifilename = g_build_filename (tmpdir, "calendar.vcf", NULL);
-     printf("%s\n", ifilename);
- 
-     if ((fptr = fopen(ifilename, "wb"))==NULL) {
-@@ -1088,13 +1118,15 @@ void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) {
-         fprintf(fptr, "END:VCALENDAR\n");
-         fclose (fptr);
-     }
-+    g_free (ifilename);
- }
- 
- void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
-     variableLength *vl;
-     variableLength *filename;
--    gint index,i;
--    gchar ifilename[256];
-+    gint index;
-+    gchar *ifilename;
-+    gchar *absfilename, *file; 
-     gchar *charptr, *charptr2;
-     dtr thedate;
-     FILE *fptr;
-@@ -1111,10 +1143,14 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
-     while (vl->data[index] == ' ')
-             vl->data[index--] = 0;
- 
--    sprintf(ifilename, "%s/%s.ics", tmpdir, vl->data);
--    for (i=0; i<strlen (ifilename); i++)
--        if (ifilename[i] == ' ')
--            ifilename[i] = '_';
-+    file = sanitize_filename (vl->data);
-+    if (!file)
-+	return;
-+    absfilename = g_strconcat (file, ".vcf", NULL);
-+    ifilename = g_build_filename (tmpdir, absfilename, NULL);
-+    g_free (file);
-+    g_free (absfilename);
-+
-     printf("%s\n", ifilename);
- 
-     if ((fptr = fopen(ifilename, "wb"))==NULL) {
-@@ -1210,7 +1246,7 @@ void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) {
-         fprintf(fptr, "END:VCALENDAR\n");
-         fclose (fptr);
-     }
--
-+    g_free (ifilename);
- }
- 
- void fprintProperty (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) {
---
-cgit v0.8.3.1
diff --git a/mail/evolution3/pkg-plist b/mail/evolution3/pkg-plist
index 3c58294f2..6aee90f20 100644
--- a/mail/evolution3/pkg-plist
+++ b/mail/evolution3/pkg-plist
@@ -556,6 +556,9 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.a
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so
@@ -610,6 +613,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-google.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-webdav.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-face.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-imap-features.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug
@@ -719,6 +723,7 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/errors/mail.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-attachment-reminder.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-backup-restore.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-face.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-itip-formatter.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-mail-retract.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
@@ -1231,7 +1236,6 @@ share/gnome/help/evolution/C/figures/exchng-rec-options.png
 share/gnome/help/evolution/C/figures/filter-new-fig.png
 share/gnome/help/evolution/C/figures/folder_plus.png
 share/gnome/help/evolution/C/figures/folder_size_mapi.png
-share/gnome/help/evolution/C/figures/folder_size_preference.png
 share/gnome/help/evolution/C/figures/google_cal_view.png
 share/gnome/help/evolution/C/figures/groupwise_resend.png
 share/gnome/help/evolution/C/figures/groupwise_resend_retract.png
@@ -1295,7 +1299,6 @@ share/gnome/help/evolution/cs/figures/exchng-rec-options.png
 share/gnome/help/evolution/cs/figures/filter-new-fig.png
 share/gnome/help/evolution/cs/figures/folder_plus.png
 share/gnome/help/evolution/cs/figures/folder_size_mapi.png
-share/gnome/help/evolution/cs/figures/folder_size_preference.png
 share/gnome/help/evolution/cs/figures/google_cal_view.png
 share/gnome/help/evolution/cs/figures/groupwise_resend.png
 share/gnome/help/evolution/cs/figures/groupwise_resend_retract.png
@@ -1359,7 +1362,6 @@ share/gnome/help/evolution/de/figures/exchng-rec-options.png
 share/gnome/help/evolution/de/figures/filter-new-fig.png
 share/gnome/help/evolution/de/figures/folder_plus.png
 share/gnome/help/evolution/de/figures/folder_size_mapi.png
-share/gnome/help/evolution/de/figures/folder_size_preference.png
 share/gnome/help/evolution/de/figures/google_cal_view.png
 share/gnome/help/evolution/de/figures/groupwise_resend.png
 share/gnome/help/evolution/de/figures/groupwise_resend_retract.png
@@ -1423,7 +1425,6 @@ share/gnome/help/evolution/el/figures/exchng-rec-options.png
 share/gnome/help/evolution/el/figures/filter-new-fig.png
 share/gnome/help/evolution/el/figures/folder_plus.png
 share/gnome/help/evolution/el/figures/folder_size_mapi.png
-share/gnome/help/evolution/el/figures/folder_size_preference.png
 share/gnome/help/evolution/el/figures/google_cal_view.png
 share/gnome/help/evolution/el/figures/groupwise_resend.png
 share/gnome/help/evolution/el/figures/groupwise_resend_retract.png
@@ -1487,7 +1488,6 @@ share/gnome/help/evolution/en_GB/figures/exchng-rec-options.png
 share/gnome/help/evolution/en_GB/figures/filter-new-fig.png
 share/gnome/help/evolution/en_GB/figures/folder_plus.png
 share/gnome/help/evolution/en_GB/figures/folder_size_mapi.png
-share/gnome/help/evolution/en_GB/figures/folder_size_preference.png
 share/gnome/help/evolution/en_GB/figures/google_cal_view.png
 share/gnome/help/evolution/en_GB/figures/groupwise_resend.png
 share/gnome/help/evolution/en_GB/figures/groupwise_resend_retract.png
@@ -1551,7 +1551,6 @@ share/gnome/help/evolution/es/figures/exchng-rec-options.png
 share/gnome/help/evolution/es/figures/filter-new-fig.png
 share/gnome/help/evolution/es/figures/folder_plus.png
 share/gnome/help/evolution/es/figures/folder_size_mapi.png
-share/gnome/help/evolution/es/figures/folder_size_preference.png
 share/gnome/help/evolution/es/figures/google_cal_view.png
 share/gnome/help/evolution/es/figures/groupwise_resend.png
 share/gnome/help/evolution/es/figures/groupwise_resend_retract.png
@@ -1615,7 +1614,6 @@ share/gnome/help/evolution/eu/figures/exchng-rec-options.png
 share/gnome/help/evolution/eu/figures/filter-new-fig.png
 share/gnome/help/evolution/eu/figures/folder_plus.png
 share/gnome/help/evolution/eu/figures/folder_size_mapi.png
-share/gnome/help/evolution/eu/figures/folder_size_preference.png
 share/gnome/help/evolution/eu/figures/google_cal_view.png
 share/gnome/help/evolution/eu/figures/groupwise_resend.png
 share/gnome/help/evolution/eu/figures/groupwise_resend_retract.png
@@ -1679,7 +1677,6 @@ share/gnome/help/evolution/fr/figures/exchng-rec-options.png
 share/gnome/help/evolution/fr/figures/filter-new-fig.png
 share/gnome/help/evolution/fr/figures/folder_plus.png
 share/gnome/help/evolution/fr/figures/folder_size_mapi.png
-share/gnome/help/evolution/fr/figures/folder_size_preference.png
 share/gnome/help/evolution/fr/figures/google_cal_view.png
 share/gnome/help/evolution/fr/figures/groupwise_resend.png
 share/gnome/help/evolution/fr/figures/groupwise_resend_retract.png
@@ -1743,7 +1740,6 @@ share/gnome/help/evolution/gl/figures/exchng-rec-options.png
 share/gnome/help/evolution/gl/figures/filter-new-fig.png
 share/gnome/help/evolution/gl/figures/folder_plus.png
 share/gnome/help/evolution/gl/figures/folder_size_mapi.png
-share/gnome/help/evolution/gl/figures/folder_size_preference.png
 share/gnome/help/evolution/gl/figures/google_cal_view.png
 share/gnome/help/evolution/gl/figures/groupwise_resend.png
 share/gnome/help/evolution/gl/figures/groupwise_resend_retract.png
@@ -1807,7 +1803,6 @@ share/gnome/help/evolution/mk/figures/exchng-rec-options.png
 share/gnome/help/evolution/mk/figures/filter-new-fig.png
 share/gnome/help/evolution/mk/figures/folder_plus.png
 share/gnome/help/evolution/mk/figures/folder_size_mapi.png
-share/gnome/help/evolution/mk/figures/folder_size_preference.png
 share/gnome/help/evolution/mk/figures/google_cal_view.png
 share/gnome/help/evolution/mk/figures/groupwise_resend.png
 share/gnome/help/evolution/mk/figures/groupwise_resend_retract.png
@@ -1871,7 +1866,6 @@ share/gnome/help/evolution/oc/figures/exchng-rec-options.png
 share/gnome/help/evolution/oc/figures/filter-new-fig.png
 share/gnome/help/evolution/oc/figures/folder_plus.png
 share/gnome/help/evolution/oc/figures/folder_size_mapi.png
-share/gnome/help/evolution/oc/figures/folder_size_preference.png
 share/gnome/help/evolution/oc/figures/google_cal_view.png
 share/gnome/help/evolution/oc/figures/groupwise_resend.png
 share/gnome/help/evolution/oc/figures/groupwise_resend_retract.png
@@ -1935,7 +1929,6 @@ share/gnome/help/evolution/ru/figures/exchng-rec-options.png
 share/gnome/help/evolution/ru/figures/filter-new-fig.png
 share/gnome/help/evolution/ru/figures/folder_plus.png
 share/gnome/help/evolution/ru/figures/folder_size_mapi.png
-share/gnome/help/evolution/ru/figures/folder_size_preference.png
 share/gnome/help/evolution/ru/figures/google_cal_view.png
 share/gnome/help/evolution/ru/figures/groupwise_resend.png
 share/gnome/help/evolution/ru/figures/groupwise_resend_retract.png
@@ -1999,7 +1992,6 @@ share/gnome/help/evolution/sl/figures/exchng-rec-options.png
 share/gnome/help/evolution/sl/figures/filter-new-fig.png
 share/gnome/help/evolution/sl/figures/folder_plus.png
 share/gnome/help/evolution/sl/figures/folder_size_mapi.png
-share/gnome/help/evolution/sl/figures/folder_size_preference.png
 share/gnome/help/evolution/sl/figures/google_cal_view.png
 share/gnome/help/evolution/sl/figures/groupwise_resend.png
 share/gnome/help/evolution/sl/figures/groupwise_resend_retract.png
@@ -2063,7 +2055,6 @@ share/gnome/help/evolution/sv/figures/exchng-rec-options.png
 share/gnome/help/evolution/sv/figures/filter-new-fig.png
 share/gnome/help/evolution/sv/figures/folder_plus.png
 share/gnome/help/evolution/sv/figures/folder_size_mapi.png
-share/gnome/help/evolution/sv/figures/folder_size_preference.png
 share/gnome/help/evolution/sv/figures/google_cal_view.png
 share/gnome/help/evolution/sv/figures/groupwise_resend.png
 share/gnome/help/evolution/sv/figures/groupwise_resend_retract.png
@@ -2127,7 +2118,6 @@ share/gnome/help/evolution/zh_CN/figures/exchng-rec-options.png
 share/gnome/help/evolution/zh_CN/figures/filter-new-fig.png
 share/gnome/help/evolution/zh_CN/figures/folder_plus.png
 share/gnome/help/evolution/zh_CN/figures/folder_size_mapi.png
-share/gnome/help/evolution/zh_CN/figures/folder_size_preference.png
 share/gnome/help/evolution/zh_CN/figures/google_cal_view.png
 share/gnome/help/evolution/zh_CN/figures/groupwise_resend.png
 share/gnome/help/evolution/zh_CN/figures/groupwise_resend_retract.png
@@ -2486,5 +2476,4 @@ share/omf/evolution/evolution-zh_CN.omf
 @dirrmtry share/locale/be@latin
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
+@dirrmtry share/locale/as/LC_MESSAGES@dirrmtry share/locale/as