Three patches to permit compilation under Solaris with SunPro compiler:

patch-ag and patch-ah fix void functions that attempt to return the result
of calling a void function.

patch-ai conditionally includes <sys/inttypes.h> to pick up uint32_t

3 files changed, 42 insertions, 0 deletions

diff --git a/security/gnutls/patches/patch-ag b/security/gnutls/patches/patch-ag
new file mode 100644
index 00000000000..16f253e719e
--- /dev/null
+++ b/security/gnutls/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2008/10/29 11:38:09 shannonjr Exp $
+
+--- lib/mpi-libgcrypt.c.orig	2008-10-05 07:41:43.000000000 -0600
++++ lib/mpi-libgcrypt.c
+@@ -120,7 +120,7 @@ wrap_gcry_mpi_get_nbits (bigint_t a)
+ static void
+ wrap_gcry_mpi_release (bigint_t a)
+ {
+-  return gcry_mpi_release (a);
++  gcry_mpi_release (a);
+ }
+ 
+ #undef _gnutls_mpi_alloc_like
diff --git a/security/gnutls/patches/patch-ah b/security/gnutls/patches/patch-ah
new file mode 100644
index 00000000000..e182a1ccaf8
--- /dev/null
+++ b/security/gnutls/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2008/10/29 11:38:09 shannonjr Exp $
+
+--- lib/mac-libgcrypt.c.orig	2008-10-05 07:41:43.000000000 -0600
++++ lib/mac-libgcrypt.c
+@@ -93,7 +93,7 @@ wrap_gcry_md_copy (void **bhd, void *ahd
+ static void
+ wrap_gcry_md_close (void *hd)
+ {
+-  return gcry_md_close (hd);
++  gcry_md_close (hd);
+ }
+ 
+ static int
diff --git a/security/gnutls/patches/patch-ai b/security/gnutls/patches/patch-ai
new file mode 100644
index 00000000000..3b79f80aca6
--- /dev/null
+++ b/security/gnutls/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1 2008/10/29 11:38:09 shannonjr Exp $
+
+--- libextra/gl/md5.h.orig	2008-10-05 07:41:43.000000000 -0600
++++ libextra/gl/md5.h
+@@ -22,7 +22,11 @@
+ #define _MD5_H 1
+ 
+ #include <stdio.h>
++#if defined(__sun)
++#include <sys/inttypes.h>
++#else
+ #include <stdint.h>
++#endif
+ 
+ #define MD5_DIGEST_SIZE 16
+ #define MD5_BLOCK_SIZE 64