libwww: Unbreak OpenSSL 1.1 patch. Fix SunOS MD5 section.

4 files changed, 14 insertions, 19 deletions

diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 985c6d0ef76..edbb5643e3d 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2018/06/24 17:01:58 adam Exp $
+# $NetBSD: Makefile,v 1.94 2018/06/28 15:45:46 jperkin Exp $
 
 DISTNAME=	w3c-libwww-5.4.2
 PKGNAME=	${DISTNAME:S/^w3c-//}
@@ -26,16 +26,8 @@ CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--with-regex
 .endif
 
-PLIST_VARS+=		md5
-.if ${OPSYS} == "SunOS"
-# Solaris has a /usr/lib/libmd5 which seems to be enough, and
-# /usr/local/lib/libmd5 breaks /usr/lib/librt
-CONFIGURE_ARGS+=	--without-md5
-.else
-PLIST.md5=		yes
-.  if !exists(/usr/include/md5.h)
+.if !exists(/usr/include/md5.h)
 CONFIGURE_ARGS+=	--with-md5=${SSLBASE:Q}
-.  endif
 .endif
 
 .include "options.mk"
diff --git a/www/libwww/PLIST b/www/libwww/PLIST
index 554a9ff751f..5386b3477cc 100644
--- a/www/libwww/PLIST
+++ b/www/libwww/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2018/06/24 16:54:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/06/28 15:45:46 jperkin Exp $
 bin/libwww-config
 bin/w3c
 bin/webbot
@@ -162,7 +162,7 @@ include/w3c-libwww/WWWXML.h
 include/w3c-libwww/WWWZip.h
 include/w3c-libwww/wwwsys.h
 include/wwwconf.h
-${PLIST.md5}lib/libmd5.la
+lib/libmd5.la
 lib/libpics.la
 lib/libwwwapp.la
 lib/libwwwcache.la
diff --git a/www/libwww/distinfo b/www/libwww/distinfo
index 5d290a1908d..264ebdb6935 100644
--- a/www/libwww/distinfo
+++ b/www/libwww/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2018/06/24 16:54:59 adam Exp $
+$NetBSD: distinfo,v 1.29 2018/06/28 15:45:46 jperkin Exp $
 
 SHA1 (w3c-libwww-5.4.2.tgz) = 6bc3c0de4cd2e0d51b17789c9a86b5296ce44b2f
 RMD160 (w3c-libwww-5.4.2.tgz) = 7b6ecfbd84ca8b2ce3b19d3b60e9f6a75ea914f5
@@ -7,7 +7,7 @@ Size (w3c-libwww-5.4.2.tgz) = 2630357 bytes
 SHA1 (patch-Library_Makefile.in) = f0ea0413c13501cfa7d038ebfe602d6bdbf02de4
 SHA1 (patch-Library_src_HTMIMImp.c) = 2f14df9867758c69f9e6110b16f75d017e032a8e
 SHA1 (patch-Library_src_HTStyle.c) = 2c42a00ce5ed0ff0f34e779582684805e47edce2
-SHA1 (patch-Library_src_SSL_HTSSL.c) = c170125b96ff3fc57e7b193b123b104ab45cb8c8
+SHA1 (patch-Library_src_SSL_HTSSL.c) = ddb87040f0669e1c3ab9f098a957193b436f588a
 SHA1 (patch-Library_src_wwwsys.h) = 25f39cf5afb6e4a2879a0f38129d8a450a863e72
 SHA1 (patch-configure) = 70a7d08b59361bb64069bb27cabfbc6dc2c47ec4
 SHA1 (patch-libwww-config.in) = 438821b7979712cf87781c38c930ab8e24ea1aad
diff --git a/www/libwww/patches/patch-Library_src_SSL_HTSSL.c b/www/libwww/patches/patch-Library_src_SSL_HTSSL.c
index 14313c0a566..bc1b260677b 100644
--- a/www/libwww/patches/patch-Library_src_SSL_HTSSL.c
+++ b/www/libwww/patches/patch-Library_src_SSL_HTSSL.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-Library_src_SSL_HTSSL.c,v 1.1 2018/06/24 16:54:59 adam Exp $
+$NetBSD: patch-Library_src_SSL_HTSSL.c,v 1.2 2018/06/28 15:45:46 jperkin Exp $
 
 Fix for OpenSSL 1.1.x.
 
---- Library/src/SSL/HTSSL.c.orig	2018-06-24 13:38:32.023842509 +0000
+--- Library/src/SSL/HTSSL.c.orig	2017-06-24 05:51:38.000000000 +0000
 +++ Library/src/SSL/HTSSL.c
 @@ -98,6 +98,7 @@ PRIVATE void apps_ssl_info_callback (SSL
  PRIVATE int verify_callback (int ok, X509_STORE_CTX * ctx)
@@ -12,7 +12,7 @@ Fix for OpenSSL 1.1.x.
      X509 * err_cert = X509_STORE_CTX_get_current_cert(ctx);
      int err = X509_STORE_CTX_get_error(ctx);
      int depth = X509_STORE_CTX_get_error_depth(ctx);
-@@ -115,24 +116,24 @@ PRIVATE int verify_callback (int ok, X50
+@@ -115,24 +116,28 @@ PRIVATE int verify_callback (int ok, X50
  	    verify_error=X509_V_ERR_CERT_CHAIN_TOO_LONG;
  	}
      }
@@ -20,8 +20,11 @@ Fix for OpenSSL 1.1.x.
 +    switch (ctx_error = X509_STORE_CTX_get_error(ctx)) {
  
      case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
--	X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
 +	X509_NAME_oneline(X509_get_issuer_name(X509_STORE_CTX_get0_cert(ctx)), buf, 256);
++#else
+ 	X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
++#endif
  	HTTRACE(PROT_TRACE, "issuer= %s\n" _ buf);
  	break;
  
@@ -41,7 +44,7 @@ Fix for OpenSSL 1.1.x.
  	HTTRACE(PROT_TRACE, "\n");
  	break;
      }
-@@ -214,12 +215,6 @@ PUBLIC BOOL HTSSL_init (void)
+@@ -214,12 +219,6 @@ PUBLIC BOOL HTSSL_init (void)
  
  	/* select the protocol method */
  	switch (ssl_prot_method) {