Update to mhash-0.9.9.9.

Add descriptive headers to all the patches.

19 files changed, 182 insertions, 109 deletions

diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 72ee0ab8ccaf..cfd7452c4a8c 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mhash
-PORTVERSION=	0.9.9
+PORTVERSION=	0.9.9.9
 CATEGORIES=	security
 MASTER_SITES=	SF
 
diff --git a/security/mhash/distinfo b/security/mhash/distinfo
index cbefe17ba4f1..a010ba8d838b 100644
--- a/security/mhash/distinfo
+++ b/security/mhash/distinfo
@@ -1,3 +1,3 @@
-MD5 (mhash-0.9.9.tar.bz2) = d113a853e0ac21c49c5a1acea0daaade
-SHA256 (mhash-0.9.9.tar.bz2) = 3b14491ba06f6ae8d7755314eb1c82596c422743c5adb5ef65f358313370dc9e
-SIZE (mhash-0.9.9.tar.bz2) = 634563
+MD5 (mhash-0.9.9.9.tar.bz2) = f91c74f9ccab2b574a98be5bc31eb280
+SHA256 (mhash-0.9.9.9.tar.bz2) = 56521c52a9033779154432d0ae47ad7198914785265e1f570cee21ab248dfef0
+SIZE (mhash-0.9.9.9.tar.bz2) = 655906
diff --git a/security/mhash/files/patch-doc-Makefile.in b/security/mhash/files/patch-doc-Makefile.in
index c17fb02d5917..350133993f68 100644
--- a/security/mhash/files/patch-doc-Makefile.in
+++ b/security/mhash/files/patch-doc-Makefile.in
@@ -1,6 +1,12 @@
---- doc/Makefile.in.orig	Fri Apr 22 11:43:32 2005
-+++ doc/Makefile.in	Fri Apr 22 11:44:46 2005
-@@ -391,13 +391,13 @@
+Description: Fix the GNU-isms in Makefile.in.
+ This is a BSD-specific patch, the upstream source works fine with GNU make.
+Author: Vasil Dimov <vd@datamax.bg>
+Forwarded: not-needed
+Last-Update: 2009-09-10
+
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
+@@ -394,13 +394,13 @@
  mhash-doc: $(dist_targets)
  
  $(srcdir)/mhash.html: $(srcdir)/mhash.pod
diff --git a/security/mhash/files/patch-include-mutils-mincludes.h b/security/mhash/files/patch-include-mutils-mincludes.h
index 74158934e01d..77fe75a281d3 100644
--- a/security/mhash/files/patch-include-mutils-mincludes.h
+++ b/security/mhash/files/patch-include-mutils-mincludes.h
@@ -1,7 +1,11 @@
-diff -urN -x .svn ../../branches/mhash-dist/include/mutils/mincludes.h ./include/mutils/mincludes.h
---- ../../branches/mhash-dist/include/mutils/mincludes.h	2008-01-16 02:34:17.000000000 +0200
-+++ ./include/mutils/mincludes.h	2008-01-16 02:35:49.000000000 +0200
-@@ -100,20 +100,28 @@
+Description: Define the min and max INT constants as needed.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- include/mutils/mincludes.h.orig
++++ include/mutils/mincludes.h
+@@ -102,20 +102,28 @@
  #include <stdint.h>
  #endif
  
diff --git a/security/mhash/files/patch-include-mutils-mutils.h b/security/mhash/files/patch-include-mutils-mutils.h
index a5418c03fd80..914483a81334 100644
--- a/security/mhash/files/patch-include-mutils-mutils.h
+++ b/security/mhash/files/patch-include-mutils-mutils.h
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/mhash-dist/include/mutils/mutils.h ./include/mutils/mutils.h
---- ../../branches/mhash-dist/include/mutils/mutils.h	2008-01-16 02:34:17.000000000 +0200
-+++ ./include/mutils/mutils.h	2008-01-16 02:42:32.000000000 +0200
+Description: Protect some macro parameters with parentheses.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- include/mutils/mutils.h.orig
++++ include/mutils/mutils.h
 @@ -103,22 +103,22 @@
  #endif
  
diff --git a/security/mhash/files/patch-lib-gosthash.c b/security/mhash/files/patch-lib-gosthash.c
index adf09daa4e25..97d8c66e6736 100644
--- a/security/mhash/files/patch-lib-gosthash.c
+++ b/security/mhash/files/patch-lib-gosthash.c
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/vendor/mhash/lib/gosthash.c ./lib/gosthash.c
---- ../../branches/vendor/mhash/lib/gosthash.c	2008-01-16 14:26:51.000000000 +0200
-+++ ./lib/gosthash.c	2008-01-16 15:12:01.000000000 +0200
+Description: Protect some macro parameters with parentheses.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- lib/gosthash.c.orig
++++ lib/gosthash.c
 @@ -273,22 +273,22 @@
   */
  
diff --git a/security/mhash/files/patch-lib-keygen_mcrypt.c b/security/mhash/files/patch-lib-keygen_mcrypt.c
index b5d5364d5000..3657b8ae5274 100644
--- a/security/mhash/files/patch-lib-keygen_mcrypt.c
+++ b/security/mhash/files/patch-lib-keygen_mcrypt.c
@@ -1,6 +1,11 @@
-diff -urN -x .svn ../../branches/vendor/mhash/lib/keygen_mcrypt.c ./lib/keygen_mcrypt.c
---- ../../branches/vendor/mhash/lib/keygen_mcrypt.c	2008-01-16 14:34:18.000000000 +0200
-+++ ./lib/keygen_mcrypt.c	2008-01-16 15:26:44.000000000 +0200
+Description: Fix two minor memory leaks.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+
+--- lib/keygen_mcrypt.c.orig
++++ lib/keygen_mcrypt.c
 @@ -52,8 +52,10 @@
  	
  	while (1) {
diff --git a/security/mhash/files/patch-lib-md5.c b/security/mhash/files/patch-lib-md5.c
index 486b4c2bf046..7e87e7f1ef5b 100644
--- a/security/mhash/files/patch-lib-md5.c
+++ b/security/mhash/files/patch-lib-md5.c
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/vendor/mhash/lib/md5.c ./lib/md5.c
---- ../../branches/vendor/mhash/lib/md5.c	2008-01-16 14:26:51.000000000 +0200
-+++ ./lib/md5.c	2008-01-16 15:11:08.000000000 +0200
+Description: Protect some macro parameters with parentheses.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- lib/md5.c.orig
++++ lib/md5.c
 @@ -140,14 +140,14 @@
  /* The four core functions - F1 is optimized somewhat */
  
diff --git a/security/mhash/files/patch-lib-mhash.c b/security/mhash/files/patch-lib-mhash.c
index 259133ef6688..e6758c85e4cd 100644
--- a/security/mhash/files/patch-lib-mhash.c
+++ b/security/mhash/files/patch-lib-mhash.c
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/vendor/mhash/lib/mhash.c ./lib/mhash.c
---- ../../branches/vendor/mhash/lib/mhash.c	2008-01-16 14:26:51.000000000 +0200
-+++ ./lib/mhash.c	2008-01-16 15:22:29.000000000 +0200
+Description: Fix a bug in checking a memory allocation's result.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- lib/mhash.c.orig
++++ lib/mhash.c
 @@ -299,7 +299,7 @@
  	{
  		ret->hmac_key = (mutils_word8 *) mutils_malloc(ret->hmac_key_size);
diff --git a/security/mhash/files/patch-lib-mhash_sha1.c b/security/mhash/files/patch-lib-mhash_sha1.c
index f53a8e0b2402..3b73ff295375 100644
--- a/security/mhash/files/patch-lib-mhash_sha1.c
+++ b/security/mhash/files/patch-lib-mhash_sha1.c
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/vendor/mhash/lib/mhash_sha1.h ./lib/mhash_sha1.h
---- ../../branches/vendor/mhash/lib/mhash_sha1.h	2008-01-16 14:26:51.000000000 +0200
-+++ ./lib/mhash_sha1.h	2008-01-16 15:01:05.000000000 +0200
+Description: Protect some macro parameters with parentheses.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- lib/mhash_sha1.h.orig
++++ lib/mhash_sha1.h
 @@ -39,9 +39,9 @@
  #endif
  
diff --git a/security/mhash/files/patch-lib-ripemd.c b/security/mhash/files/patch-lib-ripemd.c
index 77d52ca6ec52..48c2ba4e4331 100644
--- a/security/mhash/files/patch-lib-ripemd.c
+++ b/security/mhash/files/patch-lib-ripemd.c
@@ -1,17 +1,21 @@
-diff -urN -x .svn ../../branches/vendor/mhash/lib/ripemd.c ./lib/ripemd.c
---- ../../branches/vendor/mhash/lib/ripemd.c	2008-01-16 14:26:51.000000000 +0200
-+++ ./lib/ripemd.c	2008-01-16 15:02:04.000000000 +0200
+Description: Protect some macro parameters with parentheses.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- lib/ripemd.c.orig
++++ lib/ripemd.c
 @@ -55,13 +55,13 @@
  /* 32-bit rotate left - kludged with shifts */
  #define ROTL(n,X)  (((X)<<(n))|((X)>>(32-(n))))
  
 -#define f0(x,y,z)  (x^y^z)
 +#define f0(x,y,z)  ((x)^(y)^(z))
- //#define f16(x,y,z) ((x&y)|(~(x) & z))
+ /* #define f16(x,y,z) ((x&y)|(~(x) & z)) */
  #define f16(x,y,z) ((z)^((x)&((y)^(z))))
 -#define f32(x,y,z) ((x|~(y))^z)
 +#define f32(x,y,z) (((x)|~(y))^(z))
- //#define f48(x,y,z) ((x&z)|(y&~(z)))
+ /* #define f48(x,y,z) ((x&z)|(y&~(z))) */
  #define f48(x,y,z) ((y)^((z)&((x)^(y))))
 -#define f64(x,y,z) (x^(y|(~z)))
 +#define f64(x,y,z) ((x)^((y)|(~(z))))
diff --git a/security/mhash/files/patch-lib-sha1.c b/security/mhash/files/patch-lib-sha1.c
index 67f59526bddc..637d7a93fac9 100644
--- a/security/mhash/files/patch-lib-sha1.c
+++ b/security/mhash/files/patch-lib-sha1.c
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/vendor/mhash/lib/sha1.c ./lib/sha1.c
---- ../../branches/vendor/mhash/lib/sha1.c	2008-01-16 14:26:51.000000000 +0200
-+++ ./lib/sha1.c	2008-01-16 15:00:01.000000000 +0200
+Description: Protect some macro parameters with parentheses.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- lib/sha1.c.orig
++++ lib/sha1.c
 @@ -59,10 +59,10 @@
     save one boolean operation each - thanks to Rich Schroeppel,
     rcs@cs.arizona.edu for discovering this */
diff --git a/security/mhash/files/patch-lib-sha512_sha384.c b/security/mhash/files/patch-lib-sha512_sha384.c
index 4494ea91a151..f020dbbafa08 100644
--- a/security/mhash/files/patch-lib-sha512_sha384.c
+++ b/security/mhash/files/patch-lib-sha512_sha384.c
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/vendor/mhash/lib/sha512_sha384.c ./lib/sha512_sha384.c
---- ../../branches/vendor/mhash/lib/sha512_sha384.c	2008-01-16 14:26:52.000000000 +0200
-+++ ./lib/sha512_sha384.c	2008-01-16 14:57:58.000000000 +0200
+Description: Protect some macro parameters with parentheses.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- lib/sha512_sha384.c.orig
++++ lib/sha512_sha384.c
 @@ -129,13 +129,13 @@
  #endif
  
diff --git a/security/mhash/files/patch-lib-stdfns.c b/security/mhash/files/patch-lib-stdfns.c
index 427cb33c1403..b7c393aa77fb 100644
--- a/security/mhash/files/patch-lib-stdfns.c
+++ b/security/mhash/files/patch-lib-stdfns.c
@@ -1,54 +1,58 @@
-diff -urN -x .svn ../../branches/mhash-dist/lib/stdfns.c ./lib/stdfns.c
---- ../../branches/mhash-dist/lib/stdfns.c	2008-01-16 02:34:17.000000000 +0200
-+++ ./lib/stdfns.c	2008-01-16 02:35:49.000000000 +0200
-@@ -332,11 +332,11 @@
- 		{

- 			return(0);

- 		}

--		return(-MAXINT);

-+		return(-INT_MAX);

- 	}

- 	if (s2 == NULL)

- 	{

--		return(MAXINT);

-+		return(INT_MAX);

- 	}

- 

- 	return(memcmp(s1, s2, n));

-@@ -463,11 +463,11 @@
- 		{

- 			return(0);

- 		}

--		return(-MAXINT);

-+		return(-INT_MAX);

- 	}

- 	if (src2 == NULL)

- 	{

--		return(MAXINT);

-+		return(INT_MAX);

- 	}

- 	return(strcmp((char *) src1, (char *) src2));

- }

-@@ -486,11 +486,11 @@
- 		{

- 			return(0);

- 		}

--		return(-MAXINT);

-+		return(-INT_MAX);

- 	}

- 	if (src2 == NULL)

- 	{

--		return(MAXINT);

-+		return(INT_MAX);

- 	}

- 	return(strncmp((char *) src1, (char *) src2, n));

- }

-@@ -524,6 +524,8 @@
- 	mutils_word8 *ptrOut = buffer;

- 	mutils_word32 loop;

- 

-+	if (buffer == NULL)

-+		return(NULL);

- 	for (loop = 0; loop < len; loop++, ptrIn++)

- 	{

- 		*ptrOut++ = mutils_val2char((*ptrIn & 0xf0) >> 4);

+Description: Check a memory allocation and use the POSIX INT_* constants.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- lib/stdfns.c.orig
++++ lib/stdfns.c
+@@ -360,11 +360,11 @@
+ 		{
+ 			return(0);
+ 		}
+-		return(-MAXINT);
++		return(-INT_MAX);
+ 	}
+ 	if (s2 == NULL)
+ 	{
+-		return(MAXINT);
++		return(INT_MAX);
+ 	}
+ 
+ 	return(memcmp(s1, s2, n));
+@@ -491,11 +491,11 @@
+ 		{
+ 			return(0);
+ 		}
+-		return(-MAXINT);
++		return(-INT_MAX);
+ 	}
+ 	if (src2 == NULL)
+ 	{
+-		return(MAXINT);
++		return(INT_MAX);
+ 	}
+ 	return(strcmp((char *) src1, (char *) src2));
+ }
+@@ -514,11 +514,11 @@
+ 		{
+ 			return(0);
+ 		}
+-		return(-MAXINT);
++		return(-INT_MAX);
+ 	}
+ 	if (src2 == NULL)
+ 	{
+-		return(MAXINT);
++		return(INT_MAX);
+ 	}
+ 	return(strncmp((char *) src1, (char *) src2, n));
+ }
+@@ -552,6 +552,8 @@
+ 	mutils_word8 *ptrOut = buffer;
+ 	mutils_word32 loop;
+ 
++ 	if (buffer == NULL)
++ 		return(NULL);
+ 	for (loop = 0; loop < len; loop++, ptrIn++)
+ 	{
+ 		*ptrOut++ = mutils_val2char((*ptrIn & 0xf0) >> 4);
diff --git a/security/mhash/files/patch-lib-tiger.c b/security/mhash/files/patch-lib-tiger.c
index 6282660d5958..1d7044f0e74a 100644
--- a/security/mhash/files/patch-lib-tiger.c
+++ b/security/mhash/files/patch-lib-tiger.c
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/vendor/mhash/lib/tiger.c ./lib/tiger.c
---- ../../branches/vendor/mhash/lib/tiger.c	2008-01-16 14:26:51.000000000 +0200
-+++ ./lib/tiger.c	2008-01-16 15:08:55.000000000 +0200
+Description: Protect some macro parameters with parentheses.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- lib/tiger.c.orig
++++ lib/tiger.c
 @@ -62,26 +62,26 @@
  #ifdef OPTIMIZE_FOR_ALPHA
  /* This is the official definition of round */
diff --git a/security/mhash/files/patch-lib-whirlpool.c b/security/mhash/files/patch-lib-whirlpool.c
index 9d5c5f566ab0..b4995a224644 100644
--- a/security/mhash/files/patch-lib-whirlpool.c
+++ b/security/mhash/files/patch-lib-whirlpool.c
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/vendor/mhash/lib/whirlpool.c ./lib/whirlpool.c
---- ../../branches/vendor/mhash/lib/whirlpool.c	2008-01-16 14:26:51.000000000 +0200
-+++ ./lib/whirlpool.c	2008-01-16 15:13:06.000000000 +0200
+Description: Protect some macro parameters with parentheses.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- lib/whirlpool.c.orig
++++ lib/whirlpool.c
 @@ -883,10 +883,10 @@
   * Increment the block counter by step
   */
diff --git a/security/mhash/files/patch-libtool b/security/mhash/files/patch-libtool
index b108314b19fc..c5dd17e00332 100644
--- a/security/mhash/files/patch-libtool
+++ b/security/mhash/files/patch-libtool
@@ -1,6 +1,12 @@
---- ltmain.sh.orig	Tue May 21 20:44:59 2002
-+++ ltmain.sh	Tue May 21 20:45:32 2002
-@@ -4247,10 +4247,12 @@
+Description: Do not install the useless .la file.
+ This is a FreeBSD-specific patch, upstream doesn't really need it.
+Author: Ying-Chieh Liao <ijliao@FreeBSD.org>
+Forwarded: not-needed
+Last-Update: 2009-09-10
+
+--- ltmain.sh.orig
++++ ltmain.sh
+@@ -6003,10 +6003,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/security/mhash/files/patch-src-hmac_test.c b/security/mhash/files/patch-src-hmac_test.c
index 4625f3a6a607..ed75c1bc8832 100644
--- a/security/mhash/files/patch-src-hmac_test.c
+++ b/security/mhash/files/patch-src-hmac_test.c
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/vendor/mhash/src/hmac_test.c ./src/hmac_test.c
---- ../../branches/vendor/mhash/src/hmac_test.c	2008-01-16 14:34:18.000000000 +0200
-+++ ./src/hmac_test.c	2008-01-16 15:33:23.000000000 +0200
+Description: Add some failure checks and fix a couple of memory leaks.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- src/hmac_test.c.orig
++++ src/hmac_test.c
 @@ -45,10 +45,23 @@
  
  	passlen=sizeof(KEY1) - 1;
diff --git a/security/mhash/files/patch-src-keygen_test.c b/security/mhash/files/patch-src-keygen_test.c
index 1797737003e8..1831f291c606 100644
--- a/security/mhash/files/patch-src-keygen_test.c
+++ b/security/mhash/files/patch-src-keygen_test.c
@@ -1,6 +1,10 @@
-diff -urN -x .svn ../../branches/vendor/mhash/src/keygen_test.c ./src/keygen_test.c
---- ../../branches/vendor/mhash/src/keygen_test.c	2008-01-16 14:34:18.000000000 +0200
-+++ ./src/keygen_test.c	2008-01-16 15:36:24.000000000 +0200
+Description: Add some more failure checks and fix some memory leaks.
+Author: Peter Pentchev <roam@FreeBSD.org>
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
+Last-Update: 2009-09-10
+
+--- src/keygen_test.c.orig
++++ src/keygen_test.c
 @@ -43,6 +43,12 @@
  
  	passlen=sizeof(PASSWORD1);