CVS commit: pkgsrc/www/dillo

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Mar 24 15:40:07 UTC 2018

Modified Files:
        pkgsrc/www/dillo: distinfo options.mk
Added Files:
        pkgsrc/www/dillo/patches: patch-configure patch-dpi_https.c

Log Message:
Fix ssl option functionality with OpenSSL 1.1.0


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/dillo/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/dillo/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/dillo/patches/patch-configure \
    pkgsrc/www/dillo/patches/patch-dpi_https.c

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

Modified files:

Index: pkgsrc/www/dillo/distinfo
diff -u pkgsrc/www/dillo/distinfo:1.39 pkgsrc/www/dillo/distinfo:1.40
--- pkgsrc/www/dillo/distinfo:1.39      Wed Nov  4 02:46:52 2015
+++ pkgsrc/www/dillo/distinfo   Sat Mar 24 15:40:07 2018
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.39 2015/11/04 02:46:52 agc Exp $
+$NetBSD: distinfo,v 1.40 2018/03/24 15:40:07 ryoon Exp $
 
 SHA1 (dillo-3.0.5.tar.bz2) = 1f6646f03e3c99f03a4e4abeeb5110bf7f7b3e6a
 RMD160 (dillo-3.0.5.tar.bz2) = 404d7b1a0e60526a53a02d4d49ed5b747f4e43fb
 SHA512 (dillo-3.0.5.tar.bz2) = d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155
 Size (dillo-3.0.5.tar.bz2) = 734472 bytes
+SHA1 (patch-configure) = 18dc67f0fe302ee030cb7be2a5fa5ef5976fcece
+SHA1 (patch-dpi_https.c) = 1f95a8dfdc44a9ad6aa666cb880198708c6a5f1d

Index: pkgsrc/www/dillo/options.mk
diff -u pkgsrc/www/dillo/options.mk:1.4 pkgsrc/www/dillo/options.mk:1.5
--- pkgsrc/www/dillo/options.mk:1.4     Wed Oct  9 14:23:42 2013
+++ pkgsrc/www/dillo/options.mk Sat Mar 24 15:40:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2013/10/09 14:23:42 ryoon Exp $
+# $NetBSD: options.mk,v 1.5 2018/03/24 15:40:07 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dillo
 PKG_SUPPORTED_OPTIONS= inet6 ssl
@@ -12,6 +12,7 @@ CONFIGURE_ARGS+=      --enable-ipv6
 
 .if !empty(PKG_OPTIONS:Mssl)
 CONFIGURE_ARGS+=       --enable-ssl
+LIBS+=                 -lssl
 .include "../../security/openssl/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-ssl

Added files:

Index: pkgsrc/www/dillo/patches/patch-configure
diff -u /dev/null pkgsrc/www/dillo/patches/patch-configure:1.1
--- /dev/null   Sat Mar 24 15:40:07 2018
+++ pkgsrc/www/dillo/patches/patch-configure    Sat Mar 24 15:40:07 2018
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.1 2018/03/24 15:40:07 ryoon Exp $
+
+* Detect OpenSSL 1.1.0
+
+--- configure.orig     2015-06-30 14:07:22.000000000 +0000
++++ configure
+@@ -6018,11 +6018,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++void OPENSSL_config ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++OPENSSL_config ();
+   ;
+   return 0;
+ }
Index: pkgsrc/www/dillo/patches/patch-dpi_https.c
diff -u /dev/null pkgsrc/www/dillo/patches/patch-dpi_https.c:1.1
--- /dev/null   Sat Mar 24 15:40:07 2018
+++ pkgsrc/www/dillo/patches/patch-dpi_https.c  Sat Mar 24 15:40:07 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-dpi_https.c,v 1.1 2018/03/24 15:40:07 ryoon Exp $
+
+* Support OpenSSL 1.1.0
+
+--- dpi/https.c.orig   2015-06-30 14:06:08.000000000 +0000
++++ dpi/https.c
+@@ -476,7 +476,11 @@ static int handle_certificate_problem(SS
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+          if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++#else
++         if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
++#endif
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;