Received: by mail.netbsd.org (Postfix, from userid 605) id 2052784DB2; Fri, 27 Mar 2020 20:56:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9C82584DB0 for ; Fri, 27 Mar 2020 20:55:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id NRc7EC3OcyUR for ; Fri, 27 Mar 2020 20:55:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 24C4084D8D for ; Fri, 27 Mar 2020 20:55:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 22C00FB27; Fri, 27 Mar 2020 20:55:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158534255937960" MIME-Version: 1.0 Date: Fri, 27 Mar 2020 20:55:59 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/mail/perdition To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200327205559.22C00FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158534255937960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Fri Mar 27 20:55:59 UTC 2020 Modified Files: pkgsrc/mail/perdition: distinfo Added Files: pkgsrc/mail/perdition/patches: patch-perdition_ssl.c Log Message: Fix building with OpenSSL 1.1. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/perdition/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/mail/perdition/patches/patch-perdition_ssl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158534255937960 Content-Disposition: inline Content-Length: 1908 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/perdition/distinfo diff -u pkgsrc/mail/perdition/distinfo:1.10 pkgsrc/mail/perdition/distinfo:1.11 --- pkgsrc/mail/perdition/distinfo:1.10 Tue Nov 3 23:27:16 2015 +++ pkgsrc/mail/perdition/distinfo Fri Mar 27 20:55:58 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 23:27:16 agc Exp $ +$NetBSD: distinfo,v 1.11 2020/03/27 20:55:58 joerg Exp $ SHA1 (perdition-1.18.tar.gz) = 60d76e2fca810fa1a12bebe369fc3e7d3452ebbb RMD160 (perdition-1.18.tar.gz) = 82065dcfb7f05d7bebcf98b72334f676d4fd5dad @@ -8,3 +8,4 @@ SHA1 (patch-ac) = 01934fb919cc8ac7699e07 SHA1 (patch-ag) = 3840c9b4ed6e6d286c1cbeebad7184f9ccdaac2a SHA1 (patch-makegdbm_options_h) = f412c826e78bc80b64cf2311b1f815c5a950a773 SHA1 (patch-perdition_db_gdbm_perditiondb_gdbm_h) = 7cdbc04771f00c13133766d39851df03ad959b9b +SHA1 (patch-perdition_ssl.c) = 73b95ddeaf5ac223ab5d1fa5b90dd3d1fc35b405 Added files: Index: pkgsrc/mail/perdition/patches/patch-perdition_ssl.c diff -u /dev/null pkgsrc/mail/perdition/patches/patch-perdition_ssl.c:1.1 --- /dev/null Fri Mar 27 20:55:59 2020 +++ pkgsrc/mail/perdition/patches/patch-perdition_ssl.c Fri Mar 27 20:55:58 2020 @@ -0,0 +1,24 @@ +$NetBSD: patch-perdition_ssl.c,v 1.1 2020/03/27 20:55:58 joerg Exp $ + +--- perdition/ssl.c.orig 2020-03-27 14:29:57.846281348 +0000 ++++ perdition/ssl.c +@@ -218,7 +218,7 @@ __perdition_verify_callback(int ok, X509 + return 0; + } + +- if (__perdition_verify_result(ctx->error, cert) ++ if (__perdition_verify_result(X509_STORE_CTX_get_error(ctx), cert) + == X509_V_OK) { + return 1; + } +@@ -656,8 +656,8 @@ __perdition_ssl_check_common_name(X509 * + return -1; + } + +- if (!__perdition_ssl_compare_key(key, e->value->data, +- e->value->length)) ++ if (!__perdition_ssl_compare_key(key, X509_NAME_ENTRY_get_data(e)->data, ++ X509_NAME_ENTRY_get_data(e)->length)) + return 0; + } + --_----------=_158534255937960--