From 4f785e279f0005c397de175bf3694ab078e752e6 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 9 Jul 2012 18:38:45 +0000
Subject: [PATCH] Unbreak with gnutls>=3.

---
 security/gnomint/patches/patch-src_import_c | 33 +++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 security/gnomint/patches/patch-src_import_c

diff --git a/security/gnomint/patches/patch-src_import_c b/security/gnomint/patches/patch-src_import_c
new file mode 100644
index 00000000000..adc9de08118
--- /dev/null
+++ b/security/gnomint/patches/patch-src_import_c
@@ -0,0 +1,33 @@
+$OpenBSD: patch-src_import_c,v 1.1 2012/07/09 18:38:45 ajacoutot Exp $
+
+Fix build with gnutls>=3.
+
+--- src/import.c.orig	Mon Jul  9 20:36:05 2012
++++ src/import.c	Mon Jul  9 20:35:44 2012
+@@ -695,7 +695,7 @@ gint import_pkcs12 (guchar *file_contents, gsize file_
+ 
+                 // After having all the parts unencrypted, we import all certificates first.
+                 for (i=0; i<n_bags; i++) {
+-                        gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
++                        gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
+                         guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
+                         
+                         for (i=0; i < num_elements_in_bag; i++) {
+@@ -722,7 +722,7 @@ gint import_pkcs12 (guchar *file_contents, gsize file_
+                 
+                 // Then, we import all PKCS8 private keys.
+                 for (i=0; i<n_bags; i++) {
+-                        gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
++                        gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
+                         guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
+                         
+                         for (i=0; i < num_elements_in_bag; i++) {
+@@ -796,7 +796,7 @@ gint import_pkcs12 (guchar *file_contents, gsize file_
+                 // Then we import the CRLs
+ 
+                 for (i=0; i<n_bags; i++) {
+-                        gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
++                        gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
+                         guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
+                         
+                         for (i=0; i < num_elements_in_bag; i++) {