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

Change some variables from time_t to long to prevent crashes all over...

Browse Source
This commit is contained in:
ajacoutot 2012-10-18 12:55:05 +00:00
parent fb620b5c8b
commit c15bc236f5
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/keyring/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.84 2012/10/16 06:55:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.85 2012/10/18 12:55:05 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,6 +6,7 @@ COMMENT= password agent for the GNOME project
GNOME_PROJECT= gnome-keyring
GNOME_VERSION= 3.6.1
REVISION= 0
HOMEPAGE= https://live.gnome.org/GnomeKeyring

26
x11/gnome/keyring/patches/patch-pkcs11_secret-store_gkm-secret-binary_c Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-pkcs11_secret-store_gkm-secret-binary_c,v 1.5 2012/10/18 12:55:05 ajacoutot Exp $
XXX remove when we have a 64-bit time_t
--- pkcs11/secret-store/gkm-secret-binary.c.orig Thu Oct 18 11:29:29 2012
+++ pkcs11/secret-store/gkm-secret-binary.c Thu Oct 18 11:31:15 2012
@@ -73,8 +73,8 @@ typedef struct {
char *display_name;
const guchar *ptr_secret;
gsize n_secret;
- time_t ctime;
- time_t mtime;
+ long ctime;
+ long mtime;
GHashTable *attributes;
GList *acl;
} ItemInfo;
@@ -854,7 +854,7 @@ gkm_secret_binary_read (GkmSecretCollection *collectio
guchar major, minor, crypto, hash;
guint32 flags;
guint32 lock_timeout;
- time_t mtime, ctime;
+ long mtime, ctime;
char *display_name;
guint32 tmp;
guint32 num_items;

9
x11/gnome/keyring/patches/patch-pkcs11_secret-store_tests_dump-keyring0-format_c
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-pkcs11_secret-store_tests_dump-keyring0-format_c,v 1.1 2012/03/29 06:51:38 ajacoutot Exp $
$OpenBSD: patch-pkcs11_secret-store_tests_dump-keyring0-format_c,v 1.2 2012/10/18 12:55:05 ajacoutot Exp $
On OpenBSD, time_t is an int.
https://bugzilla.gnome.org/show_bug.cgi?id=652565
XXX remove when we have a 64-bit time_t
--- pkcs11/secret-store/tests/dump-keyring0-format.c.orig Wed Mar 28 08:33:01 2012
+++ pkcs11/secret-store/tests/dump-keyring0-format.c Wed Mar 28 08:34:01 2012
@ -10,7 +9,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=652565
gchar *value;
guint32 tmp;
- time_t ctime, mtime;
+ long int ctime, mtime;
+ long ctime, mtime;
gint i, j;
g_assert (buffer);
@ -19,7 +18,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=652565
guint32 flags;
guint32 lock_timeout;
- time_t mtime, ctime;
+ long int mtime, ctime;
+ long mtime, ctime;
guint32 tmp;
guint32 num_items;
guint32 crypto_size;

4
x11/gnome/keyring/patches/patch-pkcs11_wrap-layer_tests_mock-secret-store_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-pkcs11_wrap-layer_tests_mock-secret-store_c,v 1.1 2012/03/29 06:51:38 ajacoutot Exp $
$OpenBSD: patch-pkcs11_wrap-layer_tests_mock-secret-store_c,v 1.2 2012/10/18 12:55:05 ajacoutot Exp $
OpenBSD does not have memmem().
XXX push upstream - OpenBSD does not have memmem().
--- pkcs11/wrap-layer/tests/mock-secret-store.c.orig Wed Mar 28 08:28:17 2012
+++ pkcs11/wrap-layer/tests/mock-secret-store.c Wed Mar 28 08:28:54 2012