From owner-dev-commits-ports-branches@freebsd.org Mon Jun 14 07:18:51 2021 Return-Path: Delivered-To: dev-commits-ports-branches@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 0E791659C0C; Mon, 14 Jun 2021 07:18:51 +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 4G3N966tW2z4Sxs; Mon, 14 Jun 2021 07:18:50 +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 D4E0110930; Mon, 14 Jun 2021 07:18:50 +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 15E7IoaJ008012; Mon, 14 Jun 2021 07:18:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15E7IoXC008011; Mon, 14 Jun 2021 07:18:50 GMT (envelope-from git) Date: Mon, 14 Jun 2021 07:18:50 GMT Message-Id: <202106140718.15E7IoXC008011@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: 2ea11f7275de - 2021Q2 - www/apache24: Update to 2.4.48 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/2021Q2 X-Git-Reftype: branch X-Git-Commit: 2ea11f7275de4a607ce907c11a2a5b44e22da554 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2021 07:18:51 -0000 The branch 2021Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ea11f7275de4a607ce907c11a2a5b44e22da554 commit 2ea11f7275de4a607ce907c11a2a5b44e22da554 Author: Bernard Spil AuthorDate: 2021-05-27 08:31:41 +0000 Commit: Bernard Spil CommitDate: 2021-06-14 07:18:36 +0000 www/apache24: Update to 2.4.48 Approved by: apache (with hat) (cherry picked from commit 1085fbd715563d82bb1eb5598a4448bce0de505d) --- www/apache24/Makefile | 3 +-- www/apache24/distinfo | 6 +++--- www/apache24/files/patch-modules_md_md__crypt.c | 15 +++++++++++++++ www/apache24/pkg-plist | 1 + 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 65ff86d8ffde..704004b81c7f 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,7 +1,6 @@ PORTNAME= apache24 -PORTVERSION= 2.4.46 -PORTREVISION= 2 +PORTVERSION= 2.4.48 CATEGORIES= www MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} diff --git a/www/apache24/distinfo b/www/apache24/distinfo index 14fc79191bd4..d3b592d7eb9a 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1596650554 -SHA256 (apache24/httpd-2.4.46.tar.bz2) = 740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea -SIZE (apache24/httpd-2.4.46.tar.bz2) = 7187805 +TIMESTAMP = 1621950856 +SHA256 (apache24/httpd-2.4.48.tar.bz2) = 1bc826e7b2e88108c7e4bf43c026636f77a41d849cfb667aa7b5c0b86dbf966c +SIZE (apache24/httpd-2.4.48.tar.bz2) = 7194385 diff --git a/www/apache24/files/patch-modules_md_md__crypt.c b/www/apache24/files/patch-modules_md_md__crypt.c new file mode 100644 index 000000000000..0969f6c99a5a --- /dev/null +++ b/www/apache24/files/patch-modules_md_md__crypt.c @@ -0,0 +1,15 @@ +Index: modules/md/md_crypt.c +--- modules/md/md_crypt.c.orig ++++ modules/md/md_crypt.c +@@ -71,6 +71,11 @@ + #include + #endif + ++#if defined(LIBRESSL_VERSION_NUMBER) ++#define EVP_PKEY_X25519 NID_X25519 ++#define EVP_PKEY_X448 NID_X448 ++#endif ++ + static int initialized; + + struct md_pkey_t { diff --git a/www/apache24/pkg-plist b/www/apache24/pkg-plist index 25962ee54f41..879ec822c7b5 100644 --- a/www/apache24/pkg-plist +++ b/www/apache24/pkg-plist @@ -46,6 +46,7 @@ include/apache24/http_log.h include/apache24/http_main.h include/apache24/http_protocol.h include/apache24/http_request.h +include/apache24/http_ssl.h include/apache24/http_vhost.h include/apache24/httpd.h include/apache24/mod_auth.h