Changes 2.1.20:

* Bug-fixes

5 files changed, 21 insertions, 19 deletions

diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index de93ea4b744..46a96518038 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/12/28 02:47:49 reed Exp $
+# $NetBSD: Makefile,v 1.23 2005/02/21 22:10:18 adam Exp $
 
-DISTNAME=	cyrus-sasl-2.1.19
+DISTNAME=	cyrus-sasl-2.1.20
 PKGNAME=	${DISTNAME:S/sasl/saslauthd/}
-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 0104793b862..4b7ba5f4725 100644
--- a/security/cyrus-saslauthd/distinfo
+++ b/security/cyrus-saslauthd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2004/12/07 09:17:35 adam Exp $
+$NetBSD: distinfo,v 1.5 2005/02/21 22:10:18 adam Exp $
 
-SHA1 (cyrus-sasl-2.1.19.tar.gz) = 9512d70ecea33b9d44e69d185a323a0f7b133705
-Size (cyrus-sasl-2.1.19.tar.gz) = 1537350 bytes
-SHA1 (patch-aa) = f3497c322d073ccb2a54e439067227f2f03a99b1
-SHA1 (patch-ab) = 864bfe7c47b445107cdc517e2fe2e5ad2b459be1
+SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6
+Size (cyrus-sasl-2.1.20.tar.gz) = 1775163 bytes
+SHA1 (patch-aa) = 1a4b8fd35e1888fcdf6eb1cef3cc6ae95c816acd
+SHA1 (patch-ab) = 8123e54b10b7094f73604c5ad055d0bfeb8fa0ac
 SHA1 (patch-ac) = 79267ad3e175632728e43fb2ba159ab411e7ff3c
-SHA1 (patch-ad) = ab0b9d948741b28fcea91f7833e06e829f459669
+SHA1 (patch-ad) = c14defd79e6e0cec153be004fff3016ad6f0e731
diff --git a/security/cyrus-saslauthd/patches/patch-aa b/security/cyrus-saslauthd/patches/patch-aa
index bc27a478cb2..23cb65463a0 100644
--- a/security/cyrus-saslauthd/patches/patch-aa
+++ b/security/cyrus-saslauthd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/03/29 05:50:26 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2005/02/21 22:10:18 adam Exp $
 
---- Makefile.am.orig	Mon Jan 12 12:33:57 2004
+--- Makefile.am.orig	2004-10-19 23:48:20.000000000 +0000
 +++ Makefile.am
-@@ -27,11 +27,8 @@ INCLUDES	= -I$(top_srcdir)/include -I$(t
+@@ -28,11 +28,8 @@ INCLUDES	= -I$(top_srcdir)/include -I$(t
  DEFS            = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
  
  
diff --git a/security/cyrus-saslauthd/patches/patch-ab b/security/cyrus-saslauthd/patches/patch-ab
index c6521ea781e..d30972be07a 100644
--- a/security/cyrus-saslauthd/patches/patch-ab
+++ b/security/cyrus-saslauthd/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/08/04 20:08:38 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2005/02/21 22:10:18 adam Exp $
 
---- Makefile.in.orig	Fri Jul  2 15:33:59 2004
+--- Makefile.in.orig	2004-10-24 20:21:14.000000000 +0000
 +++ Makefile.in
-@@ -605,14 +605,11 @@ uninstall-am: uninstall-info-am uninstal
+@@ -606,14 +606,11 @@ uninstall-am: uninstall-info-am uninstal
  	uninstall-sbinPROGRAMS
  
  
diff --git a/security/cyrus-saslauthd/patches/patch-ad b/security/cyrus-saslauthd/patches/patch-ad
index 80ea8dfb7fb..1692e7caa97 100644
--- a/security/cyrus-saslauthd/patches/patch-ad
+++ b/security/cyrus-saslauthd/patches/patch-ad
@@ -1,13 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2004/12/07 09:17:35 adam Exp $
+$NetBSD: patch-ad,v 1.2 2005/02/21 22:10:18 adam Exp $
 
---- md5.c.orig	2004-12-07 10:07:58.000000000 +0000
+--- md5.c.orig	2003-03-28 19:59:24.000000000 +0000
 +++ md5.c
-@@ -27,7 +27,7 @@ documentation and/or software.
+@@ -27,7 +27,11 @@ documentation and/or software.
  
  #include <config.h>
  #include "md5global.h"
--#include "md5.h"
++#ifdef __APPLE__
 +#include <sys/md5.h>
++#else
+ #include "md5.h"
++#endif
  #include "hmac-md5.h"
  
  #ifndef WIN32