[pkgsrc/trunk]: pkgsrc/mail/wmbiff Only comment out support for GNUTLS_CERT_N...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bb0f423cb433
branches:  trunk
changeset: 489381:bb0f423cb433
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Feb 20 13:02:28 2005 +0000

description:
Only comment out support for GNUTLS_CERT_NOT_TRUSTED if the GnuTLS used
to build this package doesn't support it.

diffstat:

 mail/wmbiff/distinfo         |   4 ++--
 mail/wmbiff/patches/patch-ac |  19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diffs (43 lines):

diff -r f7259f40141f -r bb0f423cb433 mail/wmbiff/distinfo
--- a/mail/wmbiff/distinfo      Sun Feb 20 12:58:09 2005 +0000
+++ b/mail/wmbiff/distinfo      Sun Feb 20 13:02:28 2005 +0000
@@ -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 -r f7259f40141f -r bb0f423cb433 mail/wmbiff/patches/patch-ac
--- a/mail/wmbiff/patches/patch-ac      Sun Feb 20 12:58:09 2005 +0000
+++ b/mail/wmbiff/patches/patch-ac      Sun Feb 20 13:02:28 2005 +0000
@@ -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,