Provide uint*_t datatypes for UINT* typedefs by including either

<stdint.h> or <inttypes.h>.  Fix suggested by the analysis in pkg
PR 22031.

6 files changed, 74 insertions, 28 deletions

diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index 8c9e229b6ae..0af5526ead7 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.12 2004/01/09 19:37:48 jlam Exp $
+$NetBSD: distinfo,v 1.13 2004/01/09 20:29:47 jlam Exp $
 
 SHA1 (cyrus-sasl-2.1.15.tar.gz) = 747101ffec482ca566f00a9d34124ec8e79f6589
 Size (cyrus-sasl-2.1.15.tar.gz) = 1390131 bytes
 SHA1 (patch-aa) = f5a772976839388078a26f287844ba35bdf1a3b7
 SHA1 (patch-ab) = 711dd3d73da611bb5679bc8415e96517bf239778
-SHA1 (patch-ad) = 808255d61cb9340fc500a12f74a91d9c8dceda4c
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
-SHA1 (patch-af) = eed25b6db859720bb35f4ef5623b85a3a95e359e
+SHA1 (patch-af) = 305feccbe1d8545480f01b2797f9fd542fa951c7
 SHA1 (patch-ah) = 50ff4e8ec0f4232bd8c2121b105d4818b978b950
 SHA1 (patch-ai) = 743dddbd54ac19266fd66ef0c5a3e87ba7437ee9
 SHA1 (patch-aj) = e841641a92dacd0f38fc0f86391b54b394e5a54c
 SHA1 (patch-al) = 286b1c6c9980525f5ad8e1507dc3fe9708e755ca
+SHA1 (patch-am) = f0bd15b4f55e5204936a25c558d4bd2b1d4816d5
+SHA1 (patch-an) = 65a0ec173ea1f0114318ffb922cad4470e1cd7e9
+SHA1 (patch-ao) = bb10eb052278c817603dd18128e711a9fedce840
 SHA1 (patch-as) = c8d35da93afe8be5e535b88681b23b169e813c02
diff --git a/security/cyrus-sasl2/patches/patch-ad b/security/cyrus-sasl2/patches/patch-ad
deleted file mode 100644
index a7103e40963..00000000000
--- a/security/cyrus-sasl2/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/08/16 09:06:42 recht Exp $
-
---- include/hmac-md5.h.orig	2003-05-13 23:34:28.000000000 +0200
-+++ include/hmac-md5.h	2003-07-26 12:24:25.000000000 +0200
-@@ -15,8 +15,8 @@
-  *  values stored in network byte order (Big Endian)
-  */
- typedef struct HMAC_MD5_STATE_s {
--    UINT4 istate[4];
--    UINT4 ostate[4];
-+    uint32_t istate[4];
-+    uint32_t ostate[4];
- } HMAC_MD5_STATE;
- 
- #ifdef __cplusplus
diff --git a/security/cyrus-sasl2/patches/patch-af b/security/cyrus-sasl2/patches/patch-af
index cc2f48c884b..5a5f83624a4 100644
--- a/security/cyrus-sasl2/patches/patch-af
+++ b/security/cyrus-sasl2/patches/patch-af
@@ -1,16 +1,7 @@
-$NetBSD: patch-af,v 1.3 2003/10/06 16:31:07 christos Exp $
+$NetBSD: patch-af,v 1.4 2004/01/09 20:29:47 jlam Exp $
 
 --- plugins/cram.c.orig	2003-02-18 13:27:37.000000000 -0500
 +++ plugins/cram.c	2003-10-06 12:09:33.000000000 -0400
-@@ -230,7 +230,7 @@
-     HMAC_MD5_STATE md5state;
-     int clear_md5state = 0;
-     char *digest_str = NULL;
--    UINT4 digest[4];
-+    uint32_t digest[4];
-     
-     /* extract userid; everything before last space */
-     pos = clientinlen-1;
 @@ -544,7 +544,8 @@
  	
  	if ((auth_result != SASL_OK) && (auth_result != SASL_INTERACT))
diff --git a/security/cyrus-sasl2/patches/patch-am b/security/cyrus-sasl2/patches/patch-am
new file mode 100644
index 00000000000..2902b04b968
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-am
@@ -0,0 +1,38 @@
+$NetBSD: patch-am,v 1.1 2004/01/09 20:29:47 jlam Exp $
+
+--- include/md5global.h.orig	Tue Jul 15 11:43:46 2003
++++ include/md5global.h
+@@ -3,6 +3,13 @@
+ #ifndef MD5GLOBAL_H
+ #define MD5GLOBAL_H
+ 
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
+ /* PROTOTYPES should be set to one if and only if the compiler supports
+   function argument prototyping.
+ The following makes PROTOTYPES default to 0 if it has not already
+@@ -15,13 +22,13 @@ The following makes PROTOTYPES default t
+ /* POINTER defines a generic pointer type */
+ typedef unsigned char *POINTER;
+ 
+-typedef signed char INT1;		/*  8 bits */
+-typedef short INT2;			/* 16 bits */
+-typedef int INT4;			/* 32 bits */
++typedef int8_t INT1;		/*  8 bits */
++typedef int16_t INT2;		/* 16 bits */
++typedef int32_t INT4;		/* 32 bits */
+ /* There is no 64 bit type */
+-typedef unsigned char UINT1;		/*  8 bits */
+-typedef unsigned short UINT2;		/* 16 bits */
+-typedef unsigned int UINT4;		/* 32 bits */
++typedef uint8_t UINT1;		/*  8 bits */
++typedef uint16_t UINT2;		/* 16 bits */
++typedef uint32_t UINT4;		/* 32 bits */
+ /* There is no 64 bit type */
+ 
+ /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
diff --git a/security/cyrus-sasl2/patches/patch-an b/security/cyrus-sasl2/patches/patch-an
new file mode 100644
index 00000000000..744c79980b0
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-an
@@ -0,0 +1,15 @@
+$NetBSD: patch-an,v 1.1 2004/01/09 20:29:47 jlam Exp $
+
+--- include/Makefile.am.orig	Thu Feb 13 12:11:00 2003
++++ include/Makefile.am
+@@ -51,10 +51,6 @@ noinst_PROGRAMS = makemd5
+ 
+ makemd5_SOURCES = makemd5.c
+ 
+-md5global.h: makemd5
+-	-rm -f md5global.h
+-	./makemd5 md5global.h
+-
+ if MACOSX
+ framedir = /Library/Frameworks/SASL2.framework
+ frameheaderdir = $(framedir)/Versions/A/Headers
diff --git a/security/cyrus-sasl2/patches/patch-ao b/security/cyrus-sasl2/patches/patch-ao
new file mode 100644
index 00000000000..c86510bb166
--- /dev/null
+++ b/security/cyrus-sasl2/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2004/01/09 20:29:47 jlam Exp $
+
+--- include/Makefile.in.orig	Fri Jan  9 15:20:07 2004
++++ include/Makefile.in
+@@ -453,10 +453,6 @@ distclean-generic clean-generic maintain
+ mostlyclean distclean maintainer-clean
+ 
+ 
+-md5global.h: makemd5
+-	-rm -f md5global.h
+-	./makemd5 md5global.h
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: