Changes 0.4.26:

  * Don't crash if no certificate is sent by the remote side
    and -skip-certificate-check has been given.
  * Avoid duplicate error messages.
  * Disable libgcrypt secure memory warning.
  * security.debian.rb: better when disconnected.

4 files changed, 17 insertions, 19 deletions

diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index ac61704098e..36fc83f3270 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:00 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/09/06 15:49:35 adam Exp $
 
-DISTNAME=	wmbiff-0.4.25
-PKGREVISION=	1
+DISTNAME=	wmbiff-0.4.26
 CATEGORIES=	mail x11 windowmaker
 MASTER_SITES=	$(MASTER_SITE_SOURCEFORGE:=wmbiff/)
 
@@ -9,8 +8,8 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/wmbiff/
 COMMENT=	xbuffy like "mail-checker" for WindowMaker
 
-GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake
+GNU_CONFIGURE=	yes
 
 EX_DIR=		${PREFIX}/share/examples/wmbiff
 
@@ -19,7 +18,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${EX_DIR}
 
 .include "../../graphics/xpm/buildlink3.mk"
-.include "../../wm/windowmaker/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../wm/windowmaker/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo
index 5b6f5ba351f..7c2c0454365 100644
--- a/mail/wmbiff/distinfo
+++ b/mail/wmbiff/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2005/08/19 03:53:55 grant Exp $
+$NetBSD: distinfo,v 1.13 2005/09/06 15:49:35 adam Exp $
 
-SHA1 (wmbiff-0.4.25.tar.gz) = c5529766c55d692e2a76eaeb21d9c231da0780a8
-RMD160 (wmbiff-0.4.25.tar.gz) = 2cf1964a5e40b5304879bb3b8eba2c2849e3ef66
-Size (wmbiff-0.4.25.tar.gz) = 200270 bytes
-SHA1 (patch-aa) = 2007bd498ef54b6fc9779092bcf0771e41dec8e0
+SHA1 (wmbiff-0.4.26.tar.gz) = cb2fc49bc741209c22d8a50f0f164e34c4a9332d
+RMD160 (wmbiff-0.4.26.tar.gz) = f5ccb17fb6846283cb7cde7996310a65600a8883
+Size (wmbiff-0.4.26.tar.gz) = 200237 bytes
+SHA1 (patch-aa) = 0a4607f2e5d6d3066d9b9994665b659dfbcc003b
 SHA1 (patch-ab) = d84f1c4333d7c192748f5170460563ae7fe0955d
-SHA1 (patch-ac) = f388d0492feeb15dc8d63dc91510cf84b7626d25
+SHA1 (patch-ac) = d7abfc902dffdfa646957d1bc0157e1ee59dfb86
diff --git a/mail/wmbiff/patches/patch-aa b/mail/wmbiff/patches/patch-aa
index 62632481a2e..006e592265c 100644
--- a/mail/wmbiff/patches/patch-aa
+++ b/mail/wmbiff/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2003/01/31 12:57:08 tron Exp $
+$NetBSD: patch-aa,v 1.6 2005/09/06 15:49:35 adam Exp $
 
---- Makefile.in.orig	Sat Jan 25 05:31:04 2003
-+++ Makefile.in	Thu Jan 30 13:39:32 2003
-@@ -120,7 +120,7 @@
+--- Makefile.in.orig	2004-10-11 00:30:40.000000000 +0000
++++ Makefile.in
+@@ -121,7 +121,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
diff --git a/mail/wmbiff/patches/patch-ac b/mail/wmbiff/patches/patch-ac
index 613b408c2e2..9e8744af081 100644
--- a/mail/wmbiff/patches/patch-ac
+++ b/mail/wmbiff/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2005/08/19 03:53:55 grant Exp $
+$NetBSD: patch-ac,v 1.6 2005/09/06 15:49:35 adam Exp $
 
---- wmbiff/tlsComm.c.orig	2004-06-24 07:44:45.000000000 +1000
+--- wmbiff/tlsComm.c.orig	2004-10-11 00:29:47.000000000 +0000
 +++ wmbiff/tlsComm.c
-@@ -407,10 +407,12 @@ tls_check_certificate(struct connection_
+@@ -412,10 +412,12 @@ tls_check_certificate(struct connection_
  							"server's certificate is invalid or not X.509.\n"
  							"there may be a problem with the certificate stored in your certfile\n");
  		}