CVS commit: pkgsrc/www/lhs

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Jan 12 23:01:38 UTC 2020

Modified Files:
        pkgsrc/www/lhs: distinfo
        pkgsrc/www/lhs/patches: patch-ac

Log Message:
Fix build with OpenSSL 1.1. Drop SSL2 logic.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/lhs/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/lhs/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/lhs/distinfo
diff -u pkgsrc/www/lhs/distinfo:1.5 pkgsrc/www/lhs/distinfo:1.6
--- pkgsrc/www/lhs/distinfo:1.5 Sat Mar 26 23:05:10 2016
+++ pkgsrc/www/lhs/distinfo     Sun Jan 12 23:01:38 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2016/03/26 23:05:10 joerg Exp $
+$NetBSD: distinfo,v 1.6 2020/01/12 23:01:38 joerg Exp $
 
 SHA1 (lhs-0.1.tar.gz) = 74fbb0a982cd00c668c9f07b7c3c583759f14fd6
 RMD160 (lhs-0.1.tar.gz) = 176d8149d11383fc4d82e4a13991f156f3ab42ca
@@ -6,5 +6,5 @@ SHA512 (lhs-0.1.tar.gz) = 38eaa65eea5e2a
 Size (lhs-0.1.tar.gz) = 10665 bytes
 SHA1 (patch-aa) = 682df4329c32b01438221ba78055761468ede8fa
 SHA1 (patch-ab) = a066f92aa5f47e85863b23e92247c2fad8f3c5bf
-SHA1 (patch-ac) = 5359e9a017dc3e9ca4199b52691eb8727bdfa1f5
+SHA1 (patch-ac) = 1ed366392bd2f189d7c3091c23b681712dbbc611
 SHA1 (patch-configure) = 21e675f56bd36f6bb880cb0179db952fa18a25a3

Index: pkgsrc/www/lhs/patches/patch-ac
diff -u pkgsrc/www/lhs/patches/patch-ac:1.3 pkgsrc/www/lhs/patches/patch-ac:1.4
--- pkgsrc/www/lhs/patches/patch-ac:1.3 Sat Mar 26 23:05:10 2016
+++ pkgsrc/www/lhs/patches/patch-ac     Sun Jan 12 23:01:38 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2016/03/26 23:05:10 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2020/01/12 23:01:38 joerg Exp $
 
 * Include sys/filio.h for FIONBIO etc.
 * Drop SSLv2 support
@@ -33,13 +33,15 @@ $NetBSD: patch-ac,v 1.3 2016/03/26 23:05
        if (!ctx) {
                fprintf(stderr, "SSL_CTX_new failed.\n");
                return 0;
-@@ -512,12 +513,12 @@ SSL *init_ssl_socket(int sock)
+@@ -511,13 +512,13 @@ SSL *init_ssl_socket(int sock)
+               return NULL;
        }
  //    SSL_set_session_id_context(ssl,AppContext,sizeof(AppContext));
-       switch(ssl->session->ssl_version) {
+-      switch(ssl->session->ssl_version) {
 -              case SSL2_VERSION:
 -                      debug("ssl2\n");
 -                      break;  
++      switch(SSL_SESSION_get_protocol_version(SSL_get_session(ssl))) {
                case SSL3_VERSION:
                        debug("ssl3\n");
                        break;