From owner-svn-ports-all@freebsd.org Mon Oct 15 06:39:16 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 43D9110D108D; Mon, 15 Oct 2018 06:39:16 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F113F8675D; Mon, 15 Oct 2018 06:39:15 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from icepick.vmeta.jp (unknown [IPv6:2405:6586:2280:1200:69cb:3b85:3c2e:c1c9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: meta/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 9F3A61696B; Mon, 15 Oct 2018 06:39:14 +0000 (UTC) (envelope-from meta@FreeBSD.org) Date: Mon, 15 Oct 2018 15:39:11 +0900 From: Koichiro Iwao To: "Danilo G. Baio" Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r482007 - head/www/libwww/files Message-ID: <20181015063910.uevhiljdizz2djam@icepick.vmeta.jp> References: <201810131937.w9DJb0ge065607@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201810131937.w9DJb0ge065607@repo.freebsd.org> X-Operating-System: FreeBSD 11.2-STABLE amd64 User-Agent: NeoMutt/20180716 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 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: Mon, 15 Oct 2018 06:39:16 -0000 Hi, thank you very much for your work. You forget to remove BROKEN mark in Makefile. On Sat, Oct 13, 2018 at 07:37:00PM +0000, Danilo G. Baio wrote: > Author: dbaio > Date: Sat Oct 13 19:37:00 2018 > New Revision: 482007 > URL: https://svnweb.freebsd.org/changeset/ports/482007 > > Log: > www/libwww: Fix build with OpenSSL 1.1.x > > PR: 228943 > Submitted by: Nathan (based on) > Reported by: brnrd > Obtained from: NetBSD pkgsrc > > Modified: > head/www/libwww/files/patch-Library_src_SSL_HTSSL.c > head/www/libwww/files/patch-configure > > Modified: head/www/libwww/files/patch-Library_src_SSL_HTSSL.c > ============================================================================== > --- head/www/libwww/files/patch-Library_src_SSL_HTSSL.c Sat Oct 13 19:22:47 2018 (r482006) > +++ head/www/libwww/files/patch-Library_src_SSL_HTSSL.c Sat Oct 13 19:37:00 2018 (r482007) > @@ -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: head/www/libwww/files/patch-configure > ============================================================================== > --- head/www/libwww/files/patch-configure Sat Oct 13 19:22:47 2018 (r482006) > +++ head/www/libwww/files/patch-configure Sat Oct 13 19:37:00 2018 (r482007) > @@ -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 () > -- meta