5 files changed, 30 insertions, 113 deletions

diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index eadafd8477d1..0ad426b2d938 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,6 +1,21 @@
---- configure.orig	Wed Sep 29 14:06:43 2004
-+++ configure	Wed Sep 29 14:24:28 2004
-@@ -24206,6 +24206,7 @@
+--- configure.orig	Fri Jul 29 17:50:28 2005
++++ configure	Fri Jul 29 17:51:42 2005
+@@ -23657,6 +23657,14 @@
+     DL_LIB=''
+     SOFTOKN3_LIB=''
+     ;;
++*freebsd*) os_win32=no
++    NO_UNDEFINED=''
++    SOCKET_LIBS=''
++    SOEXT='.so'
++    SA_JUNK_PLUGIN=sa-junk-plugin
++    DL_LIB=''
++    SOFTOKN3_LIB='-lsoftokn3'
++    ;;
+ *)  os_win32=no
+     NO_UNDEFINED=''
+     SOCKET_LIBS=''
+@@ -26205,6 +26213,7 @@
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -8,7 +23,7 @@
  
  
  int
-@@ -25772,7 +25773,7 @@
+@@ -27882,7 +27891,7 @@
  	LDFLAGS_save="$LDFLAGS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
@@ -17,20 +32,7 @@
  	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
  echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
  if test "${ac_cv_lib_kerberos5+set}" = set; then
-@@ -26928,10 +26929,10 @@
- Example: --with-nspr-libs=/usr/lib" >&2;}
-    { (exit 1); exit 1; }; }
-        				else
--	       				nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
-+				    nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
- 				fi
- 			else
--				nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
-+			    nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
- 			fi
- 
- 			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
-@@ -30807,7 +30808,7 @@
+@@ -33151,7 +33160,7 @@
  idldir="$datadir/idl/evolution-$BASE_VERSION"
  
  
diff --git a/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c b/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c
deleted file mode 100644
index 8d880e79f05a..000000000000
--- a/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- plugins/exchange-account-setup/exchange-account-setup.c.orig	Tue Mar  1 15:38:29 2005
-+++ plugins/exchange-account-setup/exchange-account-setup.c	Tue Mar  1 15:38:45 2005
-@@ -564,9 +564,10 @@
- org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
- {
- 	EMConfigTargetAccount *target_account;
--	target_account = (EMConfigTargetAccount *)data->config->target;
- 	const char *source_url;
- 	CamelURL *url;
-+
-+	target_account = (EMConfigTargetAccount *)data->config->target;
- 	
- 	source_url = e_account_get_string (target_account->account,  E_ACCOUNT_SOURCE_URL);
- 	url = camel_url_new (source_url, NULL);
diff --git a/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
new file mode 100644
index 000000000000..4d8e131a6250
--- /dev/null
+++ b/mail/evolution/files/patch-plugins_groupwise-features_proxy-login.c
@@ -0,0 +1,10 @@
+--- plugins/groupwise-features/proxy-login.c.orig	Fri Jul 29 18:55:40 2005
++++ plugins/groupwise-features/proxy-login.c	Fri Jul 29 18:55:58 2005
+@@ -236,7 +236,6 @@ proxy_login_get_cnc (EAccount *account)
+ {
+ 	EGwConnection *cnc;
+ 	CamelURL *url;
+-	url = camel_url_new (account->source->url, NULL);
+ 	char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL;
+ 	const char *use_ssl, *soap_port;
+ 
diff --git a/mail/evolution/files/patch-string_vuln b/mail/evolution/files/patch-string_vuln
deleted file mode 100644
index b9e9d2bd7ab6..000000000000
--- a/mail/evolution/files/patch-string_vuln
+++ /dev/null
@@ -1,62 +0,0 @@
---- calendar/gui/e-cal-component-preview.c.orig	Sat Aug 27 18:48:58 2005
-+++ calendar/gui/e-cal-component-preview.c	Sat Aug 27 18:49:14 2005
-@@ -284,7 +284,7 @@ write_html (GtkHTMLStream *stream, ECal 
- 					str = g_string_append_c (str, text.value[i]);
- 			}
- 
--			gtk_html_stream_printf (stream, str->str);
-+			gtk_html_stream_printf (stream, "%s", str->str);
- 			g_string_free (str, TRUE);
- 		}
- 
---- addressbook/gui/widgets/eab-contact-display.c.orig	Sat Aug 27 18:50:22 2005
-+++ addressbook/gui/widgets/eab-contact-display.c	Sat Aug 27 18:51:58 2005
-@@ -353,7 +353,7 @@ render_contact (GtkHTMLStream *html_stre
- 	accum_multival_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO, YAHOO_ICON, 0);
- 
- 	if (accum->len > 0)
--		gtk_html_stream_printf (html_stream, accum->str);
-+		gtk_html_stream_printf (html_stream, "%s", accum->str);
- 
- 	end_block (html_stream);
- 
-@@ -368,7 +368,7 @@ render_contact (GtkHTMLStream *html_stre
- 
- 	if (accum->len > 0) {
- 		start_block (html_stream, _("work"));
--		gtk_html_stream_printf (html_stream, accum->str);
-+		gtk_html_stream_printf (html_stream, "%s", accum->str);
- 		end_block (html_stream);
- 	}
- 
-@@ -383,7 +383,7 @@ render_contact (GtkHTMLStream *html_stre
- 
- 	if (accum->len > 0) {
- 		start_block (html_stream, _("personal"));
--		gtk_html_stream_printf (html_stream, accum->str);
-+		gtk_html_stream_printf (html_stream, "%s", accum->str);
- 		end_block (html_stream);
- 	}
- 
---- calendar/gui/e-calendar-view.c.orig	Sat Aug 27 18:52:46 2005
-+++ calendar/gui/e-calendar-view.c	Sat Aug 27 18:53:10 2005
-@@ -1079,7 +1079,7 @@ on_save_as (EPopup *ep, EPopupItem *pite
- 		return;
- 	}
- 	
--	fprintf (file, ical_string);
-+	fprintf (file, "%s", ical_string);
- 	g_free (ical_string);
- 	fclose (file);
- 
---- calendar/gui/e-calendar-table.c.orig	Sat Aug 27 18:53:42 2005
-+++ calendar/gui/e-calendar-table.c	Sat Aug 27 18:53:58 2005
-@@ -1027,7 +1027,7 @@ e_calendar_table_on_save_as (EPopup *ep,
- 		return;
- 	}
- 	
--	fprintf (file, ical_string);
-+	fprintf (file, "%s", ical_string);
- 	g_free (ical_string);
- 	fclose (file);
- }
diff --git a/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c b/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c
deleted file mode 100644
index f2389bd047f1..000000000000
--- a/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- widgets/misc/e-multi-config-dialog.c.orig	Tue Nov 23 15:53:34 2004
-+++ widgets/misc/e-multi-config-dialog.c	Tue Nov 23 15:54:02 2004
-@@ -396,6 +396,7 @@
- {
- 	EMultiConfigDialogPrivate *priv;
- 	AtkObject *a11y;
-+	AtkObject *a11yPage;
- 	gint page_no;
- 
- 	g_return_if_fail (E_IS_MULTI_CONFIG_DIALOG (dialog));
-@@ -418,7 +419,7 @@
- 				  NULL);
- 
- 	a11y = gtk_widget_get_accessible (GTK_WIDGET(priv->notebook));
--	AtkObject *a11yPage = atk_object_ref_accessible_child (a11y, page_no);
-+	a11yPage = atk_object_ref_accessible_child (a11y, page_no);
- 	if (a11yPage != NULL) {
- 		if (atk_object_get_role (a11yPage) == ATK_ROLE_PAGE_TAB)
- 			atk_object_set_name (a11yPage, title);