diff options
| author | ryoon <ryoon@pkgsrc.org> | 2018-03-24 15:40:07 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2018-03-24 15:40:07 +0000 |
| commit | 1a18913d2dbd62f5e30e515610bf751b9e8856dd (patch) | |
| tree | bb1249fca37acbe4ccd2de002f4ff01728812a51 /www | |
| parent | 3e5a8d550d77ad99b103f0fe86938f40a81bb67b (diff) | |
| download | pkgsrc-1a18913d2dbd62f5e30e515610bf751b9e8856dd.tar.gz | |
Fix ssl option functionality with OpenSSL 1.1.0
Diffstat (limited to 'www')
| -rw-r--r-- | www/dillo/distinfo | 4 | ||||
| -rw-r--r-- | www/dillo/options.mk | 3 | ||||
| -rw-r--r-- | www/dillo/patches/patch-configure | 20 | ||||
| -rw-r--r-- | www/dillo/patches/patch-dpi_https.c | 18 |
4 files changed, 43 insertions, 2 deletions
diff --git a/www/dillo/distinfo b/www/dillo/distinfo index c7d60e320b3..7ebc10a9e01 100644 --- a/www/dillo/distinfo +++ b/www/dillo/distinfo @@ -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 diff --git a/www/dillo/options.mk b/www/dillo/options.mk index b944d15c9c2..98156696f69 100644 --- a/www/dillo/options.mk +++ b/www/dillo/options.mk @@ -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 diff --git a/www/dillo/patches/patch-configure b/www/dillo/patches/patch-configure new file mode 100644 index 00000000000..3585fcd980b --- /dev/null +++ b/www/dillo/patches/patch-configure @@ -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; + } diff --git a/www/dillo/patches/patch-dpi_https.c b/www/dillo/patches/patch-dpi_https.c new file mode 100644 index 00000000000..cdb3a41f828 --- /dev/null +++ b/www/dillo/patches/patch-dpi_https.c @@ -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; |