From nobody Mon Dec 20 17:31:48 2021 X-Original-To: apache@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AD1EB18FAD6A for ; Mon, 20 Dec 2021 17:32:09 +0000 (UTC) (envelope-from brnrd@freebsd.org) Received: from smtp-out04.qsp.nl (smtp-out04.qsp.nl [193.254.214.168]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4JHmqX3F0hz4TvB; Mon, 20 Dec 2021 17:32:08 +0000 (UTC) (envelope-from brnrd@freebsd.org) Received: from smtp.brnrd.eu (5921114a.static.cust.trined.nl [89.33.17.74]) by smtp02.qsp.nl (Postfix) with ESMTPSA id 7BE1F21BBD; Mon, 20 Dec 2021 18:32:01 +0100 (CET) Received: from mail-yb1-f172.google.com (mail-yb1-f172.google.com [209.85.219.172]) by smtp.brnrd.eu (Postfix) with ESMTPSA id 4JHmqP12ybz4xP; Mon, 20 Dec 2021 17:32:01 +0000 (UTC) Received: by mail-yb1-f172.google.com with SMTP id d10so31056326ybe.3; Mon, 20 Dec 2021 09:32:00 -0800 (PST) X-Gm-Message-State: AOAM533G4GSRdbaphpDWK4MNut4IXlAIazyuIMjNAh1dOwTgEcd1pZJz IjUVEbDYnRXAdITVnTAOsSQzAmRYVSmPtTxbNg== X-Google-Smtp-Source: ABdhPJzqZzA8BR6hvubageDrlocaDqptwY1nj/axI1uoZ1qJKxhMkMLG1weOPKK/WvVPug0w3YtJj1tKjjTdLblWa3Y= X-Received: by 2002:a25:9b85:: with SMTP id v5mr16572953ybo.477.1640021519338; Mon, 20 Dec 2021 09:31:59 -0800 (PST) List-Id: Support of apache-related ports List-Archive: https://lists.freebsd.org/archives/freebsd-apache List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-apache@freebsd.org MIME-Version: 1.0 References: <202112201724.1BKHOOsf011208@gitrepo.freebsd.org> In-Reply-To: <202112201724.1BKHOOsf011208@gitrepo.freebsd.org> From: Bernard Spil Date: Mon, 20 Dec 2021 18:31:48 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: e721e5aeffbd - main - www/apache24: Update to 2.4.52 To: ports-committers@freebsd.org, jhb@freebsd.org, "apache@FreeBSD.org" , bjk@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4JHmqX3F0hz4TvB X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 193.254.214.168 is neither permitted nor denied by domain of brnrd@freebsd.org) smtp.mailfrom=brnrd@freebsd.org X-Spamd-Result: default: False [-0.04 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[brnrd]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; ARC_NA(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_MEDIUM(-0.08)[-0.083]; NEURAL_HAM_SHORT(-0.74)[-0.736]; NEURAL_SPAM_LONG(0.88)[0.878]; RCVD_IN_DNSWL_NONE(0.00)[209.85.219.172:received]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12315, ipnet:193.254.214.0/23, country:NL]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Hi all, Just committed Apache 2.4.52, this affects the patch that was added for https://reviews.freebsd.org/D28932. Please let me / apache@ know if this affects KTLS in some way. Cheers, Bernard (with hat Apache) On Mon, Dec 20, 2021 at 6:24 PM Bernard Spil wrote: > > The branch main has been updated by brnrd: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=e721e5aeffbd529fb28aeae0bf0b90b128a965e8 > > commit e721e5aeffbd529fb28aeae0bf0b90b128a965e8 > Author: Bernard Spil > AuthorDate: 2021-12-20 17:23:35 +0000 > Commit: Bernard Spil > CommitDate: 2021-12-20 17:23:35 +0000 > > www/apache24: Update to 2.4.52 > > Security: ca982e2d-61a9-11ec-8be6-d4c9ef517024 > MFH: 2021Q4 > --- > www/apache24/Makefile | 2 +- > www/apache24/distinfo | 6 ++--- > .../files/patch-modules_ssl_ssl__engine__io.c | 27 ---------------------- > 3 files changed, 4 insertions(+), 31 deletions(-) > > diff --git a/www/apache24/Makefile b/www/apache24/Makefile > index 4af09c60ded3..64160a1d7b53 100644 > --- a/www/apache24/Makefile > +++ b/www/apache24/Makefile > @@ -1,5 +1,5 @@ > PORTNAME= apache24 > -PORTVERSION= 2.4.51 > +PORTVERSION= 2.4.52 > CATEGORIES= www > MASTER_SITES= APACHE_HTTPD > DISTNAME= httpd-${PORTVERSION} > diff --git a/www/apache24/distinfo b/www/apache24/distinfo > index 27f7dd9c0d1c..a7ee86ebea2a 100644 > --- a/www/apache24/distinfo > +++ b/www/apache24/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1633625239 > -SHA256 (apache24/httpd-2.4.51.tar.bz2) = 20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4 > -SIZE (apache24/httpd-2.4.51.tar.bz2) = 7653609 > +TIMESTAMP = 1640014080 > +SHA256 (apache24/httpd-2.4.52.tar.bz2) = 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 > +SIZE (apache24/httpd-2.4.52.tar.bz2) = 7439184 > diff --git a/www/apache24/files/patch-modules_ssl_ssl__engine__io.c b/www/apache24/files/patch-modules_ssl_ssl__engine__io.c > index 70923c6beaa3..ec2beb1f9e38 100644 > --- a/www/apache24/files/patch-modules_ssl_ssl__engine__io.c > +++ b/www/apache24/files/patch-modules_ssl_ssl__engine__io.c > @@ -9,30 +9,3 @@ > 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); > - }