summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorjoerg <joerg>2013-01-17 15:55:31 +0000
committerjoerg <joerg>2013-01-17 15:55:31 +0000
commit0691769157c8f84a608ccc99b93eb8809ea641cc (patch)
treed7165ed0ca7c8fe109c29fb3026b029ec5a03835 /mail
parente34dd26bddd84723a9db32b9c65c4bba53fe323d (diff)
downloadpkgsrc-0691769157c8f84a608ccc99b93eb8809ea641cc.tar.gz
Add missing return value.
Diffstat (limited to 'mail')
-rw-r--r--mail/wmbiff/distinfo4
-rw-r--r--mail/wmbiff/patches/patch-ac10
2 files changed, 8 insertions, 6 deletions
diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo
index 666e952be46..7a58dfade53 100644
--- a/mail/wmbiff/distinfo
+++ b/mail/wmbiff/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2012/07/05 10:30:58 drochner Exp $
+$NetBSD: distinfo,v 1.16 2013/01/17 15:55:31 joerg Exp $
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) = 2dfab161b9f72653f3810d1cac4409841ce8f7b4
+SHA1 (patch-ac) = 338ead6affeec348315c5cedd5cf413e7652abac
SHA1 (patch-wmbiff_gnutls-common.c) = 645e2c2f463d20cf063f4a2ab0c6268daaa0cc85
diff --git a/mail/wmbiff/patches/patch-ac b/mail/wmbiff/patches/patch-ac
index 565c0804bf0..dfb5309a027 100644
--- a/mail/wmbiff/patches/patch-ac
+++ b/mail/wmbiff/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2012/07/05 10:30:58 drochner Exp $
+$NetBSD: patch-ac,v 1.8 2013/01/17 15:55:31 joerg Exp $
--- wmbiff/tlsComm.c.orig 2004-10-11 00:29:47.000000000 +0000
+++ wmbiff/tlsComm.c
-@@ -385,7 +385,7 @@ int
+@@ -385,16 +385,16 @@ int
tls_check_certificate(struct connection_state *scs,
const char *remote_hostname)
{
@@ -11,9 +11,11 @@ $NetBSD: patch-ac,v 1.7 2012/07/05 10:30:58 drochner Exp $
const gnutls_datum *cert_list;
int cert_list_size = 0;
gnutls_x509_crt cert;
-@@ -394,7 +394,7 @@ tls_check_certificate(struct connection_
+
+ if (gnutls_auth_get_type(scs->tls_state) != GNUTLS_CRD_CERTIFICATE) {
bad_certificate(scs, "Unable to get certificate from peer.\n");
- return; /* bad_cert will exit if -skip-certificate-check was not given */
+- return; /* bad_cert will exit if -skip-certificate-check was not given */
++ return 0; /* bad_cert will exit if -skip-certificate-check was not given */
}
- certstat = gnutls_certificate_verify_peers(scs->tls_state);
+ verify_ret = gnutls_certificate_verify_peers2(scs->tls_state, &certstat);