From owner-svn-ports-all@freebsd.org Sat Mar 13 16:15:33 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 22A0157B80F; Sat, 13 Mar 2021 16:15:33 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DySTK0RzHz53FT; Sat, 13 Mar 2021 16:15:33 +0000 (UTC) (envelope-from joneum@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 F230B5CA2; Sat, 13 Mar 2021 16:15:32 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12DGFWqp019980; Sat, 13 Mar 2021 16:15:32 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12DGFWCs019979; Sat, 13 Mar 2021 16:15:32 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <202103131615.12DGFWCs019979@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Sat, 13 Mar 2021 16:15:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r568258 - in branches/2021Q1/www/apache24: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in branches/2021Q1/www/apache24: . files X-SVN-Commit-Revision: 568258 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.34 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, 13 Mar 2021 16:15:33 -0000 Author: joneum Date: Sat Mar 13 16:15:32 2021 New Revision: 568258 URL: https://svnweb.freebsd.org/changeset/ports/568258 Log: MFH: r568256 fix OpenSSL KTLS causes regression: SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT PR: 253394 Reported by: many Approved by: apache (with hat) Sponsored by: Netzkommune GmbH Differential Revision: https://reviews.freebsd.org/D28932 Added: branches/2021Q1/www/apache24/files/patch-modules_ssl_ssl__engine__io.c - copied unchanged from r568256, head/www/apache24/files/patch-modules_ssl_ssl__engine__io.c Modified: branches/2021Q1/www/apache24/Makefile Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/www/apache24/Makefile ============================================================================== --- branches/2021Q1/www/apache24/Makefile Sat Mar 13 16:13:22 2021 (r568257) +++ branches/2021Q1/www/apache24/Makefile Sat Mar 13 16:15:32 2021 (r568258) @@ -2,7 +2,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.46 -PORTREVISION= 0 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} Copied: branches/2021Q1/www/apache24/files/patch-modules_ssl_ssl__engine__io.c (from r568256, head/www/apache24/files/patch-modules_ssl_ssl__engine__io.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/www/apache24/files/patch-modules_ssl_ssl__engine__io.c Sat Mar 13 16:15:32 2021 (r568258, copy of r568256, head/www/apache24/files/patch-modules_ssl_ssl__engine__io.c) @@ -0,0 +1,38 @@ +--- modules/ssl/ssl_engine_io.c.orig 2020-02-20 16:33:40.000000000 -0800 ++++ modules/ssl/ssl_engine_io.c 2021-02-25 16:08:04.863228000 -0800 +@@ -242,7 +242,7 @@ static int bio_filter_out_write(BIO *bio, const char * + + static long bio_filter_out_ctrl(BIO *bio, int cmd, long num, void *ptr) + { +- long ret = 1; ++ long ret = 0; + bio_filter_out_ctx_t *outctx = (bio_filter_out_ctx_t *)BIO_get_data(bio); + + switch (cmd) { +@@ -542,7 +542,7 @@ static int bio_filter_in_gets(BIO *bio, char *buf, int + + static long bio_filter_in_ctrl(BIO *bio, int cmd, long num, void *ptr) + { +- return -1; ++ return 0; + } + + #if MODSSL_USE_OPENSSL_PRE_1_1_API +@@ -567,7 +567,7 @@ static BIO_METHOD bio_filter_in_method = { + bio_filter_in_read, + bio_filter_in_puts, /* puts is never called */ + bio_filter_in_gets, /* gets is never called */ +- bio_filter_in_ctrl, /* ctrl is never called */ ++ bio_filter_in_ctrl, + bio_filter_create, + bio_filter_destroy, + NULL +@@ -594,7 +594,7 @@ void init_bio_methods(void) + BIO_meth_set_read(bio_filter_in_method, &bio_filter_in_read); + BIO_meth_set_puts(bio_filter_in_method, &bio_filter_in_puts); /* puts is never called */ + BIO_meth_set_gets(bio_filter_in_method, &bio_filter_in_gets); /* gets is never called */ +- BIO_meth_set_ctrl(bio_filter_in_method, &bio_filter_in_ctrl); /* ctrl is never called */ ++ BIO_meth_set_ctrl(bio_filter_in_method, &bio_filter_in_ctrl); + BIO_meth_set_create(bio_filter_in_method, &bio_filter_create); + BIO_meth_set_destroy(bio_filter_in_method, &bio_filter_destroy); + }