wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-09 00:23:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

apache: fix for libressl-2.7

Browse source
This commit is contained in:
Enno Boland 2018-04-23 11:57:14 +02:00
parent 94ad1b1008
commit e1366e8e73
No known key found for this signature in database
GPG key ID: D09964719BDE9971
3 changed files with 13 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
srcpkgs/apache/patches/fix-libressl-2.7.patch Normal file
View file

@ -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

36
srcpkgs/apache/patches/fix-libressl.patch
View file

@ -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 <math.h>

2
srcpkgs/apache/template
View file

@ -1,7 +1,7 @@
# Template file for 'apache' # Template file for 'apache'
pkgname=apache pkgname=apache
version=2.4.29 version=2.4.29
revision=2 revision=3
wrksrc=httpd-${version} wrksrc=httpd-${version}
build_style=gnu-configure build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all