diff --git a/srcpkgs/apache/patches/fix-libressl-2.7.patch b/srcpkgs/apache/patches/fix-libressl-2.7.patch new file mode 100644 index 0000000000..bdd5926bf5 --- /dev/null +++ b/srcpkgs/apache/patches/fix-libressl-2.7.patch @@ -0,0 +1,12 @@ +LibreSSL 2.7 supports newer OpenSSL APIs. Remove special handling for libreSSL. +--- modules/ssl/ssl_private.h.orig 2018-04-23 11:51:35.849536609 +0200 ++++ modules/ssl/ssl_private.h 2018-04-23 11:51:49.578557354 +0200 +@@ -123,7 +123,7 @@ + #define MODSSL_SSL_METHOD_CONST + #endif + +-#if defined(LIBRESSL_VERSION_NUMBER) ++#if 0 + /* Missing from LibreSSL */ + #if LIBRESSL_VERSION_NUMBER < 0x2060000f + #define SSL_CTRL_SET_MIN_PROTO_VERSION 123 diff --git a/srcpkgs/apache/patches/fix-libressl.patch b/srcpkgs/apache/patches/fix-libressl.patch deleted file mode 100644 index 258812e8b4..0000000000 --- a/srcpkgs/apache/patches/fix-libressl.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- ./modules/ssl/ssl_private.h.orig -+++ ./modules/ssl/ssl_private.h -@@ -123,6 +123,16 @@ - #define MODSSL_SSL_METHOD_CONST - #endif - -+#if defined(LIBRESSL_VERSION_NUMBER) -+/* Missing from LibreSSL */ -+#define SSL_CTRL_SET_MIN_PROTO_VERSION 123 -+#define SSL_CTRL_SET_MAX_PROTO_VERSION 124 -+#define SSL_CTX_set_min_proto_version(ctx, version) \ -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL) -+#define SSL_CTX_set_max_proto_version(ctx, version) \ -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL) -+#endif -+ - #if defined(OPENSSL_FIPS) - #define HAVE_FIPS - #endif ---- ./support/ab.c.orig -+++ ./support/ab.c -@@ -197,6 +197,14 @@ - #if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) - #define HAVE_TLSEXT - #endif -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2060000f -+# define SSL_CTRL_SET_MIN_PROTO_VERSION 123 -+# define SSL_CTRL_SET_MAX_PROTO_VERSION 124 -+#define SSL_CTX_set_min_proto_version(ctx, version) \ -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL) -+#define SSL_CTX_set_max_proto_version(ctx, version) \ -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL) -+#endif - #endif - - #include diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 2ca6d35d8d..e68dc8e09c 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.4.29 -revision=2 +revision=3 wrksrc=httpd-${version} build_style=gnu-configure configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all