- Removed patch for RH bug #215634 (fixed upstream). - Removed patch for GNOME bug #466987 (fixed upstream).f41
Milan Crha
18 years ago
parent
e75bc9a95a
commit
3931730179
@ -1 +1 @@
|
|||||||
evolution-data-server-1.11.90.tar.bz2
|
evolution-data-server-1.11.91.tar.bz2
|
||||||
|
|||||||
@ -1,95 +0,0 @@
|
|||||||
--- evolution-data-server-1.10.1/camel/camel-tcp-stream-ssl.c.camel-certdb-nss-cert-get 2007-04-09 08:42:48.000000000 -0400
|
|
||||||
+++ evolution-data-server-1.10.1/camel/camel-tcp-stream-ssl.c 2007-05-09 21:41:38.000000000 -0400
|
|
||||||
@@ -679,63 +679,47 @@
|
|
||||||
CamelCert *
|
|
||||||
camel_certdb_nss_cert_get(CamelCertDB *certdb, CERTCertificate *cert)
|
|
||||||
{
|
|
||||||
- char *fingerprint, *path;
|
|
||||||
+ char *fingerprint;
|
|
||||||
CamelCert *ccert;
|
|
||||||
- struct stat st;
|
|
||||||
- size_t nread;
|
|
||||||
- ssize_t n;
|
|
||||||
- int fd;
|
|
||||||
-
|
|
||||||
+
|
|
||||||
fingerprint = cert_fingerprint (cert);
|
|
||||||
ccert = camel_certdb_get_cert (certdb, fingerprint);
|
|
||||||
if (ccert == NULL) {
|
|
||||||
g_free (fingerprint);
|
|
||||||
return ccert;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+
|
|
||||||
if (ccert->rawcert == NULL) {
|
|
||||||
-#ifndef G_OS_WIN32
|
|
||||||
- path = g_strdup_printf ("%s/.camel_certs/%s", getenv ("HOME"), fingerprint);
|
|
||||||
-#else
|
|
||||||
- path = g_build_filename (g_get_home_dir (), ".camel_certs", fingerprint, NULL);
|
|
||||||
-#endif
|
|
||||||
- if (g_stat (path, &st) == -1
|
|
||||||
- || (fd = g_open (path, O_RDONLY | O_BINARY, 0)) == -1) {
|
|
||||||
- g_warning ("could not load cert %s: %s", path, strerror (errno));
|
|
||||||
- g_free (fingerprint);
|
|
||||||
- g_free (path);
|
|
||||||
- camel_cert_set_trust (certdb, ccert, CAMEL_CERT_TRUST_UNKNOWN);
|
|
||||||
+ GByteArray *array;
|
|
||||||
+ gchar *filename;
|
|
||||||
+ gchar *contents;
|
|
||||||
+ gsize length;
|
|
||||||
+ GError *error = NULL;
|
|
||||||
+
|
|
||||||
+ filename = g_build_filename (
|
|
||||||
+ g_get_home_dir (), ".camel_certs", fingerprint, NULL);
|
|
||||||
+ g_file_get_contents (filename, &contents, &length, &error);
|
|
||||||
+ if (error != NULL) {
|
|
||||||
+ g_warning (
|
|
||||||
+ "Could not load cert %s: %s",
|
|
||||||
+ filename, error->message);
|
|
||||||
+ g_error_free (error);
|
|
||||||
+
|
|
||||||
+ camel_cert_set_trust (
|
|
||||||
+ certdb, ccert, CAMEL_CERT_TRUST_UNKNOWN);
|
|
||||||
camel_certdb_touch (certdb);
|
|
||||||
-
|
|
||||||
- return ccert;
|
|
||||||
- }
|
|
||||||
- g_free(path);
|
|
||||||
-
|
|
||||||
- ccert->rawcert = g_byte_array_new ();
|
|
||||||
- g_byte_array_set_size (ccert->rawcert, st.st_size);
|
|
||||||
-
|
|
||||||
- nread = 0;
|
|
||||||
- do {
|
|
||||||
- do {
|
|
||||||
- n = read (fd, ccert->rawcert->data + nread, st.st_size - nread);
|
|
||||||
- } while (n == -1 && errno == EINTR);
|
|
||||||
-
|
|
||||||
- if (n > 0)
|
|
||||||
- nread += n;
|
|
||||||
- } while (nread < st.st_size && n != -1);
|
|
||||||
-
|
|
||||||
- close (fd);
|
|
||||||
-
|
|
||||||
- if (nread != st.st_size) {
|
|
||||||
- g_warning ("cert size read truncated %s: %u != %ld", path, nread, st.st_size);
|
|
||||||
- g_byte_array_free(ccert->rawcert, TRUE);
|
|
||||||
- ccert->rawcert = NULL;
|
|
||||||
- g_free(fingerprint);
|
|
||||||
- camel_cert_set_trust(certdb, ccert, CAMEL_CERT_TRUST_UNKNOWN);
|
|
||||||
- camel_certdb_touch(certdb);
|
|
||||||
+ g_free (fingerprint);
|
|
||||||
+ g_free (filename);
|
|
||||||
|
|
||||||
return ccert;
|
|
||||||
}
|
|
||||||
+ g_free (filename);
|
|
||||||
+
|
|
||||||
+ array = g_byte_array_sized_new (length);
|
|
||||||
+ g_byte_array_append (array, (guint8 *) contents, length);
|
|
||||||
+ g_free (contents);
|
|
||||||
+
|
|
||||||
+ ccert->rawcert = array;
|
|
||||||
}
|
|
||||||
|
|
||||||
g_free(fingerprint);
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
--- evolution-data-server-1.11.90/libdb/dbm/dbm.c.glibc-open 2007-07-05 02:02:46.000000000 -0400
|
|
||||||
+++ evolution-data-server-1.11.90/libdb/dbm/dbm.c 2007-08-15 12:45:08.000000000 -0400
|
|
||||||
@@ -240,7 +240,7 @@ __db_ndbm_open(file, oflags, mode)
|
|
||||||
if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 ||
|
|
||||||
(ret = dbp->set_h_ffactor(dbp, 40)) != 0 ||
|
|
||||||
(ret = dbp->set_h_nelem(dbp, 1)) != 0 ||
|
|
||||||
- (ret = dbp->open(dbp, NULL,
|
|
||||||
+ (ret = (*dbp->open)(dbp, NULL,
|
|
||||||
path, NULL, DB_HASH, __db_oflags(oflags), mode)) != 0) {
|
|
||||||
__os_set_errno(ret);
|
|
||||||
return (NULL);
|
|
||||||
--- evolution-data-server-1.11.90/libedataserver/e-dbhash.c.glibc-open 2007-07-05 02:01:55.000000000 -0400
|
|
||||||
+++ evolution-data-server-1.11.90/libedataserver/e-dbhash.c 2007-08-15 12:45:08.000000000 -0400
|
|
||||||
@@ -33,9 +33,9 @@ e_dbhash_new (const char *filename)
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
- rv = db->open (db, NULL, filename, NULL, DB_HASH, 0, 0666);
|
|
||||||
+ rv = (*db->open) (db, NULL, filename, NULL, DB_HASH, 0, 0666);
|
|
||||||
if (rv != 0) {
|
|
||||||
- rv = db->open (db, NULL, filename, NULL, DB_HASH, DB_CREATE, 0666);
|
|
||||||
+ rv = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_CREATE, 0666);
|
|
||||||
|
|
||||||
if (rv != 0) {
|
|
||||||
db->close (db, 0);
|
|
||||||
--- evolution-data-server-1.11.90/addressbook/backends/file/e-book-backend-file.c.glibc-open 2007-08-15 12:54:20.000000000 -0400
|
|
||||||
+++ evolution-data-server-1.11.90/addressbook/backends/file/e-book-backend-file.c 2007-08-15 12:54:58.000000000 -0400
|
|
||||||
@@ -1100,7 +1100,7 @@ e_book_backend_file_load_source (EBookBa
|
|
||||||
(void *(*)(void *, size_t))g_try_realloc,
|
|
||||||
g_free);
|
|
||||||
|
|
||||||
- db_error = env->open (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0);
|
|
||||||
+ db_error = (*env->open) (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0);
|
|
||||||
if (db_error != 0) {
|
|
||||||
env->close(env, 0);
|
|
||||||
g_warning ("db_env_open failed with %s", db_strerror (db_error));
|
|
||||||
@@ -1125,7 +1125,7 @@ e_book_backend_file_load_source (EBookBa
|
|
||||||
return db_error_to_status (db_error);
|
|
||||||
}
|
|
||||||
|
|
||||||
- db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
|
|
||||||
+ db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
|
|
||||||
|
|
||||||
if (db_error == DB_OLD_VERSION) {
|
|
||||||
db_error = e_db3_utils_upgrade_format (filename);
|
|
||||||
@@ -1137,7 +1137,7 @@ e_book_backend_file_load_source (EBookBa
|
|
||||||
return db_error_to_status (db_error);
|
|
||||||
}
|
|
||||||
|
|
||||||
- db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
|
|
||||||
+ db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
|
|
||||||
}
|
|
||||||
|
|
||||||
bf->priv->file_db = db;
|
|
||||||
@@ -1154,7 +1154,7 @@ e_book_backend_file_load_source (EBookBa
|
|
||||||
g_free (filename);
|
|
||||||
return GNOME_Evolution_Addressbook_OtherError;
|
|
||||||
}
|
|
||||||
- db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_RDONLY | DB_THREAD, 0666);
|
|
||||||
+ db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_RDONLY | DB_THREAD, 0666);
|
|
||||||
|
|
||||||
if (db_error != 0 && !only_if_exists) {
|
|
||||||
int rv;
|
|
||||||
@@ -1181,7 +1181,7 @@ e_book_backend_file_load_source (EBookBa
|
|
||||||
return GNOME_Evolution_Addressbook_OtherError;
|
|
||||||
}
|
|
||||||
|
|
||||||
- db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666);
|
|
||||||
+ db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666);
|
|
||||||
if (db_error != 0) {
|
|
||||||
db->close (db, 0);
|
|
||||||
g_warning ("db->open (... DB_CREATE ...) failed with %s", db_strerror (db_error));
|
|
||||||
Loading…
Reference in new issue