diff options
| -rw-r--r-- | www/apache24/Makefile | 2 | ||||
| -rw-r--r-- | www/apache24/distinfo | 6 | ||||
| -rw-r--r-- | www/apache24/files/patch-modules_md_md__crypt.c | 19 |
3 files changed, 4 insertions, 23 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index a07e619b0bab..d3890b17811b 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.34 +PORTVERSION= 2.4.35 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} diff --git a/www/apache24/distinfo b/www/apache24/distinfo index df0d8357363b..85815bb5df94 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531769087 -SHA256 (apache24/httpd-2.4.34.tar.bz2) = fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0 -SIZE (apache24/httpd-2.4.34.tar.bz2) = 6942969 +TIMESTAMP = 1537900540 +SHA256 (apache24/httpd-2.4.35.tar.bz2) = 2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56 +SIZE (apache24/httpd-2.4.35.tar.bz2) = 7044336 diff --git a/www/apache24/files/patch-modules_md_md__crypt.c b/www/apache24/files/patch-modules_md_md__crypt.c deleted file mode 100644 index 2fd107698ef9..000000000000 --- a/www/apache24/files/patch-modules_md_md__crypt.c +++ /dev/null @@ -1,19 +0,0 @@ -Upstream https://svn.apache.org/viewvc?view=revision&revision=1836096 - -On the 2.4.x branch: - -merge r1836095 from trunk: -* using the, hopefully correct, ever elusive libressl version numbering check - for the new openssl API calls, fixes PR 62548. - ---- modules/md/md_crypt.c.orig 2018-06-29 11:53:50 UTC -+++ modules/md/md_crypt.c -@@ -52,7 +52,7 @@ - - #if defined(LIBRESSL_VERSION_NUMBER) - /* Missing from LibreSSL */ --#define MD_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x2080000f) -+#define MD_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x2070000f) - #else /* defined(LIBRESSL_VERSION_NUMBER) */ - #define MD_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L) - #endif |