cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We are getting fucked by our 32-bits time_t :(

Browse Source
This commit is contained in:
ajacoutot 2012-10-18 13:54:56 +00:00
parent 34d52f120c
commit 7335f84678
11 changed files with 61 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
databases/evolution-data-server/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.122 2012/10/16 11:55:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.123 2012/10/18 13:54:56 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= unified backend for PIM programs
GNOME_PROJECT= evolution-data-server
GNOME_VERSION= 3.6.1
REVISION= 0
REVISION= 1
# Only get the first x.y which is needed in the PLIST.
R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@ -71,15 +71,10 @@ MODPY_ADJ_FILES= addressbook/libebook/gen-western-table.py
MODGNOME_TOOLS= goi vala
MODGNOME_CPPFLAGS= -I${LOCALBASE}/include/db4
AUTOCONF_VERSION= 2.68
AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --enable-ssl \
--enable-smime \
--enable-ipv6 \
--enable-weather \
--enable-nntp \
--with-krb5 \
CONFIGURE_ARGS= --with-krb5 \
--with-krb5-libs=/usr/lib \
--with-krb5-includes=/usr/include/kerberosV \
--with-libdb=${LOCALBASE} \

6
databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-addressbook_backends_file_e-book-backend-file_c,v 1.15 2012/09/28 06:35:36 ajacoutot Exp $
$OpenBSD: patch-addressbook_backends_file_e-book-backend-file_c,v 1.16 2012/10/18 13:54:56 ajacoutot Exp $
On OpenBSD, time_t is an int.
XXX remove when we have a 64-bit time_t
--- addressbook/backends/file/e-book-backend-file.c.orig Fri Sep 28 07:55:56 2012
+++ addressbook/backends/file/e-book-backend-file.c Fri Sep 28 07:56:06 2012
@ -9,7 +9,7 @@ On OpenBSD, time_t is an int.
* should be okay. */
static guint c = 0;
- return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", time (NULL), c++);
+ return g_strdup_printf (PAS_ID_PREFIX "%08X%08X", time (NULL), c++);
+ return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", (long)time (NULL), c++);
}
static gchar *

17
databases/evolution-data-server/patches/patch-addressbook_backends_ldap_e-book-backend-ldap_c
View File

@ -1,15 +1,20 @@
$OpenBSD: patch-addressbook_backends_ldap_e-book-backend-ldap_c,v 1.8 2012/09/28 06:35:36 ajacoutot Exp $
$OpenBSD: patch-addressbook_backends_ldap_e-book-backend-ldap_c,v 1.9 2012/10/18 13:54:56 ajacoutot Exp $
On OpenBSD, time_t is an int.
XXX remove when we have a 64-bit time_t
--- addressbook/backends/ldap/e-book-backend-ldap.c.orig Sun Sep 16 17:41:56 2012
+++ addressbook/backends/ldap/e-book-backend-ldap.c Thu Sep 27 20:30:27 2012
@@ -1264,7 +1264,7 @@ create_dn_from_contact (EContact *contact,
--- addressbook/backends/ldap/e-book-backend-ldap.c.orig Sun Sep 16 17:05:38 2012
+++ addressbook/backends/ldap/e-book-backend-ldap.c Thu Oct 18 14:12:14 2012
@@ -1264,11 +1264,11 @@ create_dn_from_contact (EContact *contact,
}
}
- dn = g_strdup_printf ("%s=%s%s%lu",
+ dn = g_strdup_printf ("%s=%s%s%d",
+ dn = g_strdup_printf ("%s=%s%s%llu",
get_dn_attribute_name (rootdn),
(cn_part && *cn_part) ? cn_part : "",
(cn_part && *cn_part) ? "." : "",
- time (NULL));
+ (long long)time (NULL));
g_free (cn_part);

6
databases/evolution-data-server/patches/patch-addressbook_backends_vcf_e-book-backend-vcf_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-addressbook_backends_vcf_e-book-backend-vcf_c,v 1.8 2012/09/28 06:35:36 ajacoutot Exp $
$OpenBSD: patch-addressbook_backends_vcf_e-book-backend-vcf_c,v 1.9 2012/10/18 13:54:56 ajacoutot Exp $
On OpenBSD, time_t is an int.
XXX remove when we have a 64-bit time_t
--- addressbook/backends/vcf/e-book-backend-vcf.c.orig Fri Sep 28 07:55:26 2012
+++ addressbook/backends/vcf/e-book-backend-vcf.c Fri Sep 28 07:55:42 2012
@ -9,7 +9,7 @@ On OpenBSD, time_t is an int.
* should be okay. */
static guint c = 0;
- return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", time (NULL), c++);
+ return g_strdup_printf (PAS_ID_PREFIX "%08X%08X", time (NULL), c++);
+ return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", (long)time (NULL), c++);
}
static void

16
databases/evolution-data-server/patches/patch-calendar_libedata-cal_e-cal-backend-intervaltree_c
View File

@ -1,15 +1,17 @@
$OpenBSD: patch-calendar_libedata-cal_e-cal-backend-intervaltree_c,v 1.7 2012/03/29 06:45:21 ajacoutot Exp $
$OpenBSD: patch-calendar_libedata-cal_e-cal-backend-intervaltree_c,v 1.8 2012/10/18 13:54:56 ajacoutot Exp $
On OpenBSD, time_t is an int.
XXX remove when we have a 64-bit time_t
--- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig Tue Feb 21 09:04:18 2012
+++ calendar/libedata-cal/e-cal-backend-intervaltree.c Fri Mar 23 23:05:19 2012
@@ -613,7 +613,7 @@ e_intervaltree_node_dump (EIntervalTree *tree,
--- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig Sun Sep 16 17:05:38 2012
+++ calendar/libedata-cal/e-cal-backend-intervaltree.c Thu Oct 18 14:21:21 2012
@@ -613,8 +613,8 @@ e_intervaltree_node_dump (EIntervalTree *tree,
*/
EIntervalTreePrivate *priv = tree->priv;
if (node != priv->nil)
- g_print ("%*s[%ld - %ld] [%ld - %ld] red %d\n", indent, "", node->start,
+ g_print ("%*s[%d - %d] [%d - %d] red %d\n", indent, "", node->start,
node->end, node->min, node->max, node->red);
- node->end, node->min, node->max, node->red);
+ g_print ("%*s[%ld - %ld] [%ld - %ld] red %d\n", indent, "", (long)node->start,
+ (long)node->end, (long)node->min, (long)node->max, node->red);
else
{
g_print ("%*s[ - ]\n", indent, "");

6
databases/evolution-data-server/patches/patch-camel_camel-lock_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-camel_camel-lock_c,v 1.6 2012/09/28 06:35:36 ajacoutot Exp $
$OpenBSD: patch-camel_camel-lock_c,v 1.7 2012/10/18 13:54:56 ajacoutot Exp $
On OpenBSD, time_t is an int.
XXX remove when we have a 64-bit time_t
--- camel/camel-lock.c.orig Fri Sep 28 07:55:00 2012
+++ camel/camel-lock.c Fri Sep 28 07:55:10 2012
@ -9,7 +9,7 @@ On OpenBSD, time_t is an int.
if (g_stat (lock, &st) == 0) {
time_t now = time (NULL);
- (printf ("There is an existing lock %ld seconds old\n", now - st.st_ctime));
+ (printf ("There is an existing lock %d seconds old\n", now - st.st_ctime));
+ (printf ("There is an existing lock %ld seconds old\n", (long)now - st.st_ctime));
if (st.st_ctime < now - CAMEL_LOCK_DOT_STALE) {
d (printf ("Removing it now\n"));
unlink (lock);

20
databases/evolution-data-server/patches/patch-camel_camel-search-sql-sexp_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.7 2012/09/28 06:35:36 ajacoutot Exp $
$OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.8 2012/10/18 13:54:56 ajacoutot Exp $
On OpenBSD, time_t is an int.
XXX remove when we have a 64-bit time_t
--- camel/camel-search-sql-sexp.c.orig Fri Sep 28 07:53:54 2012
+++ camel/camel-search-sql-sexp.c Fri Sep 28 07:54:44 2012
--- camel/camel-search-sql-sexp.c.orig Sun Sep 16 17:05:39 2012
+++ camel/camel-search-sql-sexp.c Thu Oct 18 14:40:10 2012
@@ -188,7 +188,7 @@ eval_eq (struct _CamelSExp *f,
if (r1->type == CAMEL_SEXP_RES_INT)
g_string_append_printf (str, "%d", r1->value.number);
else if (r1->type == CAMEL_SEXP_RES_TIME)
- g_string_append_printf (str, "%ld", r1->value.time);
+ g_string_append_printf (str, "%d", r1->value.time);
+ g_string_append_printf (str, "%lld", (long long)r1->value.time);
else if (r1->type == CAMEL_SEXP_RES_STRING)
g_string_append_printf (str, "%s", r1->value.string);
@ -18,7 +18,7 @@ On OpenBSD, time_t is an int.
g_string_append_printf (str, "%d", r2->value.boolean);
else if (r2->type == CAMEL_SEXP_RES_TIME)
- g_string_append_printf (str, "%ld", r2->value.time);
+ g_string_append_printf (str, "%d", r2->value.time);
+ g_string_append_printf (str, "%lld", (long long)r2->value.time);
else if (r2->type == CAMEL_SEXP_RES_STRING) {
gchar *tmp = g_strdup_printf ("%c%s%c", ut ? '%':' ', r2->value.string, ut ? '%':' ');
gchar *safe = get_db_safe_string (tmp);
@ -27,7 +27,7 @@ On OpenBSD, time_t is an int.
g_string_append_printf (str, "%d", r1->value.number);
else if (r1->type == CAMEL_SEXP_RES_TIME)
- g_string_append_printf (str, "%ld", r1->value.time);
+ g_string_append_printf (str, "%d", r1->value.time);
+ g_string_append_printf (str, "%lld", (long long)r1->value.time);
else if (r1->type == CAMEL_SEXP_RES_STRING)
g_string_append_printf (str, "%s", r1->value.string);
@ -36,7 +36,7 @@ On OpenBSD, time_t is an int.
g_string_append_printf (str, "%d", r2->value.boolean);
else if (r2->type == CAMEL_SEXP_RES_TIME)
- g_string_append_printf (str, "%ld", r2->value.time);
+ g_string_append_printf (str, "%d", r2->value.time);
+ g_string_append_printf (str, "%lld", (long long)r2->value.time);
else if (r2->type == CAMEL_SEXP_RES_STRING)
g_string_append_printf (str, "%s", r2->value.string);
camel_sexp_result_free (f, r1);
@ -45,7 +45,7 @@ On OpenBSD, time_t is an int.
g_string_append_printf (str, "%d", r1->value.number);
else if (r1->type == CAMEL_SEXP_RES_TIME)
- g_string_append_printf (str, "%ld", r1->value.time);
+ g_string_append_printf (str, "%d", r1->value.time);
+ g_string_append_printf (str, "%lld", (long long)r1->value.time);
else if (r1->type == CAMEL_SEXP_RES_STRING)
g_string_append_printf (str, "%s", r1->value.string);
@ -54,7 +54,7 @@ On OpenBSD, time_t is an int.
g_string_append_printf (str, "%d", r2->value.boolean);
else if (r2->type == CAMEL_SEXP_RES_TIME)
- g_string_append_printf (str, "%ld", r2->value.time);
+ g_string_append_printf (str, "%d", r2->value.time);
+ g_string_append_printf (str, "%lld", (long long)r2->value.time);
else if (r2->type == CAMEL_SEXP_RES_STRING)
g_string_append_printf (str, "%s", r2->value.string);
camel_sexp_result_free (f, r1);

6
databases/evolution-data-server/patches/patch-camel_providers_local_camel-maildir-summary_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-camel_providers_local_camel-maildir-summary_c,v 1.9 2012/09/28 06:35:36 ajacoutot Exp $
$OpenBSD: patch-camel_providers_local_camel-maildir-summary_c,v 1.10 2012/10/18 13:54:56 ajacoutot Exp $
On OpenBSD, time_t is an int.
XXX remove when we have a 64-bit time_t
--- camel/providers/local/camel-maildir-summary.c.orig Fri Sep 28 07:53:03 2012
+++ camel/providers/local/camel-maildir-summary.c Fri Sep 28 07:53:37 2012
@ -9,7 +9,7 @@ On OpenBSD, time_t is an int.
g_usleep (2 * G_USEC_PER_SEC);
}
- uid = g_strdup_printf ("%ld.%d_%u.%s", time (NULL), getpid (), nextuid, mds->priv->hostname);
+ uid = g_strdup_printf ("%d.%d_%u.%s", time (NULL), getpid (), nextuid, mds->priv->hostname);
+ uid = g_strdup_printf ("%ld.%d_%u.%s", (long)time (NULL), getpid (), nextuid, mds->priv->hostname);
name = g_strdup_printf ("%s/tmp/%s", cls->folder_path, uid);
retry++;
} while (g_stat (name, &st) == 0 && retry < 3);

18
databases/evolution-data-server/patches/patch-camel_providers_pop3_camel-pop3-folder_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-camel_providers_pop3_camel-pop3-folder_c,v 1.2 2012/09/28 06:35:36 ajacoutot Exp $
$OpenBSD: patch-camel_providers_pop3_camel-pop3-folder_c,v 1.3 2012/10/18 13:54:56 ajacoutot Exp $
On OpenBSD, time_t is an int.
XXX remove when we have a 64-bit time_t
--- camel/providers/pop3/camel-pop3-folder.c.orig Fri Sep 28 07:52:33 2012
+++ camel/providers/pop3/camel-pop3-folder.c Fri Sep 28 07:52:50 2012
@@ -1113,7 +1113,7 @@ camel_pop3_delete_old (CamelFolder *folder,
gint day_lag = time_diff / (60 * 60 * 24);
--- camel/providers/pop3/camel-pop3-folder.c.orig Sun Sep 16 17:05:39 2012
+++ camel/providers/pop3/camel-pop3-folder.c Thu Oct 18 14:20:42 2012
@@ -1114,7 +1114,7 @@ camel_pop3_delete_old (CamelFolder *folder,
d (printf (
- "%s(%d): message_time= [%ld]\n",
+ "%s(%d): message_time= [%d]\n",
__FILE__, __LINE__, message_time));
"%s(%d): message_time= [%ld]\n",
- __FILE__, __LINE__, message_time));
+ __FILE__, __LINE__, (long)message_time));
d (printf (
"%s(%d): day_lag=[%d] \t days_to_delete=[%d]\n",
__FILE__, __LINE__, day_lag, days_to_delete));

6
databases/evolution-data-server/patches/patch-tests_libedata-cal_test-cal-backend-sexp_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-tests_libedata-cal_test-cal-backend-sexp_c,v 1.2 2011/12/29 09:23:19 ajacoutot Exp $
$OpenBSD: patch-tests_libedata-cal_test-cal-backend-sexp_c,v 1.3 2012/10/18 13:54:56 ajacoutot Exp $
On OpenBSD, time_t is an int.
XXX remove when we have a 64-bit time_t
--- tests/libedata-cal/test-cal-backend-sexp.c.orig Mon Sep 19 07:03:01 2011
+++ tests/libedata-cal/test-cal-backend-sexp.c Thu Dec 29 09:09:34 2011
@ -9,7 +9,7 @@ On OpenBSD, time_t is an int.
if (generator) {
- printf ("%s: %ld - %ld\n", query, start, end);
+ printf ("%s: %d - %d\n", query, start, end);
+ printf ("%s: %ld - %ld\n", query, (long)start, (long)end);
} else {
printf ("%s: no time prunning possible\n", query);
}

6
databases/evolution-data-server/patches/patch-tests_libedata-cal_test-intervaltree_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-tests_libedata-cal_test-intervaltree_c,v 1.3 2012/09/28 06:35:36 ajacoutot Exp $
$OpenBSD: patch-tests_libedata-cal_test-intervaltree_c,v 1.4 2012/10/18 13:54:56 ajacoutot Exp $
On OpenBSD, time_t is an int.
XXX remove when we have a 64-bit time_t
--- tests/libedata-cal/test-intervaltree.c.orig Sun Sep 16 17:42:04 2012
+++ tests/libedata-cal/test-intervaltree.c Thu Sep 27 20:30:27 2012
@ -9,7 +9,7 @@ On OpenBSD, time_t is an int.
*/
- summary.value = g_strdup_printf ("%ld - %ld", start, end);
+ summary.value = g_strdup_printf ("%d - %d", start, end);
+ summary.value = g_strdup_printf ("%ld - %ld", (long)start, (long)end);
summary.altrep = NULL;
e_cal_component_set_summary (comp, &summary);