Ugh, fix a borked CVS update...

Remove a bogus patch (pointed out by Benny Siegert) and catch a bounds
error elsewhere.  Update to 1.0.4 since I'm here.
This commit is contained in:
marcm 2005-03-10 07:36:04 +00:00
parent fce6aef5b2
commit 373b1d746d
2 changed files with 0 additions and 58 deletions

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-calendar_backends_groupwise_e-cal-backend-groupwise_c,v 1.1 2004/12/11 06:03:08 marcm Exp $
--- calendar/backends/groupwise/e-cal-backend-groupwise.c.orig Mon Oct 11 15:47:09 2004
+++ calendar/backends/groupwise/e-cal-backend-groupwise.c Mon Oct 11 15:48:22 2004
@@ -512,13 +512,13 @@ e_cal_backend_groupwise_get_alarm_email_
static ECalBackendSyncStatus
e_cal_backend_groupwise_get_static_capabilities (ECalBackendSync *backend, EDataCal *cal, char **capabilities)
{
- *capabilities = g_strdup (CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS "," \
- CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY "," \
- CAL_STATIC_CAPABILITY_REMOVE_ALARMS "," \
- CAL_STATIC_CAPABILITY_NO_THISANDPRIOR "," \
- CAL_STATIC_CAPABILITY_NO_THISANDFUTURE "," \
- CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK "," \
- CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR "," \
+ *capabilities = g_strdup (CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS ","
+ CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY ","
+ CAL_STATIC_CAPABILITY_REMOVE_ALARMS ","
+ CAL_STATIC_CAPABILITY_NO_THISANDPRIOR ","
+ CAL_STATIC_CAPABILITY_NO_THISANDFUTURE ","
+ CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK ","
+ CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR ","
CAL_STATIC_CAPABILITY_SAVE_SCHEDULES);
return GNOME_Evolution_Calendar_Success;

View File

@ -1,34 +0,0 @@
$OpenBSD: patch-patches_patch-libdb_env_env_open_c,v 1.1 2004/09/17 03:49:03 marcm Exp $
--- patches/patch-libdb_env_env_open_c.orig Thu Sep 16 20:33:27 2004
+++ patches/patch-libdb_env_env_open_c Thu Sep 16 20:33:27 2004
@@ -0,0 +1,30 @@
+$OpenBSD: patch-patches_patch-libdb_env_env_open_c,v 1.1 2004/09/17 03:49:03 marcm Exp $
+--- libdb/env/env_open.c.orig Mon Aug 16 16:33:03 2004
++++ libdb/env/env_open.c Mon Aug 16 16:33:57 2004
+@@ -906,7 +906,7 @@ illegal: __db_err(dbenv, "mis-formatted
+ return (dbenv->set_data_dir(dbenv, value));
+
+ if (!strcasecmp(name, "set_flags")) {
+- if (sscanf(value, "%40s %c", arg, &v4) != 1)
++ if (sscanf(value, "%39s %c", arg, &v4) != 1)
+ goto badarg;
+
+ if (!strcasecmp(value, "db_cdb_alldb"))
+@@ -961,7 +961,7 @@ illegal: __db_err(dbenv, "mis-formatted
+ return (dbenv->set_lg_dir(dbenv, value));
+
+ if (!strcasecmp(name, "set_lk_detect")) {
+- if (sscanf(value, "%40s %c", arg, &v4) != 1)
++ if (sscanf(value, "%39s %c", arg, &v4) != 1)
+ goto badarg;
+ if (!strcasecmp(value, "db_lock_default"))
+ flags = DB_LOCK_DEFAULT;
+@@ -1067,7 +1067,7 @@ illegal: __db_err(dbenv, "mis-formatted
+ }
+
+ if (!strcasecmp(name, "set_verbose")) {
+- if (sscanf(value, "%40s %c", arg, &v4) != 1)
++ if (sscanf(value, "%39s %c", arg, &v4) != 1)
+ goto badarg;
+
+ if (!strcasecmp(value, "db_verb_chkpoint"))