From c3007b4ee14db983d8697220704dc33322ad633a Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Wed, 18 Dec 2019 12:39:09 +0000
Subject: Deal with stricter constness of OpenSSL 1.1.

---
 mail/avenger/distinfo                        |  3 ++-
 mail/avenger/patches/patch-asmtpd_starttls.C | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 mail/avenger/patches/patch-asmtpd_starttls.C

(limited to 'mail')

diff --git a/mail/avenger/distinfo b/mail/avenger/distinfo
index 9f84c8aec5c..3e93c9cfa16 100644
--- a/mail/avenger/distinfo
+++ b/mail/avenger/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 23:27:01 agc Exp $
+$NetBSD: distinfo,v 1.9 2019/12/18 12:39:09 joerg Exp $
 
 SHA1 (avenger-0.8.4.tar.gz) = 109d17e2be2fa5f93e4302fefe5b1847458d33bb
 RMD160 (avenger-0.8.4.tar.gz) = 762f3f260d2be8466109d24d59b196b14adc04d4
@@ -7,5 +7,6 @@ Size (avenger-0.8.4.tar.gz) = 890192 bytes
 SHA1 (patch-aa) = c7ae855eab4995164de44c861480f263adbb4bc9
 SHA1 (patch-ab) = 831944e8447433b2697db2b3a58650aab19f4a19
 SHA1 (patch-ac) = 9b3625a090e0f9091468b86a99d0bea6535ac371
+SHA1 (patch-asmtpd_starttls.C) = 64bcc7313d5b76b9d0aca6ec0c9a220e75cfd146
 SHA1 (patch-libasync_ihash.h) = 45cfb9081f3a4176e32668dd80bd09fb4ba97e27
 SHA1 (patch-util_avutil.h) = 66d99fcb4bae3e2477089222cdc8dea6fa030d42
diff --git a/mail/avenger/patches/patch-asmtpd_starttls.C b/mail/avenger/patches/patch-asmtpd_starttls.C
new file mode 100644
index 00000000000..be764af1ff4
--- /dev/null
+++ b/mail/avenger/patches/patch-asmtpd_starttls.C
@@ -0,0 +1,22 @@
+$NetBSD: patch-asmtpd_starttls.C,v 1.1 2019/12/18 12:39:09 joerg Exp $
+
+--- asmtpd/starttls.C.orig	2019-12-13 12:08:22.007397245 +0000
++++ asmtpd/starttls.C
+@@ -264,7 +264,7 @@ smtpd::received_starttls (strbuf r) cons
+     return;
+ 
+   r << "    (";
+-  if (char *vers = SSL_get_cipher_version (ssl->get_ssl ()))
++  if (const char *vers = SSL_get_cipher_version (ssl->get_ssl ()))
+     r << vers;
+   else
+     r << "SSL";
+@@ -299,7 +299,7 @@ smtpd::env_starttls (vec<str> *envp) con
+   envp->push_back (strbuf ("SSL_CIPHER_BITS=%d", cipher_bits));
+   envp->push_back (strbuf ("SSL_ALG_BITS=%d", alg_bits));
+ 
+-  if (char *vers = SSL_get_cipher_version (ssl->get_ssl ()))
++  if (const char *vers = SSL_get_cipher_version (ssl->get_ssl ()))
+       envp->push_back (strbuf () << "SSL_VERSION=" << vers);
+ 
+   if (ssl->issuer)
-- 
cgit v1.2.3