[pkgsrc/trunk]: pkgsrc/security/pgp2 Always use "unsigned int" for a 32 bit u...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0df2a7b00236
branches:  trunk
changeset: 519056:0df2a7b00236
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Sep 28 16:21:46 2006 +0000

description:
Always use "unsigned int" for a 32 bit unsigned integer which is correct
on all platforms supported by pkgsrc.

This should fix LP64 problems reported in PR pkg/19765 by John Heasley.

diffstat:

 security/pgp2/Makefile         |   3 ++-
 security/pgp2/distinfo         |   5 +++--
 security/pgp2/patches/patch-af |  18 ++++++++++++++----
 security/pgp2/patches/patch-ah |  16 ++++++++++++++++
 4 files changed, 35 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r f9fed2c02208 -r 0df2a7b00236 security/pgp2/Makefile
--- a/security/pgp2/Makefile    Thu Sep 28 10:12:45 2006 +0000
+++ b/security/pgp2/Makefile    Thu Sep 28 16:21:46 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2006/03/04 21:30:37 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/09/28 16:21:46 tron Exp $
 
 DISTNAME=      pgp263is
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
                ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
diff -r f9fed2c02208 -r 0df2a7b00236 security/pgp2/distinfo
--- a/security/pgp2/distinfo    Thu Sep 28 10:12:45 2006 +0000
+++ b/security/pgp2/distinfo    Thu Sep 28 16:21:46 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/12/08 17:36:56 joerg Exp $
+$NetBSD: distinfo,v 1.6 2006/09/28 16:21:46 tron Exp $
 
 SHA1 (pgp263is.tar.gz) = 031e061ba1d62d7db35f1f854c489867e88f421d
 RMD160 (pgp263is.tar.gz) = b1cba2be918cecc8b9062272d43626c8876fa7f4
@@ -8,5 +8,6 @@
 SHA1 (patch-ac) = 32e69f1335c3aa7b974dc7fa4100d1f9ebf358ec
 SHA1 (patch-ad) = 93f72f3e4f91f478429da8fda4671e171eb167ac
 SHA1 (patch-ae) = 307dddd61ef0ee3257a11822fc7bd423c5fd784f
-SHA1 (patch-af) = 33802b9f8d875293ea8e5e58a1e1eafd8cde7afe
+SHA1 (patch-af) = 6f58d2b26a16886947f2e5681a672a7cf9979f42
 SHA1 (patch-ag) = 377b17bc3783737c492708de57d6f4259e358a66
+SHA1 (patch-ah) = 15fe0597566ad8bf3123a54d3697e104e85ee425
diff -r f9fed2c02208 -r 0df2a7b00236 security/pgp2/patches/patch-af
--- a/security/pgp2/patches/patch-af    Thu Sep 28 10:12:45 2006 +0000
+++ b/security/pgp2/patches/patch-af    Thu Sep 28 16:21:46 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2005/12/01 20:19:57 wiz Exp $
+$NetBSD: patch-af,v 1.2 2006/09/28 16:21:46 tron Exp $
 
---- usuals.h.orig      1995-09-15 14:18:52.000000000 +0200
-+++ usuals.h
-@@ -3,6 +3,13 @@
+--- usuals.h.orig      1995-09-15 13:18:52.000000000 +0100
++++ usuals.h   2006-09-28 17:16:56.000000000 +0100
+@@ -3,16 +3,19 @@
  #ifndef USUALS /* Assures no redefinitions of usual types...*/
  #define USUALS
  
@@ -16,3 +16,13 @@
  typedef unsigned char boolean;        /* values are TRUE or FALSE */
  typedef unsigned char byte;   /* values are 0-255 */
  typedef byte *byteptr;        /* pointer to byte */
+ typedef char *string; /* pointer to ASCII character string */
+ typedef unsigned short word16;        /* values are 0-65535 */
+-#ifdef __alpha
+ typedef unsigned int word32;  /* values are 0-4294967295 */
+-#else
+-typedef unsigned long word32; /* values are 0-4294967295 */
+-#endif
+ 
+ #ifndef TRUE
+ #define FALSE 0
diff -r f9fed2c02208 -r 0df2a7b00236 security/pgp2/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pgp2/patches/patch-ah    Thu Sep 28 16:21:46 2006 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 2006/09/28 16:21:46 tron Exp $
+
+--- md5.h.orig 1994-08-01 16:12:18.000000000 +0100
++++ md5.h      2006-09-28 17:16:02.000000000 +0100
+@@ -1,11 +1,7 @@
+ #ifndef MD5_H
+ #define MD5_H
+ 
+-#ifdef __alpha
+ typedef unsigned int uint32;
+-#else
+-typedef unsigned long uint32;
+-#endif
+ 
+ struct MD5Context {
+       uint32 buf[4];