git: 2ea11f7275de - 2021Q2 - www/apache24: Update to 2.4.48

[Bernard Spil]

The branch 2021Q2 has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2ea11f7275de4a607ce907c11a2a5b44e22da554

commit 2ea11f7275de4a607ce907c11a2a5b44e22da554
Author:     Bernard Spil <brnrd at FreeBSD.org>
AuthorDate: 2021-05-27 08:31:41 +0000
Commit:     Bernard Spil <brnrd at FreeBSD.org>
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 <openssl/ct.h>
+ #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