From a0a5725916c50e8289766a3bc1dee3de9b618ddc Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Tue, 14 Aug 2018 10:12:57 +0200 Subject: [PATCH] apache: update to 2.4.34. --- srcpkgs/apache/patches/libressl-2.7.patch | 13 ------------- srcpkgs/apache/template | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/srcpkgs/apache/patches/libressl-2.7.patch b/srcpkgs/apache/patches/libressl-2.7.patch index c3d3b7c7d12..e75f47d4fe3 100644 --- a/srcpkgs/apache/patches/libressl-2.7.patch +++ b/srcpkgs/apache/patches/libressl-2.7.patch @@ -1,16 +1,3 @@ -diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c -index 66682ea..9cc7862 100644 ---- ./modules/md/md_crypt.c -+++ ./modules/md/md_crypt.c -@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppkey, apr_pool_t *p, md_pkey_spec_t *spec) - } - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000f) - - #ifndef NID_tlsfeature - #define NID_tlsfeature 1020 diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index 48d64cb..2392019 100644 --- ./modules/ssl/mod_ssl.c diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 9a13ed3b9a4..8038697be06 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,6 +1,6 @@ # Template file for 'apache' pkgname=apache -version=2.4.33 +version=2.4.34 revision=1 wrksrc=httpd-${version} build_style=gnu-configure @@ -36,7 +36,7 @@ maintainer="Juan RP " homepage="http://httpd.apache.org/" license="Apache-2.0" distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2" -checksum=de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05 +checksum=fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0 system_accounts="_$pkgname" _apache_homedir="/srv/www/$pkgname"