diff options
author | tron <tron> | 2005-02-20 13:02:28 +0000 |
---|---|---|
committer | tron <tron> | 2005-02-20 13:02:28 +0000 |
commit | b3c8ad701adcdbdea1f9e75bbe7454319b26aaeb (patch) | |
tree | 2ae49982d6f88cd8588e214dc4dce102fea8ee1b /mail | |
parent | 174ba36898cb75f974be5e388bd9099536a04970 (diff) | |
download | pkgsrc-b3c8ad701adcdbdea1f9e75bbe7454319b26aaeb.tar.gz |
Only comment out support for GNUTLS_CERT_NOT_TRUSTED if the GnuTLS used
to build this package doesn't support it.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/wmbiff/distinfo | 4 | ||||
-rw-r--r-- | mail/wmbiff/patches/patch-ac | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo index d2cc1e92a3d..79fd78a1651 100644 --- a/mail/wmbiff/distinfo +++ b/mail/wmbiff/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2005/02/19 22:44:25 wiz Exp $ +$NetBSD: distinfo,v 1.10 2005/02/20 13:02:28 tron Exp $ SHA1 (wmbiff-0.4.25.tar.gz) = c5529766c55d692e2a76eaeb21d9c231da0780a8 Size (wmbiff-0.4.25.tar.gz) = 200270 bytes SHA1 (patch-aa) = 2007bd498ef54b6fc9779092bcf0771e41dec8e0 SHA1 (patch-ab) = d84f1c4333d7c192748f5170460563ae7fe0955d -SHA1 (patch-ac) = 8309757f9fad06a4cd4fb20a144916f67af90a36 +SHA1 (patch-ac) = 247a9b8ef3b229f6e8b97654cb1bb69c1253d512 diff --git a/mail/wmbiff/patches/patch-ac b/mail/wmbiff/patches/patch-ac index 8d844f49917..7bf91e68e29 100644 --- a/mail/wmbiff/patches/patch-ac +++ b/mail/wmbiff/patches/patch-ac @@ -1,15 +1,18 @@ -$NetBSD: patch-ac,v 1.3 2005/02/19 22:44:25 wiz Exp $ +$NetBSD: patch-ac,v 1.4 2005/02/20 13:02:28 tron Exp $ ---- wmbiff/tlsComm.c.orig 2004-06-23 23:44:45.000000000 +0200 -+++ wmbiff/tlsComm.c -@@ -407,10 +407,6 @@ tls_check_certificate(struct connection_ +--- wmbiff/tlsComm.c.orig 2004-06-23 22:44:45.000000000 +0100 ++++ wmbiff/tlsComm.c 2005-02-20 12:52:13.000000000 +0000 +@@ -407,11 +407,13 @@ "server's certificate is invalid or not X.509.\n" "there may be a problem with the certificate stored in your certfile\n"); } -- } else if (certstat & GNUTLS_CERT_NOT_TRUSTED) { -- TDM(DEBUG_INFO, "server's certificate is not trusted.\n"); -- TDM(DEBUG_INFO, -- "to verify that a certificate is trusted, use the certfile option.\n"); ++#ifdef GNUTLS_CERT_NOT_TRUSTED + } else if (certstat & GNUTLS_CERT_NOT_TRUSTED) { + TDM(DEBUG_INFO, "server's certificate is not trusted.\n"); + TDM(DEBUG_INFO, + "to verify that a certificate is trusted, use the certfile option.\n"); ++#endif } if (gnutls_x509_crt_init(&cert) < 0) { + bad_certificate(scs, |