From nobody Mon Dec 20 17:43:42 2021 X-Original-To: dev-commits-ports-branches@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 F0BF918FDFD8; Mon, 20 Dec 2021 17:43:42 +0000 (UTC) (envelope-from git@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 4JHn4t3g8zz4X4T; Mon, 20 Dec 2021 17:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53DE31A81E; Mon, 20 Dec 2021 17:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BKHhgxk037612; Mon, 20 Dec 2021 17:43:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKHhgoV037611; Mon, 20 Dec 2021 17:43:42 GMT (envelope-from git) Date: Mon, 20 Dec 2021 17:43:42 GMT Message-Id: <202112201743.1BKHhgoV037611@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: 1507509936f2 - 2021Q4 - www/apache24: Update to 2.4.52 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 1507509936f2d411fa565907a42b09040ad421f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640022222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPquJ0/8IS6b3cx4XwzPxAtSbAKUn6cFOu0sRtdrVfY=; b=UxJn1jaJIbHVuaSgQkqaLZ5+OH5bvxprDyz+poFF73ubrQ3w/u391h/I09AMjcpOPORzpN 2NJR0pWqf/TNnVuT1ISPsDM+jcTmrP7wPt5W/oFcTWyBAsmeyiPT91YtIYrN9bXQz8cI66 CW62VD/EkcnrZtYI/gCTWAeXwWNI/Jj3ZN+iDYute7CKC8X+Y3D7ipwlTW4RD8ob5ER0hw nYaU7GV36VYaWd7SESnhh+ktJxOZVM8GWiS/3hbFwCq8XZZFeiveSpMo8jDnk5/MZdPnxP EUUYOx/bPRa7ooksoWJ2XgtTJe1oltefm7nWQKPYDIkqYC1c0cE6mlQM9NcPwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640022222; a=rsa-sha256; cv=none; b=R4xPAb/7ZDo74ABHDlYvzJybAfOJB1MN/xcj1eQGo844lQ5O4gMER8NFEwoLJ/BYuG/3C4 Dm93NG9QPue8aavt4dxxPsHyt+EzV/LOgx0WpBJyTzoBdfW0BUpxuzgMYwA0LUXJTPifnN QlYHO/tumrwb3D0sYb/zjSGdC5aksM+qU6kEKltuA+utSJ1gBwkUDBSWvsYLAbD4BTvWLT TLE+8QRf000STbb2/rVcCy3XXiDo2CVIByVXQW0lDWTbYAatbGxc8os+C9q9g7VBQLDa+K kwjHmF3u8CAJsQ+hiq/Z/rahkvvYqVWvWRAcZFwM+A0HauEJa5CY9jqjjcWA7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1507509936f2d411fa565907a42b09040ad421f7 commit 1507509936f2d411fa565907a42b09040ad421f7 Author: Bernard Spil AuthorDate: 2021-12-20 17:23:35 +0000 Commit: Bernard Spil CommitDate: 2021-12-20 17:43:33 +0000 www/apache24: Update to 2.4.52 Security: ca982e2d-61a9-11ec-8be6-d4c9ef517024 MFH: 2021Q4 (cherry picked from commit e721e5aeffbd529fb28aeae0bf0b90b128a965e8) --- 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); - }