|
18290
|
1 |
diff -ruN gnome-keyring-2.31.4.orig/egg/egg-asn1.c gnome-keyring-2.31.4/egg/egg-asn1.c
|
|
|
2 |
--- gnome-keyring-2.31.4.orig/egg/egg-asn1.c 2010-07-26 12:13:40.278228000 +0100
|
|
|
3 |
+++ gnome-keyring-2.31.4/egg/egg-asn1.c 2010-07-26 12:14:07.789561900 +0100
|
|
|
4 |
@@ -440,36 +440,6 @@
|
|
|
5 |
return century + year;
|
|
|
6 |
}
|
|
|
7 |
|
|
|
8 |
-#ifndef HAVE_TIMEGM
|
|
|
9 |
-time_t timegm(struct tm *t)
|
|
|
10 |
-{
|
|
|
11 |
- time_t tl, tb;
|
|
|
12 |
- struct tm *tg;
|
|
|
13 |
-
|
|
|
14 |
- tl = mktime (t);
|
|
|
15 |
- if (tl == -1)
|
|
|
16 |
- {
|
|
|
17 |
- t->tm_hour--;
|
|
|
18 |
- tl = mktime (t);
|
|
|
19 |
- if (tl == -1)
|
|
|
20 |
- return -1; /* can't deal with output from strptime */
|
|
|
21 |
- tl += 3600;
|
|
|
22 |
- }
|
|
|
23 |
- tg = gmtime (&tl);
|
|
|
24 |
- tg->tm_isdst = 0;
|
|
|
25 |
- tb = mktime (tg);
|
|
|
26 |
- if (tb == -1)
|
|
|
27 |
- {
|
|
|
28 |
- tg->tm_hour--;
|
|
|
29 |
- tb = mktime (tg);
|
|
|
30 |
- if (tb == -1)
|
|
|
31 |
- return -1; /* can't deal with output from gmtime */
|
|
|
32 |
- tb += 3600;
|
|
|
33 |
- }
|
|
|
34 |
- return (tl - (tb - tl));
|
|
|
35 |
-}
|
|
|
36 |
-#endif //NOT_HAVE_TIMEGM
|
|
|
37 |
-
|
|
|
38 |
static gboolean
|
|
|
39 |
parse_utc_time (const gchar *time, gsize n_time,
|
|
|
40 |
struct tm* when, gint *offset)
|