Make this package compile with gcc-4.

Bump PKGREVISION.

6 files changed, 34 insertions, 6 deletions

diff --git a/archivers/zziplib/Makefile b/archivers/zziplib/Makefile
index 549a19a63f5..6a5c4518a81 100644
--- a/archivers/zziplib/Makefile
+++ b/archivers/zziplib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/06/18 07:04:16 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/08/11 12:50:40 taca Exp $
 #
 
 DISTNAME=	zziplib-0.10.82
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zziplib/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/archivers/zziplib/distinfo b/archivers/zziplib/distinfo
index af3d9ac266b..e83a717b873 100644
--- a/archivers/zziplib/distinfo
+++ b/archivers/zziplib/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 14:45:28 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/08/11 12:50:40 taca Exp $
 
 SHA1 (zziplib-0.10.82.tar.bz2) = 7f9e07a200a52e38b9011acefcbed9fff0e4b6d3
 RMD160 (zziplib-0.10.82.tar.bz2) = 58be317eda7657e7e9d4a26e3070a70134d416a0
 Size (zziplib-0.10.82.tar.bz2) = 572573 bytes
+SHA1 (patch-aa) = b72e1fb94e1c91f5c3f920d0aa6e1e450bf7eace
diff --git a/archivers/zziplib/patches/patch-aa b/archivers/zziplib/patches/patch-aa
new file mode 100644
index 00000000000..248ae135681
--- /dev/null
+++ b/archivers/zziplib/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2006/08/11 12:50:40 taca Exp $
+
+--- bins/zziptest.c.orig	2002-12-18 23:06:29.000000000 +0900
++++ bins/zziptest.c
+@@ -73,7 +73,7 @@ int main(int argc, char ** argv)
+                 printf("filename: %s\n\n", hdr->d_name);
+     
+                 if (hdr->d_reclen == 0) break;
+-                (char *)hdr += hdr->d_reclen;
++                hdr = (struct zzip_dir_hdr *)((char *)hdr + hdr->d_reclen);
+                 sleep(1);
+             }
+         }
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index 9bfd730fb57..0f8b3df5936 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2006/04/19 17:58:01 tv Exp $
+# $NetBSD: Makefile,v 1.33 2006/08/11 12:51:32 taca Exp $
 
 DISTNAME=	cyrus-sasl-2.1.21
 PKGNAME=	${DISTNAME:S/sasl/saslauthd/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
diff --git a/security/cyrus-saslauthd/distinfo b/security/cyrus-saslauthd/distinfo
index 9f67ebfab8a..862a3aa1620 100644
--- a/security/cyrus-saslauthd/distinfo
+++ b/security/cyrus-saslauthd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/04/18 17:42:59 jlam Exp $
+$NetBSD: distinfo,v 1.8 2006/08/11 12:51:32 taca Exp $
 
 SHA1 (cyrus-sasl-2.1.21.tar.gz) = 6449f730c963d29d43600a95373a6e2db52d6d66
 RMD160 (cyrus-sasl-2.1.21.tar.gz) = 93e0e1868453c5781602b5cce23e746b8823a26b
@@ -10,3 +10,4 @@ SHA1 (patch-ad) = c14defd79e6e0cec153be004fff3016ad6f0e731
 SHA1 (patch-ae) = de944306bcc8609a3353bf713876e0d42c9d05f9
 SHA1 (patch-af) = 0477e862dbc10d67fb0b82862eea612c81e46e39
 SHA1 (patch-ag) = d0dbe55b9a91ed49e2e43c2ef44e141ac86a83c7
+SHA1 (patch-ah) = d4dc5858ef1b36d10fae729469262450ff2e3fef
diff --git a/security/cyrus-saslauthd/patches/patch-ah b/security/cyrus-saslauthd/patches/patch-ah
new file mode 100644
index 00000000000..cd3e3774748
--- /dev/null
+++ b/security/cyrus-saslauthd/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/08/11 12:51:32 taca Exp $
+
+--- saslcache.c.orig	2003-03-29 04:59:24.000000000 +0900
++++ saslcache.c
+@@ -137,7 +137,7 @@ int main(int argc, char **argv) {
+ 	}
+ 
+ 	table_stats = shm_base + 64;
+-	(char *)table = (char *)table_stats + 128;
++	table = (struct bucket *)((char *)table_stats + 128);
+ 
+ 	if (dump_stat_info == 0 && dump_user_info == 0)
+ 		dump_stat_info = 1;