From owner-svn-ports-all@freebsd.org Sat Oct 20 05:43:39 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1F1AFF8CAB; Sat, 20 Oct 2018 05:43:39 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CB3E7F846; Sat, 20 Oct 2018 05:43:39 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4230619FEA; Sat, 20 Oct 2018 05:43:39 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9K5hdgZ032111; Sat, 20 Oct 2018 05:43:39 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9K5hcbu032108; Sat, 20 Oct 2018 05:43:38 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201810200543.w9K5hcbu032108@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 20 Oct 2018 05:43:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r482468 - in branches/2018Q4/www/libwww: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/www/libwww: . files X-SVN-Commit-Revision: 482468 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2018 05:43:39 -0000 Author: antoine Date: Sat Oct 20 05:43:38 2018 New Revision: 482468 URL: https://svnweb.freebsd.org/changeset/ports/482468 Log: MFH: r482007 r482200 www/libwww: Fix build with OpenSSL 1.1.x PR: 228943 Submitted by: Nathan (based on) Reported by: brnrd Obtained from: NetBSD pkgsrc www/libwww: Unbreak with openssl-devel PR: 232303 Submitted by: meta Differential Revision: https://reviews.freebsd.org/D17578 Modified: branches/2018Q4/www/libwww/Makefile branches/2018Q4/www/libwww/files/patch-Library_src_SSL_HTSSL.c branches/2018Q4/www/libwww/files/patch-configure Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/libwww/Makefile ============================================================================== --- branches/2018Q4/www/libwww/Makefile Sat Oct 20 05:41:38 2018 (r482467) +++ branches/2018Q4/www/libwww/Makefile Sat Oct 20 05:43:38 2018 (r482468) @@ -16,8 +16,6 @@ LICENSE_NAME= W3C IPR SOFTWARE NOTICE LICENSE_FILE= ${WRKSRC}/LICENSE.html LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN_SSL= openssl-devel - LIB_DEPENDS= libexpat.so:textproc/expat2 USES= gmake libtool localbase perl5 ssl tar:tgz Modified: branches/2018Q4/www/libwww/files/patch-Library_src_SSL_HTSSL.c ============================================================================== --- branches/2018Q4/www/libwww/files/patch-Library_src_SSL_HTSSL.c Sat Oct 20 05:41:38 2018 (r482467) +++ branches/2018Q4/www/libwww/files/patch-Library_src_SSL_HTSSL.c Sat Oct 20 05:43:38 2018 (r482468) @@ -1,19 +1,55 @@ ---- Library/src/SSL/HTSSL.c.orig 2018-07-04 23:30:19 UTC +--- Library/src/SSL/HTSSL.c.orig 2017-06-24 05:51:38 UTC +++ Library/src/SSL/HTSSL.c -@@ -214,12 +214,16 @@ PUBLIC BOOL HTSSL_init (void) +@@ -98,6 +98,7 @@ PRIVATE void apps_ssl_info_callback (SSL * s, int wher + PRIVATE int verify_callback (int ok, X509_STORE_CTX * ctx) + { + char buf[256]; ++ int ctx_error; + 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,28 @@ PRIVATE int verify_callback (int ok, X509_STORE_CTX * + verify_error=X509_V_ERR_CERT_CHAIN_TOO_LONG; + } + } +- switch (ctx->error) { ++ switch (ctx_error = X509_STORE_CTX_get_error(ctx)) { + case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: ++#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; + + case X509_V_ERR_CERT_NOT_YET_VALID: + case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: + HTTRACE(PROT_TRACE, "notBefore="); +-// ASN1_TIME_print(bio_err,X509_get_notBefore(ctx->current_cert)); ++// ASN1_TIME_print(bio_err,X509_get_notBefore(X509_STORE_CTX_get0_cert(ctx))); + HTTRACE(PROT_TRACE, "\n"); + break; + + case X509_V_ERR_CERT_HAS_EXPIRED: + case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: + HTTRACE(PROT_TRACE, "notAfter="); +-// ASN1_TIME_print(bio_err,X509_get_notAfter(ctx->current_cert)); ++// ASN1_TIME_print(bio_err,X509_get_notAfter(X509_STORE_CTX_get0_cert(ctx))); + HTTRACE(PROT_TRACE, "\n"); + break; + } +@@ -214,12 +219,6 @@ PUBLIC BOOL HTSSL_init (void) + /* select the protocol method */ switch (ssl_prot_method) { -+#ifndef OPENSSL_NO_SSL2 - case HTSSL_V2: - meth = SSLv2_client_method(); - break; -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD - case HTSSL_V3: - meth = SSLv3_client_method(); - break; -+#endif +- case HTSSL_V2: +- meth = SSLv2_client_method(); +- break; +- case HTSSL_V3: +- meth = SSLv3_client_method(); +- break; case HTSSL_V23: meth = SSLv23_client_method(); break; Modified: branches/2018Q4/www/libwww/files/patch-configure ============================================================================== --- branches/2018Q4/www/libwww/files/patch-configure Sat Oct 20 05:41:38 2018 (r482467) +++ branches/2018Q4/www/libwww/files/patch-configure Sat Oct 20 05:43:38 2018 (r482468) @@ -1,6 +1,15 @@ ---- configure.orig 2018-07-04 23:24:12 UTC +--- configure.orig 2017-06-24 06:11:34 UTC +++ configure -@@ -16416,8 +16416,11 @@ $as_echo "no" >&6; } +@@ -15439,7 +15439,7 @@ if test "x$ac_cv_func_remove" = xyes; then : + + fi + +- if test "$ac_cv_func_remove" == yes ; then ++ if test "$ac_cv_func_remove" = yes ; then + + $as_echo "#define unlink remove" >>confdefs.h + +@@ -16416,10 +16416,14 @@ $as_echo "no" >&6; } if test "x$withval" = "xyes"; then withval=$ssllib SSLINC=$sslinc @@ -12,4 +21,7 @@ - LIBS="$LIBS $withval" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ ++#include + int + main ()