components/desktop/thunderbird/patches/thunderbird-04-dup-ctime-def-removal.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Wed, 05 Oct 2016 01:21:05 -0700
branchs11u3-sru
changeset 7090 49c102d793d0
permissions -rw-r--r--
24698806 Upgrade Thunderbird to version 45.3.0 24802000 problem in TBIRD/MAILER
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7090
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
In S12, ctime_r only takes 2 arguments. Fix for Solaris.
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     2
In S11, ctime_r still takes 3 arguments. We should eventually look into
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
modifying this patch with an ifdef for SOLARIS_11 since this will not work
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
on S11. 
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
This should be investigated for sending upstream.
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
--- a/ldap/c-sdk/libraries/libldap/tmplout.c.orig	2015-04-15 14:18:18.428844179 +0530
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
+++ b/ldap/c-sdk/libraries/libldap/tmplout.c	2015-04-15 14:20:02.153860191 +0530
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
@@ -48,11 +48,6 @@
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
 #endif
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
 
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
 
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
-/* This is totally lame, since it should be coming from time.h, but isn't. */
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
-#if defined(SOLARIS) 
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
-char *ctime_r(const time_t *, char *, int);
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
-#endif
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
-
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
 static int do_entry2text( LDAP *ld, char *buf, char *base, LDAPMessage *entry,
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
 	struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals,
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    20
 	writeptype writeproc, void *writeparm, char *eol, int rdncount,
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    21
@@ -962,7 +957,7 @@ time2text( char *ldtimestr, int dateonly
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    22
     }
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    23
 
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    24
     gmttime = gtime( &t );
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    25
-    timestr = NSLDAPI_CTIME( &gmttime, buf, sizeof(buf) );
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    26
+    timestr = ctime_r( &gmttime, buf);
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    27
 
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    28
     timestr[ strlen( timestr ) - 1 ] = zone;	/* replace trailing newline */
49c102d793d0 24698806 Upgrade Thunderbird to version 45.3.0
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    29
     if ( dateonly ) {