rpms/gnumeric/EL-5 gnumeric-1.6.3-excel-overflow.patch, NONE, 1.1 gnumeric-1.6.3-gda3.patch, NONE, 1.1 gnumeric-1.6.3-gpl-md5.patch, NONE, 1.1 gnumeric-1.6.3-stf-parse.patch, NONE, 1.1 import.log, NONE, 1.1 gnumeric.spec, 1.22, 1.23
Lubomir Rintel
lkundrak at fedoraproject.org
Tue Sep 23 07:55:20 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/gnumeric/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5070/EL-5
Modified Files:
gnumeric.spec
Added Files:
gnumeric-1.6.3-excel-overflow.patch gnumeric-1.6.3-gda3.patch
gnumeric-1.6.3-gpl-md5.patch gnumeric-1.6.3-stf-parse.patch
import.log
Log Message:
Import from F-8
gnumeric-1.6.3-excel-overflow.patch:
--- NEW FILE gnumeric-1.6.3-excel-overflow.patch ---
diff -up gnumeric-1.6.3/plugins/excel/ms-excel-read.c.excel gnumeric-1.6.3/plugins/excel/ms-excel-read.c
--- gnumeric-1.6.3/plugins/excel/ms-excel-read.c.excel 2008-02-04 09:36:31.000000000 +0100
+++ gnumeric-1.6.3/plugins/excel/ms-excel-read.c 2008-02-04 15:38:54.000000000 +0100
@@ -95,6 +95,43 @@ typedef struct {
#define N_BYTES_BETWEEN_PROGRESS_UPDATES 0x1000
+/*
+ * Check whether the product of the first two arguments exceeds
+ * the third. The function should be overflow-proof.
+ */
+static gboolean
+product_gt (size_t count, size_t itemsize, size_t space)
+{
+ return itemsize > 0 &&
+ (count > G_MAXUINT / itemsize || count * itemsize > space);
+}
+
+static void
+record_size_barf (size_t count, size_t itemsize, size_t space,
+ const char *locus)
+{
+ g_warning ("File is most likely corrupted.\n"
+ "(Requested %u*%u bytes, but only %u bytes left in record.\n"
+ "The problem occurred in %s.)",
+ (unsigned)count, (unsigned)itemsize,
+ (unsigned)space,
+ locus);
+}
+
+#define XL_NEED_BYTES(count) XL_NEED_ITEMS(count,1)
+
+#define XL_NEED_ITEMS(count__,size__) \
+ do { \
+ size_t count_ = (count__); \
+ size_t size_ = (size__); \
+ size_t space_ = q->length - (data - q->data); \
+ if (G_UNLIKELY (product_gt (count_, size_, space_))) { \
+ record_size_barf (count_, size_, space_, G_STRFUNC); \
+ return; \
+ } \
+ } while (0)
+
+
/* #define NO_DEBUG_EXCEL */
#ifndef NO_DEBUG_EXCEL
#define d(level, code) do { if (ms_excel_read_debug > level) { code } } while (0)
@@ -3386,29 +3423,40 @@ excel_read_XCT (BiffQuery *q, GnmXLImpor
continue;
for (data = q->data + 4; ep.eval.col <= last_col ; ep.eval.col++) {
- g_return_if_fail (data + 1 - q->data <= (int)q->length);
+ guint8 oper;
+ XL_NEED_BYTES (1);
- switch (*data) {
- case 1: v = value_new_float (GSF_LE_GET_DOUBLE (data+1));
- data += 9;
- break;
- case 2: len = data[1];
- v = value_new_string_nocopy (
- excel_get_text (importer, data + 2, len, NULL));
- data += 2 + len;
- break;
-
- case 4: v = value_new_bool (GSF_LE_GET_GUINT16 (data+1) != 0);
- data += 9;
- break;
-
- case 16: v = biff_get_error (&ep, GSF_LE_GET_GUINT16 (data+1));
- data += 9;
- break;
+ oper = *data++;
+ switch (oper) {
+ case 1:
+ XL_NEED_BYTES (8);
+ v = value_new_float (GSF_LE_GET_DOUBLE (data));
+ data += 8;
+ break;
+ case 2:
+ XL_NEED_BYTES (1);
+ len = *data++;
+ v = value_new_string_nocopy (
+ excel_get_text (importer, data, len, NULL));
+ data += len;
+ break;
+
+ case 4:
+ XL_NEED_BYTES (2);
+ v = value_new_bool (GSF_LE_GET_GUINT16 (data) != 0);
+ /* FIXME: 8?? */
+ data += 8;
+ break;
+
+ case 16:
+ XL_NEED_BYTES (2);
+ v = biff_get_error (&ep, GSF_LE_GET_GUINT16 (data));
+ /* FIXME: 8?? */
+ data += 8;
+ break;
default :
- g_warning ("Unknown oper type 0x%x in a CRN record", (int)*data);
- data++;
+ g_warning ("Unknown oper type 0x%x in a CRN record", (guint)oper);
v = NULL;
}
@@ -4935,7 +4983,7 @@ excel_read_HLINK (BiffQuery *q, ExcelRea
if ((options & 0x14) == 0x14) {
len = GSF_LE_GET_GUINT32 (data);
data += 4;
- g_return_if_fail (data + len*2 - q->data <= (int)q->length);
+ XL_NEED_ITEMS (len, 2);
label = read_utf16_str (len, data);
data += len*2;
}
@@ -4944,7 +4992,7 @@ excel_read_HLINK (BiffQuery *q, ExcelRea
if (options & 0x80) {
len = GSF_LE_GET_GUINT32 (data);
data += 4;
- g_return_if_fail (len*2 + data - q->data <= (int)q->length);
+ XL_NEED_ITEMS (len, 2);
target = read_utf16_str (len, data);
data += len*2;
}
@@ -4955,7 +5003,7 @@ excel_read_HLINK (BiffQuery *q, ExcelRea
data += sizeof (url_guid);
len = GSF_LE_GET_GUINT32 (data);
data += 4;
- g_return_if_fail (len + data - q->data <= (int)q->length);
+ XL_NEED_BYTES (len);
url = read_utf16_str (len/2, data);
link = g_object_new (gnm_hlink_url_get_type (), NULL);
@@ -4971,7 +5019,7 @@ excel_read_HLINK (BiffQuery *q, ExcelRea
gsf_mem_dump (data, q->length - (data - q->data));
- g_return_if_fail (len + data - q->data <= (int)q->length);
+ XL_NEED_BYTES (len);
data += len;
} else if ((options & 0x1e3) == 0x103) {
@@ -4988,7 +5036,7 @@ excel_read_HLINK (BiffQuery *q, ExcelRea
if (options & 0x8) {
len = GSF_LE_GET_GUINT32 (data);
data += 4;
- g_return_if_fail (len*2 + data - q->data <= (int)q->length);
+ XL_NEED_ITEMS (len, 2);
target = read_utf16_str (len, data);
data += len*2;
}
gnumeric-1.6.3-gda3.patch:
--- NEW FILE gnumeric-1.6.3-gda3.patch ---
--- gnumeric-1.6.3/configure.orig 2007-08-22 13:08:26.000000000 +0200
+++ gnumeric-1.6.3/configure 2007-08-22 13:08:26.000000000 +0200
@@ -22088,12 +22088,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_GDA_CFLAGS="$GDA_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.3.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.3.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.3.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.3.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-2.0 >= 1.3.0" 2>/dev/null`
+ pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-3.0 >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22106,12 +22106,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_GDA_LIBS="$GDA_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.3.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.3.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.3.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.3.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-2.0 >= 1.3.0" 2>/dev/null`
+ pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-3.0 >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22130,9 +22130,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-2.0 >= 1.3.0"`
+ GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-3.0 >= 1.3.0"`
else
- GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-2.0 >= 1.3.0"`
+ GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-3.0 >= 1.3.0"`
fi
# Put the nasty error message in config.log where it belongs
echo "$GDA_PKG_ERRORS" >&5
@@ -22158,12 +22158,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_GNOMEDB_CFLAGS="$GNOMEDB_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-2.0 >= 1.3.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgnomedb-2.0 >= 1.3.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 1.3.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 1.3.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-2.0 >= 1.3.0" 2>/dev/null`
+ pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-3.0 >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22176,12 +22176,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_GNOMEDB_LIBS="$GNOMEDB_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-2.0 >= 1.3.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "libgnomedb-2.0 >= 1.3.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 1.3.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 1.3.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-2.0 >= 1.3.0" 2>/dev/null`
+ pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-3.0 >= 1.3.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22200,9 +22200,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-2.0 >= 1.3.0"`
+ GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-3.0 >= 1.3.0"`
else
- GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-2.0 >= 1.3.0"`
+ GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-3.0 >= 1.3.0"`
fi
# Put the nasty error message in config.log where it belongs
echo "$GNOMEDB_PKG_ERRORS" >&5
--- gnumeric-1.6.3/configure.in.orig 2007-05-01 18:21:36.000000000 -0400
+++ gnumeric-1.6.3/configure.in 2007-05-01 18:22:54.000000000 -0400
@@ -369,11 +369,11 @@
fi
)
if test "$try_gda" = "true"; then
- PKG_CHECK_MODULES(GDA, [libgda-2.0 >= 1.3.0],
+ PKG_CHECK_MODULES(GDA, [libgda-3.0 >= 1.3.0],
[gda_msg=yes],
[gda_msg="NO. libgda problem"])
if test "$gda_msg" = "yes"; then
- PKG_CHECK_MODULES(GNOMEDB, [libgnomedb-2.0 >= 1.3.0],
+ PKG_CHECK_MODULES(GNOMEDB, [libgnomedb-3.0 >= 1.3.0],
[gnomedb_msg="yes"],
[gnomedb_msg="NO. libgnomedb problem"])
if test "$gnomedb_msg" = "yes"; then
--- gnumeric-1.6.3/plugins/gda/plugin-gda.c.orig 2007-05-01 18:52:12.000000000 -0400
+++ gnumeric-1.6.3/plugins/gda/plugin-gda.c 2007-05-01 19:01:11.000000000 -0400
@@ -1,6 +1,8 @@
+/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* Interface Gnumeric to Databases
* Copyright (C) 1998,1999 Michael Lausch
* Copyright (C) 2000-2002 Rodrigo Moya
+ * Copyright (C) 2006 Vivien Malerba
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -20,6 +22,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include <libgda/libgda.h>
+#include <string.h>
#ifdef HAVE_LIBGNOMEDB
#include <libgnomedb/gnome-db-login-dialog.h>
#include <libgnomedb/gnome-db-login.h>
@@ -28,18 +31,116 @@
#include "func.h"
#include "expr.h"
#include "value.h"
+#include "workbook.h"
+#include "sheet.h"
#include "gnm-i18n.h"
#include <goffice/app/go-plugin.h>
#include <goffice/app/error-info.h>
+#include <goffice/utils/datetime.h>
+#include <goffice/utils/go-format.h>
#include <gnm-plugin.h>
GNM_PLUGIN_MODULE_HEADER;
-static GdaClient* connection_pool = NULL;
+static GdaClient *connection_pool = NULL;
+static gboolean libgda_init_done = FALSE;
+static GHashTable *cnc_hash = NULL;
+
+static GnmValue *
+gnm_value_new_from_gda (GValue const *gval,
+ GODateConventions const *date_conv)
+{
+ GnmValue *res;
+ GType t;
+
+ if (NULL == gval)
+ return value_new_empty ();
+
+ g_return_val_if_fail (G_IS_VALUE (gval), value_new_empty ());
+
+ t = G_VALUE_TYPE (gval);
+ if (t == GDA_TYPE_SHORT)
+ return value_new_int (gda_value_get_short (gval));
+ if (t == GDA_TYPE_USHORT)
+ return value_new_int (gda_value_get_ushort (gval));
+ if (t == G_TYPE_DATE) {
+ res = value_new_int (datetime_g_to_serial (
+ (GDate const *) g_value_get_boxed (gval), date_conv));
+ value_set_fmt (res, go_format_default_date ());
+ return res;
+ }
+
+ if (t == GDA_TYPE_TIME) {
+ GdaTime const *time = gda_value_get_time (gval);
+ res = value_new_float ( (time->hour +
+ (time->minute +
+ time->second / 60.) / 60.) / 24.),
+ value_set_fmt (res, go_format_default_time ());
+ return res;
+ }
+
+ switch (t) {
+ case G_TYPE_BOOLEAN :
+ return value_new_bool (g_value_get_boolean (gval));
+
+ case G_TYPE_DOUBLE :
+ return value_new_float (g_value_get_double (gval));
+ case G_TYPE_FLOAT :
+ return value_new_float (g_value_get_float (gval));
+#if 0
+ case G_TYPE_INT64 : /* g_value_get_int64 (gval) */
+ case G_TYPE_UINT64 : /* g_value_get_uint64 (gval) */
+#endif
+ case G_TYPE_INT :
+ return value_new_int (g_value_get_int (gval));
+ case G_TYPE_UINT :
+ return value_new_int (g_value_get_uint (gval));
+
+#if 0
+ /* No way to represent a timezone, leave it as a string for now */
+ case GDA_TYPE_TIMESTAMP:
+#endif
+#if 0
+ /* Do we want to consider nested arrays ??
+ * The rest of the system is not strong enough yet. */
+ case GDA_TYPE_LIST : {
+ GList const *ptr;
+ for (ptr = gda_value_get_list (gval) ; NULL != ptr ; ptr = ptr->next) {
+ }
+ return array;
+ }
+#endif
+
+#if 0
+ /* Use the default gvalue conversions for these */
+ case G_TYPE_CHAR :
+ case G_TYPE_UCHAR :
+ case G_TYPE_STRING :
+ case GDA_TYPE_GEOMETRIC_POINT :
+ case GDA_TYPE_BINARY :
+
+ /* this is stored as a string, let gda handle it */
+ case GDA_TYPE_NUMERIC :
+#endif
+ default :
+ break;
+ }
+
+ if (g_value_type_transformable (G_VALUE_TYPE (gval), G_TYPE_STRING)) {
+ GValue str = { 0 };
+ g_value_init (&str, G_TYPE_STRING);
+ if (g_value_transform (gval, &str))
+ return value_new_string (g_value_get_string (&str));
+ g_value_unset (&str);
+ }
+
+ return value_new_empty ();
+}
static GnmValue *
display_recordset (GdaDataModel *recset, FunctionEvalInfo *ei)
{
+ GODateConventions const *date_conv;
GnmValue* array = NULL;
gint col;
gint row;
@@ -48,8 +149,8 @@
g_return_val_if_fail (GDA_IS_DATA_MODEL (recset), NULL);
- fieldcount = gda_data_model_get_n_columns (GDA_DATA_MODEL (recset));
- rowcount = gda_data_model_get_n_rows (GDA_DATA_MODEL (recset));
+ fieldcount = gda_data_model_get_n_columns (recset);
+ rowcount = gda_data_model_get_n_rows (recset);
/* convert the GdaDataModel in an array */
if (rowcount <= 0)
@@ -58,31 +159,75 @@
if (rowcount >= SHEET_MAX_ROWS)
return value_new_error (ei->pos, _("Too much data returned"));
+ date_conv = workbook_date_conv (ei->pos->sheet->workbook);
array = value_new_array_empty (fieldcount, rowcount);
for (row = 0; row < rowcount; row++) {
for (col = 0; col < fieldcount; col++) {
- gchar *str;
- const GdaValue *value;
-
- value = gda_data_model_get_value_at (GDA_DATA_MODEL (recset),
- col, row);
- str = gda_value_stringify ((GdaValue *) value);
- value_array_set (array,
- col,
- row,
- value_new_string(str));
-
- g_free (str);
+ value_array_set (array, col, row,
+ gnm_value_new_from_gda (
+ gda_data_model_get_value_at (recset, col, row),
+ date_conv));
}
}
return array;
}
+/*
+ * Key structure and hash functions for that structure
+ */
+typedef struct {
+ gchar *dsn;
+ gchar *user;
+ gchar *pass;
+} CncKey;
+
+static guint
+cnc_key_hash_func (CncKey *key)
+{
+ guint retval = 0;
+
+ if (key->dsn)
+ retval = g_str_hash (key->dsn);
+ if (key->user)
+ retval = (retval << 4) + g_str_hash (key->user);
+ if (key->pass)
+ retval = (retval << 4) + g_str_hash (key->pass);
+
+ return retval;
+}
+
+static gboolean
+cnc_key_equal_func (CncKey *key1, CncKey *key2)
+{
+ if ((key1->dsn && !key2->dsn) ||
+ (!key1->dsn && key2->dsn) ||
+ (key1->dsn && key2->dsn && strcmp (key1->dsn, key2->dsn)))
+ return FALSE;
+ if ((key1->user && !key2->user) ||
+ (!key1->user && key2->user) ||
+ (key1->user && key2->user && strcmp (key1->user, key2->user)))
+ return FALSE;
+ if ((key1->pass && !key2->pass) ||
+ (!key1->pass && key2->pass) ||
+ (key1->pass && key2->pass && strcmp (key1->pass, key2->pass)))
+ return FALSE;
+ return TRUE;
+}
+
+static void
+cnc_key_free (CncKey *key)
+{
+ g_free (key->dsn);
+ g_free (key->user);
+ g_free (key->pass);
+ g_free (key);
+}
+
static GdaConnection *
open_connection (const gchar *dsn, const gchar *user, const gchar *password, GdaConnectionOptions options)
{
- GdaConnection *cnc;
+ GdaConnection *cnc = NULL;
gchar *real_dsn, *real_user, *real_password;
#ifdef HAVE_LIBGNOMEDB
GtkWidget *dialog, *login;
@@ -91,44 +236,77 @@
/* initialize connection pool if first time */
if (!GDA_IS_CLIENT (connection_pool)) {
+ if (!libgda_init_done) {
+ gda_init (NULL, NULL, 0, NULL);
+ libgda_init_done = TRUE;
+ }
connection_pool = gda_client_new ();
if (!connection_pool)
return NULL;
}
-#ifdef HAVE_LIBGNOMEDB
- dialog = gnome_db_login_dialog_new (_("Database Connection"));
- login = gnome_db_login_dialog_get_login_widget (GNOME_DB_LOGIN_DIALOG (dialog));
+ /* try to find a cnc object if we already have one */
+ if (!cnc_hash)
+ cnc_hash = g_hash_table_new_full ((GHashFunc) cnc_key_hash_func,
+ (GEqualFunc) cnc_key_equal_func,
+ (GDestroyNotify) cnc_key_free,
+ (GDestroyNotify) g_object_unref);
+ else {
+ CncKey key;
+
+ key.dsn = (gchar *) dsn;
+ key.user = (gchar *) user;
+ key.pass = (gchar *) password;
- gnome_db_login_set_dsn (GNOME_DB_LOGIN (login), dsn);
- gnome_db_login_set_username (GNOME_DB_LOGIN (login), user);
- gnome_db_login_set_password (GNOME_DB_LOGIN (login), password);
-
- if (gnome_db_login_dialog_run (GNOME_DB_LOGIN_DIALOG (dialog))) {
- real_dsn = g_strdup (gnome_db_login_get_dsn (GNOME_DB_LOGIN (login)));
- real_user = g_strdup (gnome_db_login_get_username (GNOME_DB_LOGIN (login)));
- real_password = g_strdup (gnome_db_login_get_password (GNOME_DB_LOGIN (login)));
-
- gtk_widget_destroy (dialog);
- } else {
- gtk_widget_destroy (dialog);
- return NULL;
+ cnc = g_hash_table_lookup (cnc_hash, &key);
}
-#else
- real_dsn = g_strdup (dsn);
- real_user = g_strdup (user);
- real_password = g_strdup (password);
-#endif
- cnc = gda_client_open_connection (connection_pool, real_dsn, real_user, real_password, options, &error);
if (!cnc) {
- g_warning ("Libgda error: %s\n", error->message);
- g_error_free (error);
- }
+ CncKey *key;
- g_free (real_dsn);
- g_free (real_user);
- g_free (real_password);
+#ifdef HAVE_LIBGNOMEDB
+ dialog = gnome_db_login_dialog_new (_("Database Connection"));
+ login = gnome_db_login_dialog_get_login_widget (GNOME_DB_LOGIN_DIALOG (dialog));
+
+ gnome_db_login_set_dsn (GNOME_DB_LOGIN (login), dsn);
+ gnome_db_login_set_username (GNOME_DB_LOGIN (login), user);
+ gnome_db_login_set_password (GNOME_DB_LOGIN (login), password);
+
+ if (gnome_db_login_dialog_run (GNOME_DB_LOGIN_DIALOG (dialog))) {
+ real_dsn = g_strdup (gnome_db_login_get_dsn (GNOME_DB_LOGIN (login)));
+ real_user = g_strdup (gnome_db_login_get_username (GNOME_DB_LOGIN (login)));
+ real_password = g_strdup (gnome_db_login_get_password (GNOME_DB_LOGIN (login)));
+
+ gtk_widget_destroy (dialog);
+ } else {
+ gtk_widget_destroy (dialog);
+ return NULL;
+ }
+#else
+ real_dsn = g_strdup (dsn);
+ real_user = g_strdup (user);
+ real_password = g_strdup (password);
+#endif
+
+ cnc = gda_client_open_connection (connection_pool, real_dsn, real_user, real_password, options, &error);
+ if (!cnc) {
+ g_warning ("Libgda error: %s\n", error->message);
+ g_error_free (error);
+ }
+
+ g_free (real_dsn);
+ g_free (real_user);
+ g_free (real_password);
+
+ key = g_new0 (CncKey, 1);
+ if (dsn)
+ key->dsn = g_strdup (dsn);
+ if (user)
+ key->user = g_strdup (user);
+ if (password)
+ key->pass = g_strdup (password);
+ g_hash_table_insert (cnc_hash, key, cnc);
+ }
return cnc;
}
@@ -293,7 +471,13 @@
}
GnmFuncDescriptor gdaif_functions[] = {
- {"execSQL", "ssss", "dsn,username,password,sql", help_execSQL, &gnumeric_execSQL, NULL, NULL, NULL },
- {"readDBTable", "ssss", "dsn,username,password,table", help_readDBTable, &gnumeric_readDBTable, NULL, NULL, NULL },
+ {
+ "execSQL", "ssss", "dsn,username,password,sql",
+ help_execSQL, &gnumeric_execSQL, NULL, NULL, NULL
+ },
+ {
+ "readDBTable", "ssss", "dsn,username,password,table",
+ help_readDBTable, &gnumeric_readDBTable, NULL, NULL, NULL
+ },
{NULL}
};
--- gnumeric-1.6.3/plugins/gnome-db/plugin-gnomedb.c.orig 2005-03-03 02:50:56.000000000 -0500
+++ gnumeric-1.6.3/plugins/gnome-db/plugin-gnomedb.c 2007-05-01 19:02:19.000000000 -0400
@@ -1,5 +1,5 @@
#include <gnumeric-config.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <glib.h>
#include <workbook-control-gui.h>
@@ -16,7 +16,7 @@ view_data_sources (GnmAction const *acti
char *argv[2];
/* run gnome-database-properties config tool */
- argv[0] = (char *) "gnome-database-properties";
+ argv[0] = (char *) "gnome-database-properties-3.0";
argv[1] = NULL;
if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
gnumeric-1.6.3-gpl-md5.patch:
--- NEW FILE gnumeric-1.6.3-gpl-md5.patch ---
diff -up gnumeric-1.6.3/plugins/excel/ms-biff.c.gpl-md5 gnumeric-1.6.3/plugins/excel/ms-biff.c
--- gnumeric-1.6.3/plugins/excel/ms-biff.c.gpl-md5 2005-07-15 14:31:34.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/ms-biff.c 2007-09-19 16:20:34.000000000 +0200
@@ -16,6 +16,7 @@
#include "ms-biff.h"
#include "biff-types.h"
+#include "md5.h"
#include <gsf/gsf-input.h>
#include <gsf/gsf-output.h>
@@ -154,39 +155,17 @@ ms_biff_pre_biff8_query_set_decrypt (Bi
return TRUE;
}
-/*
-this is just cut out of wvMD5Final to get the byte order correct
-under MSB systems, the previous code was woefully tied to intel
-x86
-
-C.
-*/
-static void
-wvMD5StoreDigest (MD5_CTX *mdContext)
-{
- unsigned int i, ii;
- /* store buffer in digest */
- for (i = 0, ii = 0; i < 4; i++, ii += 4) {
- mdContext->digest[ii] = (unsigned char) (mdContext->buf[i] & 0xFF);
- mdContext->digest[ii + 1] =
- (unsigned char) ((mdContext->buf[i] >> 8) & 0xFF);
- mdContext->digest[ii + 2] =
- (unsigned char) ((mdContext->buf[i] >> 16) & 0xFF);
- mdContext->digest[ii + 3] =
- (unsigned char) ((mdContext->buf[i] >> 24) & 0xFF);
- }
-}
-
static void
-makekey (guint32 block, RC4_KEY *key, MD5_CTX *valContext)
+makekey (guint32 block, RC4_KEY *key, const unsigned char *valDigest)
{
- MD5_CTX mdContext;
+ struct md5_ctx ctx;
+ unsigned char digest[16];
guint8 pwarray[64];
memset (pwarray, 0, 64);
/* 40 bit of hashed password, set by verify_password () */
- memcpy (pwarray, valContext->digest, 5);
+ memcpy (pwarray, valDigest, 5);
/* put block number in byte 6...9 */
pwarray[5] = (guint8) (block & 0xFF);
@@ -197,12 +176,13 @@ makekey (guint32 block, RC4_KEY *key, MD
pwarray[9] = 0x80;
pwarray[56] = 0x48;
- wvMD5Init (&mdContext);
- wvMD5Update (&mdContext, pwarray, 64);
- wvMD5StoreDigest (&mdContext);
- prepare_key (mdContext.digest, 16, key);
+ md5_init_ctx (&ctx);
+ md5_process_block (pwarray, 64, &ctx);
+ md5_read_ctx (&ctx, digest);
+ prepare_key (digest, 16, key);
- destroy_sensitive (&mdContext, sizeof (mdContext));
+ destroy_sensitive (&ctx, sizeof (ctx));
+ destroy_sensitive (digest, sizeof (digest));
destroy_sensitive (pwarray, sizeof (pwarray));
}
@@ -214,10 +193,11 @@ makekey (guint32 block, RC4_KEY *key, MD
static gboolean
verify_password (guint8 const *password, guint8 const *docid,
guint8 const *salt_data, guint8 const *hashedsalt_data,
- MD5_CTX *valContext)
+ unsigned char *valDigest)
{
guint8 pwarray [64], salt [64], hashedsalt [16];
- MD5_CTX mdContext1, mdContext2;
+ struct md5_ctx mdContext;
+ unsigned char digest[16];
RC4_KEY key;
int offset, keyoffset, i;
unsigned int tocopy;
@@ -238,24 +218,24 @@ verify_password (guint8 const *password,
pwarray[2 * i] = 0x80;
pwarray[56] = (i << 4);
- wvMD5Init (&mdContext1);
- wvMD5Update (&mdContext1, pwarray, 64);
- wvMD5StoreDigest (&mdContext1);
+ md5_init_ctx (&mdContext);
+ md5_process_block (pwarray, 64, &mdContext);
+ md5_read_ctx (&mdContext, digest);
offset = 0;
keyoffset = 0;
tocopy = 5;
- wvMD5Init (valContext);
+ md5_init_ctx (&mdContext);
while (offset != 16) {
if ((64 - offset) < 5)
tocopy = 64 - offset;
- memcpy (pwarray + offset, mdContext1.digest + keyoffset, tocopy);
+ memcpy (pwarray + offset, digest + keyoffset, tocopy);
offset += tocopy;
if (offset == 64) {
- wvMD5Update (valContext, pwarray, 64);
+ md5_process_block (pwarray, 64, &mdContext);
keyoffset = tocopy;
tocopy = 5 - tocopy;
offset = 0;
@@ -274,11 +254,11 @@ verify_password (guint8 const *password,
pwarray[56] = 0x80;
pwarray[57] = 0x0A;
- wvMD5Update (valContext, pwarray, 64);
- wvMD5StoreDigest (valContext);
+ md5_process_block (pwarray, 64, &mdContext);
+ md5_read_ctx (&mdContext, valDigest);
/* Generate 40-bit RC4 key from 128-bit hashed password */
- makekey (0, &key, valContext);
+ makekey (0, &key, valDigest);
memcpy (salt, salt_data, 16);
rc4 (salt, 16, &key);
@@ -289,17 +269,17 @@ verify_password (guint8 const *password,
memset (salt + 17, 0, 47);
salt[56] = 0x80;
- wvMD5Init (&mdContext2);
- wvMD5Update (&mdContext2, salt, 64);
- wvMD5StoreDigest (&mdContext2);
+ md5_init_ctx (&mdContext);
+ md5_process_block (salt, 64, &mdContext);
+ md5_read_ctx (&mdContext, digest);
- res = memcmp (mdContext2.digest, hashedsalt, 16) == 0;
+ res = memcmp (digest, hashedsalt, 16) == 0;
destroy_sensitive (pwarray, sizeof (pwarray));
destroy_sensitive (salt, sizeof (salt));
destroy_sensitive (hashedsalt, sizeof (hashedsalt));
- destroy_sensitive (&mdContext1, sizeof (mdContext1));
- destroy_sensitive (&mdContext2, sizeof (mdContext2));
+ destroy_sensitive (&mdContext, sizeof (mdContext));
+ destroy_sensitive (digest, sizeof (digest));
destroy_sensitive (&key, sizeof (key));
return res;
@@ -315,7 +294,7 @@ skip_bytes (BiffQuery *q, int start, int
block = (start + count) / REKEY_BLOCK;
if (block != q->block) {
- makekey (q->block = block, &q->rc4_key, &q->md5_ctxt);
+ makekey (q->block = block, &q->rc4_key, q->md5_digest);
count = (start + count) % REKEY_BLOCK;
}
@@ -343,7 +322,7 @@ ms_biff_query_set_decrypt (BiffQuery *q,
g_return_val_if_fail (q->length == sizeof_BIFF_8_FILEPASS, FALSE);
if (!verify_password (password, q->data + 6,
- q->data + 22, q->data + 38, &q->md5_ctxt))
+ q->data + 22, q->data + 38, q->md5_digest))
return FALSE;
q->encryption = MS_BIFF_CRYPTO_RC4;
@@ -484,7 +463,7 @@ ms_biff_query_next (BiffQuery *q)
data += step;
pos += step;
len -= step;
- makekey (++q->block, &q->rc4_key, &q->md5_ctxt);
+ makekey (++q->block, &q->rc4_key, q->md5_digest);
}
rc4 (data, len, &q->rc4_key);
diff -up gnumeric-1.6.3/plugins/excel/ms-biff.h.gpl-md5 gnumeric-1.6.3/plugins/excel/ms-biff.h
--- gnumeric-1.6.3/plugins/excel/ms-biff.h.gpl-md5 2005-07-15 14:31:34.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/ms-biff.h 2007-09-19 16:01:04.000000000 +0200
@@ -14,7 +14,6 @@
#include <gsf/gsf.h>
#include "rc4.h"
-#include "md5.h"
typedef enum { MS_BIFF_CRYPTO_NONE = 0,
MS_BIFF_CRYPTO_XOR,
@@ -51,7 +50,7 @@ typedef struct {
MsBiffCrypto encryption;
guint8 xor_key[16];
RC4_KEY rc4_key;
- MD5_CTX md5_ctxt;
+ unsigned char md5_digest[16];
int block;
gboolean dont_decrypt_next_record;
} BiffQuery;
diff -up gnumeric-1.6.3/plugins/excel/md5.h.gpl-md5 gnumeric-1.6.3/plugins/excel/md5.h
--- gnumeric-1.6.3/plugins/excel/md5.h.gpl-md5 2005-05-07 19:22:41.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/md5.h 2007-09-19 16:01:04.000000000 +0200
@@ -1,66 +1,124 @@
-/* vim: set sw=8 ts=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef GNM_EXCEL_MD5_H
-#define GNM_EXCEL_MD5_H
+/* Declaration of functions and data types used for MD5 sum computing
+ library functions.
+ Copyright (C) 1995-1997,1999,2000,2001,2004,2005,2006
+ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#ifndef _MD5_H
+#define _MD5_H 1
+
+#include <stdio.h>
+#include <stdint.h>
+
+#define MD5_DIGEST_SIZE 16
+#define MD5_BLOCK_SIZE 64
+
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+# define __GNUC_PREREQ(maj, min) \
+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+# define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
+#ifndef __THROW
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+# define __THROW throw ()
+# else
+# define __THROW
+# endif
+#endif
+
+#ifndef _LIBC
+# define __md5_buffer md5_buffer
+# define __md5_finish_ctx md5_finish_ctx
+# define __md5_init_ctx md5_init_ctx
+# define __md5_process_block md5_process_block
+# define __md5_process_bytes md5_process_bytes
+# define __md5_read_ctx md5_read_ctx
+# define __md5_stream md5_stream
+#endif
+
+/* Structure to save state of computation between the single steps. */
+struct md5_ctx
+{
+ uint32_t A;
+ uint32_t B;
+ uint32_t C;
+ uint32_t D;
+
+ uint32_t total[2];
+ uint32_t buflen;
+ uint32_t buffer[32];
+};
/*
- **********************************************************************
- ** md5.h -- Header file for implementation of MD5 **
- ** RSA Data Security, Inc. MD5 Message Digest Algorithm **
- ** Created: 2/17/90 RLR **
- ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version **
- ** Revised (for MD5): RLR 4/27/91 **
- ** -- G modified to have y&~z instead of y&z **
- ** -- FF, GG, HH modified to add in last register done **
- ** -- Access pattern: round 2 works mod 5, round 3 works mod 3 **
- ** -- distinct additive constant for each step **
- ** -- round 4 added, working mod 7 **
- **********************************************************************
+ * The following three functions are build up the low level used in
+ * the functions `md5_stream' and `md5_buffer'.
*/
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- ** **
- ** License to copy and use this software is granted provided that **
- ** it is identified as the "RSA Data Security, Inc. MD5 Message **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function. **
- ** **
- ** License is also granted to make and use derivative works **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD5 Message Digest Algorithm" in all **
- ** material mentioning or referencing the derived work. **
- ** **
- ** RSA Data Security, Inc. makes no representations concerning **
- ** either the merchantability of this software or the suitability **
- ** of this software for any particular purpose. It is provided "as **
- ** is" without express or implied warranty of any kind. **
- ** **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software. **
- **********************************************************************
- */
-
-/* typedef a 32 bit type */
-#include <glib.h>
-typedef guint32 UINT4;
-
-/* Data structure for MD5 (Message Digest) computation */
-typedef struct {
- UINT4 i[2]; /* number of _bits_ handled mod 2^64 */
- UINT4 buf[4]; /* scratch buffer */
- unsigned char in[64]; /* input buffer */
- unsigned char digest[16]; /* actual digest after MD5Final call */
-} MD5_CTX;
-
-void wvMD5Init (MD5_CTX *mdContext);
-void wvMD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen);
-/* void wvMD5Final (); */
-
-/*
- **********************************************************************
- ** End of md5.h **
- ******************************* (cut) ********************************
- */
+/* Initialize structure containing state of computation.
+ (RFC 1321, 3.3: Step 3) */
+extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+ initialization function update the context for the next LEN bytes
+ starting at BUFFER.
+ It is necessary that LEN is a multiple of 64!!! */
+extern void __md5_process_block (const void *buffer, size_t len,
+ struct md5_ctx *ctx) __THROW;
+
+/* Starting with the result of former calls of this function (or the
+ initialization function update the context for the next LEN bytes
+ starting at BUFFER.
+ It is NOT required that LEN is a multiple of 64. */
+extern void __md5_process_bytes (const void *buffer, size_t len,
+ struct md5_ctx *ctx) __THROW;
+
+/* Process the remaining bytes in the buffer and put result from CTX
+ in first 16 bytes following RESBUF. The result is always in little
+ endian byte order, so that a byte-wise output yields to the wanted
+ ASCII representation of the message digest.
+
+ IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+ boundary. */
+extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Put result from CTX in first 16 bytes following RESBUF. The result is
+ always in little endian byte order, so that a byte-wise output yields
+ to the wanted ASCII representation of the message digest.
+
+ IMPORTANT: On some systems, RESBUF must be aligned to a 32-bit
+ boundary. */
+extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW;
+
+
+/* Compute MD5 message digest for bytes read from STREAM. The
+ resulting message digest number will be written into the 16 bytes
+ beginning at RESBLOCK. */
+extern int __md5_stream (FILE *stream, void *resblock) __THROW;
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
+ result is always in little endian byte order, so that a byte-wise
+ output yields to the wanted ASCII representation of the message
+ digest. */
+extern void *__md5_buffer (const char *buffer, size_t len,
+ void *resblock) __THROW;
-#endif /* GNM_EXCEL_MD5_H */
+#endif /* md5.h */
diff -up gnumeric-1.6.3/plugins/excel/md5.c.gpl-md5 gnumeric-1.6.3/plugins/excel/md5.c
--- gnumeric-1.6.3/plugins/excel/md5.c.gpl-md5 2004-08-31 17:25:21.000000000 +0200
+++ gnumeric-1.6.3/plugins/excel/md5.c 2007-09-19 16:01:04.000000000 +0200
@@ -1,221 +1,448 @@
-/*
- **********************************************************************
- ** md5.c **
- ** RSA Data Security, Inc. MD5 Message Digest Algorithm **
- ** Created: 2/17/90 RLR **
- ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version **
- **********************************************************************
- */
-
-/*
- **********************************************************************
- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
- ** **
- ** License to copy and use this software is granted provided that **
- ** it is identified as the "RSA Data Security, Inc. MD5 Message **
- ** Digest Algorithm" in all material mentioning or referencing this **
- ** software or this function. **
- ** **
- ** License is also granted to make and use derivative works **
- ** provided that such works are identified as "derived from the RSA **
- ** Data Security, Inc. MD5 Message Digest Algorithm" in all **
- ** material mentioning or referencing the derived work. **
- ** **
- ** RSA Data Security, Inc. makes no representations concerning **
- ** either the merchantability of this software or the suitability **
- ** of this software for any particular purpose. It is provided "as **
- ** is" without express or implied warranty of any kind. **
- ** **
- ** These notices must be retained in any copies of any part of this **
- ** documentation and/or software. **
- **********************************************************************
- */
+/* Functions to compute MD5 message digest of files or memory blocks.
+ according to the definition of MD5 in RFC 1321 from April 1992.
+ Copyright (C) 1995,1996,1997,1999,2000,2001,2005,2006
+ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+/* Written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, 1995. */
+
+
-/* -- include the following line if the md5.h header file is separate -- */
#include "md5.h"
-/* F, G and H are basic MD5 functions: selection, majority, parity */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
-/* Rotation is separate from addition to prevent recomputation */
-#define FF(a, b, c, d, x, s, ac) \
- {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
- }
-#define GG(a, b, c, d, x, s, ac) \
- {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
- }
-#define HH(a, b, c, d, x, s, ac) \
- {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
- }
-#define II(a, b, c, d, x, s, ac) \
- {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
- }
-
-
-/* Basic MD5 step. Transform buf based on in. */
-static void
-Transform (UINT4 *buf, UINT4 *in)
-{
- UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
-
- /* Round 1 */
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
- FF (a, b, c, d, in[0], S11, 3614090360UL); /* 1 */
- FF (d, a, b, c, in[1], S12, 3905402710UL); /* 2 */
- FF (c, d, a, b, in[2], S13, 606105819UL); /* 3 */
- FF (b, c, d, a, in[3], S14, 3250441966UL); /* 4 */
- FF (a, b, c, d, in[4], S11, 4118548399UL); /* 5 */
- FF (d, a, b, c, in[5], S12, 1200080426UL); /* 6 */
- FF (c, d, a, b, in[6], S13, 2821735955UL); /* 7 */
- FF (b, c, d, a, in[7], S14, 4249261313UL); /* 8 */
- FF (a, b, c, d, in[8], S11, 1770035416UL); /* 9 */
- FF (d, a, b, c, in[9], S12, 2336552879UL); /* 10 */
- FF (c, d, a, b, in[10], S13, 4294925233UL); /* 11 */
- FF (b, c, d, a, in[11], S14, 2304563134UL); /* 12 */
- FF (a, b, c, d, in[12], S11, 1804603682UL); /* 13 */
- FF (d, a, b, c, in[13], S12, 4254626195UL); /* 14 */
- FF (c, d, a, b, in[14], S13, 2792965006UL); /* 15 */
- FF (b, c, d, a, in[15], S14, 1236535329UL); /* 16 */
-
- /* Round 2 */
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
- GG (a, b, c, d, in[1], S21, 4129170786UL); /* 17 */
- GG (d, a, b, c, in[6], S22, 3225465664UL); /* 18 */
- GG (c, d, a, b, in[11], S23, 643717713UL); /* 19 */
- GG (b, c, d, a, in[0], S24, 3921069994UL); /* 20 */
- GG (a, b, c, d, in[5], S21, 3593408605UL); /* 21 */
- GG (d, a, b, c, in[10], S22, 38016083UL); /* 22 */
- GG (c, d, a, b, in[15], S23, 3634488961UL); /* 23 */
- GG (b, c, d, a, in[4], S24, 3889429448UL); /* 24 */
- GG (a, b, c, d, in[9], S21, 568446438UL); /* 25 */
- GG (d, a, b, c, in[14], S22, 3275163606UL); /* 26 */
- GG (c, d, a, b, in[3], S23, 4107603335UL); /* 27 */
- GG (b, c, d, a, in[8], S24, 1163531501UL); /* 28 */
- GG (a, b, c, d, in[13], S21, 2850285829UL); /* 29 */
- GG (d, a, b, c, in[2], S22, 4243563512UL); /* 30 */
- GG (c, d, a, b, in[7], S23, 1735328473UL); /* 31 */
- GG (b, c, d, a, in[12], S24, 2368359562UL); /* 32 */
-
- /* Round 3 */
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
- HH (a, b, c, d, in[5], S31, 4294588738UL); /* 33 */
- HH (d, a, b, c, in[8], S32, 2272392833UL); /* 34 */
- HH (c, d, a, b, in[11], S33, 1839030562UL); /* 35 */
- HH (b, c, d, a, in[14], S34, 4259657740UL); /* 36 */
- HH (a, b, c, d, in[1], S31, 2763975236UL); /* 37 */
- HH (d, a, b, c, in[4], S32, 1272893353UL); /* 38 */
- HH (c, d, a, b, in[7], S33, 4139469664UL); /* 39 */
- HH (b, c, d, a, in[10], S34, 3200236656UL); /* 40 */
- HH (a, b, c, d, in[13], S31, 681279174UL); /* 41 */
- HH (d, a, b, c, in[0], S32, 3936430074UL); /* 42 */
- HH (c, d, a, b, in[3], S33, 3572445317UL); /* 43 */
- HH (b, c, d, a, in[6], S34, 76029189UL); /* 44 */
- HH (a, b, c, d, in[9], S31, 3654602809UL); /* 45 */
- HH (d, a, b, c, in[12], S32, 3873151461UL); /* 46 */
- HH (c, d, a, b, in[15], S33, 530742520UL); /* 47 */
- HH (b, c, d, a, in[2], S34, 3299628645UL); /* 48 */
-
- /* Round 4 */
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
- II (a, b, c, d, in[0], S41, 4096336452UL); /* 49 */
- II (d, a, b, c, in[7], S42, 1126891415UL); /* 50 */
- II (c, d, a, b, in[14], S43, 2878612391UL); /* 51 */
- II (b, c, d, a, in[5], S44, 4237533241UL); /* 52 */
- II (a, b, c, d, in[12], S41, 1700485571UL); /* 53 */
- II (d, a, b, c, in[3], S42, 2399980690UL); /* 54 */
- II (c, d, a, b, in[10], S43, 4293915773UL); /* 55 */
- II (b, c, d, a, in[1], S44, 2240044497UL); /* 56 */
- II (a, b, c, d, in[8], S41, 1873313359UL); /* 57 */
- II (d, a, b, c, in[15], S42, 4264355552UL); /* 58 */
- II (c, d, a, b, in[6], S43, 2734768916UL); /* 59 */
- II (b, c, d, a, in[13], S44, 1309151649UL); /* 60 */
- II (a, b, c, d, in[4], S41, 4149444226UL); /* 61 */
- II (d, a, b, c, in[11], S42, 3174756917UL); /* 62 */
- II (c, d, a, b, in[2], S43, 718787259UL); /* 63 */
- II (b, c, d, a, in[9], S44, 3951481745UL); /* 64 */
-
- buf[0] += a;
- buf[1] += b;
- buf[2] += c;
- buf[3] += d;
-}
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <endian.h>
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
+#ifdef _LIBC
+/* We need to keep the namespace clean so define the MD5 function
+ protected using leading __ . */
+# define md5_init_ctx __md5_init_ctx
+# define md5_process_block __md5_process_block
+# define md5_process_bytes __md5_process_bytes
+# define md5_finish_ctx __md5_finish_ctx
+# define md5_read_ctx __md5_read_ctx
+# define md5_stream __md5_stream
+# define md5_buffer __md5_buffer
+#endif
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define SWAP(n) \
+ (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
+#else
+# define SWAP(n) (n)
+#endif
+
+#define BLOCKSIZE 4096
+#if BLOCKSIZE % 64 != 0
+# error "invalid BLOCKSIZE"
+#endif
+
+/* This array contains the bytes used to pad the buffer to the next
+ 64-byte boundary. (RFC 1321, 3.1: Step 1) */
+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ };
+
+
+/* Initialize structure containing state of computation.
+ (RFC 1321, 3.3: Step 3) */
void
-wvMD5Init (MD5_CTX *mdContext)
+md5_init_ctx (struct md5_ctx *ctx)
{
- mdContext->i[0] = mdContext->i[1] = (UINT4) 0;
+ ctx->A = 0x67452301;
+ ctx->B = 0xefcdab89;
+ ctx->C = 0x98badcfe;
+ ctx->D = 0x10325476;
- /* Load magic initialization constants.
- */
- mdContext->buf[0] = (UINT4) 0x67452301;
- mdContext->buf[1] = (UINT4) 0xefcdab89;
- mdContext->buf[2] = (UINT4) 0x98badcfe;
- mdContext->buf[3] = (UINT4) 0x10325476;
+ ctx->total[0] = ctx->total[1] = 0;
+ ctx->buflen = 0;
}
-void
-wvMD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen)
+/* Put result from CTX in first 16 bytes following RESBUF. The result
+ must be in little endian byte order.
+
+ IMPORTANT: On some systems it is required that RESBUF is correctly
+ aligned for a 32-bit value. */
+void *
+md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
+{
+ ((uint32_t *) resbuf)[0] = SWAP (ctx->A);
+ ((uint32_t *) resbuf)[1] = SWAP (ctx->B);
+ ((uint32_t *) resbuf)[2] = SWAP (ctx->C);
+ ((uint32_t *) resbuf)[3] = SWAP (ctx->D);
+
+ return resbuf;
+}
+
+/* Process the remaining bytes in the internal buffer and the usual
+ prolog according to the standard and write the result to RESBUF.
+
+ IMPORTANT: On some systems it is required that RESBUF is correctly
+ aligned for a 32-bit value. */
+void *
+md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
+{
+ /* Take yet unprocessed bytes into account. */
+ uint32_t bytes = ctx->buflen;
+ size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4;
+
+ /* Now count remaining bytes. */
+ ctx->total[0] += bytes;
+ if (ctx->total[0] < bytes)
+ ++ctx->total[1];
+
+ /* Put the 64-bit file length in *bits* at the end of the buffer. */
+ ctx->buffer[size - 2] = SWAP (ctx->total[0] << 3);
+ ctx->buffer[size - 1] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
+
+ memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
+
+ /* Process last bytes. */
+ md5_process_block (ctx->buffer, size * 4, ctx);
+
+ return md5_read_ctx (ctx, resbuf);
+}
+
+/* Compute MD5 message digest for bytes read from STREAM. The
+ resulting message digest number will be written into the 16 bytes
+ beginning at RESBLOCK. */
+int
+md5_stream (FILE *stream, void *resblock)
{
- UINT4 in[16];
- int mdi;
- unsigned int i, ii;
-
- /* compute number of bytes mod 64 */
- mdi = (int) ((mdContext->i[0] >> 3) & 0x3F);
-
- /* update number of bits */
- if ((mdContext->i[0] + ((UINT4) inLen << 3)) < mdContext->i[0])
- mdContext->i[1]++;
- mdContext->i[0] += ((UINT4) inLen << 3);
- mdContext->i[1] += ((UINT4) inLen >> 29);
-
- while (inLen--)
- {
- /* add new character to buffer, increment mdi */
- mdContext->in[mdi++] = *inBuf++;
+ struct md5_ctx ctx;
+ char buffer[BLOCKSIZE + 72];
+ size_t sum;
+
+ /* Initialize the computation context. */
+ md5_init_ctx (&ctx);
+
+ /* Iterate over full file contents. */
+ while (1)
+ {
+ /* We read the file in blocks of BLOCKSIZE bytes. One call of the
+ computation function processes the whole buffer so that with the
+ next round of the loop another block can be read. */
+ size_t n;
+ sum = 0;
+
+ /* Read block. Take care for partial reads. */
+ while (1)
+ {
+ n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
- /* transform if necessary */
- if (mdi == 0x40)
+ sum += n;
+
+ if (sum == BLOCKSIZE)
+ break;
+
+ if (n == 0)
{
- for (i = 0, ii = 0; i < 16; i++, ii += 4)
- in[i] = (((UINT4) mdContext->in[ii + 3]) << 24) |
- (((UINT4) mdContext->in[ii + 2]) << 16) |
- (((UINT4) mdContext->in[ii + 1]) << 8) |
- ((UINT4) mdContext->in[ii]);
- Transform (mdContext->buf, in);
- mdi = 0;
+ /* Check for the error flag IFF N == 0, so that we don't
+ exit the loop after a partial read due to e.g., EAGAIN
+ or EWOULDBLOCK. */
+ if (ferror (stream))
+ return 1;
+ goto process_partial_block;
}
- }
+
+ /* We've read at least one byte, so ignore errors. But always
+ check for EOF, since feof may be true even though N > 0.
+ Otherwise, we could end up calling fread after EOF. */
+ if (feof (stream))
+ goto process_partial_block;
+ }
+
+ /* Process buffer with BLOCKSIZE bytes. Note that
+ BLOCKSIZE % 64 == 0
+ */
+ md5_process_block (buffer, BLOCKSIZE, &ctx);
+ }
+
+process_partial_block:
+
+ /* Process any remaining bytes. */
+ if (sum > 0)
+ md5_process_bytes (buffer, sum, &ctx);
+
+ /* Construct result in desired memory. */
+ md5_finish_ctx (&ctx, resblock);
+ return 0;
+}
+
+/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
+ result is always in little endian byte order, so that a byte-wise
+ output yields to the wanted ASCII representation of the message
+ digest. */
+void *
+md5_buffer (const char *buffer, size_t len, void *resblock)
+{
+ struct md5_ctx ctx;
+
+ /* Initialize the computation context. */
+ md5_init_ctx (&ctx);
+
+ /* Process whole buffer but last len % 64 bytes. */
+ md5_process_bytes (buffer, len, &ctx);
+
+ /* Put result in desired memory area. */
+ return md5_finish_ctx (&ctx, resblock);
+}
+
+
+void
+md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+ /* When we already have some bits in our internal buffer concatenate
+ both inputs first. */
+ if (ctx->buflen != 0)
+ {
+ size_t left_over = ctx->buflen;
+ size_t add = 128 - left_over > len ? len : 128 - left_over;
+
+ memcpy (&((char *) ctx->buffer)[left_over], buffer, add);
+ ctx->buflen += add;
+
+ if (ctx->buflen > 64)
+ {
+ md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
+
+ ctx->buflen &= 63;
+ /* The regions in the following copy operation cannot overlap. */
+ memcpy (ctx->buffer,
+ &((char *) ctx->buffer)[(left_over + add) & ~63],
+ ctx->buflen);
+ }
+
+ buffer = (const char *) buffer + add;
+ len -= add;
+ }
+
+ /* Process available complete blocks. */
+ if (len >= 64)
+ {
+#if !_STRING_ARCH_unaligned
+# define alignof(type) offsetof (struct { char c; type x; }, x)
+# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
+ if (UNALIGNED_P (buffer))
+ while (len > 64)
+ {
+ md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
+ buffer = (const char *) buffer + 64;
+ len -= 64;
+ }
+ else
+#endif
+ {
+ md5_process_block (buffer, len & ~63, ctx);
+ buffer = (const char *) buffer + (len & ~63);
+ len &= 63;
+ }
+ }
+
+ /* Move remaining bytes in internal buffer. */
+ if (len > 0)
+ {
+ size_t left_over = ctx->buflen;
+
+ memcpy (&((char *) ctx->buffer)[left_over], buffer, len);
+ left_over += len;
+ if (left_over >= 64)
+ {
+ md5_process_block (ctx->buffer, 64, ctx);
+ left_over -= 64;
+ memcpy (ctx->buffer, &ctx->buffer[16], left_over);
+ }
+ ctx->buflen = left_over;
+ }
}
-/*
- **********************************************************************
- ** End of md5.c **
- ******************************* (cut) ********************************
- */
+
+/* These are the four functions used in the four steps of the MD5 algorithm
+ and defined in the RFC 1321. The first function is a little bit optimized
+ (as found in Colin Plumbs public domain implementation). */
+/* #define FF(b, c, d) ((b & c) | (~b & d)) */
+#define FF(b, c, d) (d ^ (b & (c ^ d)))
+#define FG(b, c, d) FF (d, b, c)
+#define FH(b, c, d) (b ^ c ^ d)
+#define FI(b, c, d) (c ^ (b | ~d))
+
+/* Process LEN bytes of BUFFER, accumulating context into CTX.
+ It is assumed that LEN % 64 == 0. */
+
+void
+md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
+{
+ uint32_t correct_words[16];
+ const uint32_t *words = buffer;
+ size_t nwords = len / sizeof (uint32_t);
+ const uint32_t *endp = words + nwords;
+ uint32_t A = ctx->A;
+ uint32_t B = ctx->B;
+ uint32_t C = ctx->C;
+ uint32_t D = ctx->D;
+
+ /* First increment the byte count. RFC 1321 specifies the possible
+ length of the file up to 2^64 bits. Here we only compute the
+ number of bytes. Do a double word increment. */
+ ctx->total[0] += len;
+ if (ctx->total[0] < len)
+ ++ctx->total[1];
+
+ /* Process all bytes in the buffer with 64 bytes in each round of
+ the loop. */
+ while (words < endp)
+ {
+ uint32_t *cwp = correct_words;
+ uint32_t A_save = A;
+ uint32_t B_save = B;
+ uint32_t C_save = C;
+ uint32_t D_save = D;
+
+ /* First round: using the given function, the context and a constant
+ the next context is computed. Because the algorithms processing
+ unit is a 32-bit word and it is determined to work on words in
+ little endian byte order we perhaps have to change the byte order
+ before the computation. To reduce the work for the next steps
+ we store the swapped words in the array CORRECT_WORDS. */
+
+#define OP(a, b, c, d, s, T) \
+ do \
+ { \
+ a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
+ ++words; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+ /* It is unfortunate that C does not provide an operator for
+ cyclic rotation. Hope the C compiler is smart enough. */
+#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
+
+ /* Before we start, one word to the strange constants.
+ They are defined in RFC 1321 as
+
+ T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+
+ Here is an equivalent invocation using Perl:
+
+ perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
+ */
+
+ /* Round 1. */
+ OP (A, B, C, D, 7, 0xd76aa478);
+ OP (D, A, B, C, 12, 0xe8c7b756);
+ OP (C, D, A, B, 17, 0x242070db);
+ OP (B, C, D, A, 22, 0xc1bdceee);
+ OP (A, B, C, D, 7, 0xf57c0faf);
+ OP (D, A, B, C, 12, 0x4787c62a);
+ OP (C, D, A, B, 17, 0xa8304613);
+ OP (B, C, D, A, 22, 0xfd469501);
+ OP (A, B, C, D, 7, 0x698098d8);
+ OP (D, A, B, C, 12, 0x8b44f7af);
+ OP (C, D, A, B, 17, 0xffff5bb1);
+ OP (B, C, D, A, 22, 0x895cd7be);
+ OP (A, B, C, D, 7, 0x6b901122);
+ OP (D, A, B, C, 12, 0xfd987193);
+ OP (C, D, A, B, 17, 0xa679438e);
+ OP (B, C, D, A, 22, 0x49b40821);
+
+ /* For the second to fourth round we have the possibly swapped words
+ in CORRECT_WORDS. Redefine the macro to take an additional first
+ argument specifying the function to use. */
+#undef OP
+#define OP(f, a, b, c, d, k, s, T) \
+ do \
+ { \
+ a += f (b, c, d) + correct_words[k] + T; \
+ CYCLIC (a, s); \
+ a += b; \
+ } \
+ while (0)
+
+ /* Round 2. */
+ OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
+ OP (FG, D, A, B, C, 6, 9, 0xc040b340);
+ OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
+ OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
+ OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
+ OP (FG, D, A, B, C, 10, 9, 0x02441453);
+ OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
+ OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
+ OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
+ OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
+ OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
+ OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
+ OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
+ OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
+ OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
+ OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
+
+ /* Round 3. */
+ OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
+ OP (FH, D, A, B, C, 8, 11, 0x8771f681);
+ OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
+ OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
+ OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
+ OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
+ OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
+ OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
+ OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
+ OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
+ OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
+ OP (FH, B, C, D, A, 6, 23, 0x04881d05);
+ OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
+ OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
+ OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
+ OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
+
+ /* Round 4. */
+ OP (FI, A, B, C, D, 0, 6, 0xf4292244);
+ OP (FI, D, A, B, C, 7, 10, 0x432aff97);
+ OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
+ OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
+ OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
+ OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
+ OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
+ OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
+ OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
+ OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
+ OP (FI, C, D, A, B, 6, 15, 0xa3014314);
+ OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
+ OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
+ OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
+ OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
+ OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
+
+ /* Add the starting values of the context. */
+ A += A_save;
+ B += B_save;
+ C += C_save;
+ D += D_save;
+ }
+
+ /* Put checksum in context given as argument. */
+ ctx->A = A;
+ ctx->B = B;
+ ctx->C = C;
+ ctx->D = D;
+}
gnumeric-1.6.3-stf-parse.patch:
--- NEW FILE gnumeric-1.6.3-stf-parse.patch ---
--- trunk/src/stf-parse.c 2006/05/25 16:09:39 14862
+++ trunk/src/stf-parse.c 2006/06/21 00:39:23 14888
@@ -1400,6 +1400,7 @@
if (count_character (lines, (c = sepchar), 0.5) > 0 ||
count_character (lines, (c = format_get_col_sep ()), 0.5) > 0 ||
count_character (lines, (c = ':'), 0.5) > 0 ||
+ count_character (lines, (c = ','), 0.5) > 0 ||
count_character (lines, (c = ';'), 0.5) > 0 ||
count_character (lines, (c = '|'), 0.5) > 0 ||
count_character (lines, (c = '!'), 0.5) > 0 ||
--- NEW FILE import.log ---
gnumeric-1_6_3-15_fc8:EL-5:gnumeric-1.6.3-15.fc8.src.rpm:1222156454
Index: gnumeric.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnumeric/EL-5/gnumeric.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnumeric.spec 9 Sep 2006 13:26:31 -0000 1.22
+++ gnumeric.spec 23 Sep 2008 07:54:49 -0000 1.23
@@ -1,27 +1,30 @@
Name: gnumeric
Epoch: 1
Version: 1.6.3
-Release: 5%{?dist}
+Release: 15%{?dist}
Summary: Spreadsheet program for GNOME
Group: Applications/Productivity
-License: GPL
+# bug filed upstream about this being GPL v2 only:
+# http://bugzilla.gnome.org/show_bug.cgi?id=463247
+License: GPLv2
URL: http://www.gnome.org/gnumeric/
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.6/%{name}-%{version}.tar.bz2
Patch0: gnumeric-1.6.1-desktop.patch
Patch1: gnumeric-1.4.1-excelcrash.patch
Patch2: gnumeric-1.6.3-helppath.patch
+Patch3: gnumeric-1.6.3-gda3.patch
+Patch4: gnumeric-1.6.3-gpl-md5.patch
+Patch5: gnumeric-1.6.3-stf-parse.patch
+Patch6: gnumeric-1.6.3-excel-overflow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: desktop-file-utils >= 0.9
BuildRequires: libgnomeui-devel >= 2.4.0
BuildRequires: libgnomeprintui22-devel >= 2.8.2
-BuildRequires: python-devel
-BuildRequires: libgsf-devel >= 1.13.2
-BuildRequires: automake autoconf libtool
-BuildRequires: intltool scrollkeeper gettext
-BuildRequires: libgnomedb-devel >= 1.0.4
+BuildRequires: libgsf-gnome-devel >= 1.13.2
+BuildRequires: libgnomedb-devel >= 3.0.0
BuildRequires: pygtk2-devel >= 2.6.0
BuildRequires: goffice-devel >= 0.2.0
-BuildRequires: guile-devel
+BuildRequires: python-devel guile-devel perl(XML::Parser) scrollkeeper
+BuildRequires: gettext desktop-file-utils
Requires: scrollkeeper hicolor-icon-theme
Requires(pre): GConf2
Requires(post): /sbin/ldconfig GConf2 scrollkeeper
@@ -34,7 +37,7 @@
%package devel
-Summary: Files necessary to develop gnumeric-based applications.
+Summary: Files necessary to develop gnumeric-based applications
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -49,13 +52,19 @@
%patch0 -p1 -b .desktop
%patch1 -p1 -b .excelcrash
%patch2 -p1 -b .helppath
+%patch3 -p1 -b .gda3
+%patch4 -p1 -b .gpl-md5
+%patch5 -p1 -b .csv
+%patch6 -p1 -b .excel
+chmod -x plugins/excel/rc4.?
%build
-libtoolize --force --copy && aclocal && autoconf
-export mllibname=%{_lib}
%configure --without-gb --enable-ssindex
-OLD_PO_FILE_INPUT=yes make
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
%install
@@ -70,9 +79,7 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
--add-category Office \
- --add-category Application \
--add-category Spreadsheet \
$RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -82,22 +89,22 @@
$RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/%{name}.png
#remove unused mime type icons
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/pixmaps/gnome-application-*.png
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}-gnome-application-*.png
+rm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/gnome-application-*.png
+rm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}/gnome-application-*.png
#remove spurious .ico thing
-rm -rf $RPM_BUILD_ROOT/usr/share/pixmaps/win32-%{name}.ico
-rm -rf $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}/win32-%{name}.ico
+rm $RPM_BUILD_ROOT/usr/share/pixmaps/win32-%{name}.ico
+rm $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}/win32-%{name}.ico
#remove scrollkeeper stuff
rm -rf $RPM_BUILD_ROOT/var
#remove .la files
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version}/plugins/*/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
+rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version}/plugins/*/*.la
#remove bogus mc stuff
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/mc
+rm -r $RPM_BUILD_ROOT/%{_datadir}/mc
%clean
@@ -157,7 +164,8 @@
%exclude %{_datadir}/%{name}/%{version}/idl
%{_datadir}/mime-info
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/omf/%{name}
+# The actual omf file is in gnumeric.lang, but find-lang doesn't own the dir!
+%dir %{_datadir}/omf/%{name}
%{_mandir}/man1/*
%files devel
@@ -167,6 +175,40 @@
%changelog
+* Wed Feb 6 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-15
+- Fix launching of gnome-database-properties from the Data -> Databases
+ menu-entry (bug 431618)
+
+* Sun Feb 3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-14
+- Fix integer overflow and signedness errors in XLS processing (Bug 431229)
+
+* Thu Nov 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-13
+- Fix opening of csv files in non-English locales (bz 385441)
+
+* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-12
+- Replace GPL incompatible licensed md5 code with GPL compatible code from
+ gnulib
+
+* Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-11
+- Fix Source0 URL
+
+* Mon Aug 6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-10
+- Update License tag for new Licensing Guidelines compliance
+- Don't regenerate all the autoxxx stuff (not needed) this fixes building with
+ the latest intltool
+
+* Sun Jun 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-9
+- Remove yelp Requires again <sigh> (bz 243361)
+
+* Fri Jun 8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-8
+- Add yelp Requires so that the help will always work (bz 243361)
+
+* Sun May 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-7
+- Build against new libgda + libgnomedb
+
+* Mon Feb 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-6
+- Change BuildRequires: libgsf-devel to libgsf-gnome-devel to fix rawhide build
+
* Sat Sep 9 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.3-5
- Various specfile cleanups
- Don't own /usr/share/omf (bug 205667)
@@ -325,7 +367,7 @@
- add ssconvert
* Tue Oct 14 2003 Havoc Pennington <hp at redhat.com> 1:1.2.1-1
-- add %post to install schemas
+- add %%post to install schemas
- 1.2.1
* Fri Sep 19 2003 Havoc Pennington <hp at redhat.com> 1:1.2.0-1
@@ -450,7 +492,7 @@
* Mon Jul 16 2001 Jonathan Blandford <jrb at redhat.com>
- backport sheet corruption fix
-* Tue Jul 10 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jul 10 2001 Trond Eivind Glomsrød <teg at redhat.com>
- Make devel subpackage depend on main package
* Sat Jul 07 2001 Owen Taylor <otaylor at redhat.com>
More information about the fedora-extras-commits
mailing list