apache: switch to libressl.
This commit is contained in:
parent
d0ca8d3803
commit
906a36ee4c
2 changed files with 30 additions and 2 deletions
28
srcpkgs/apache/patches/libressl.patch
Normal file
28
srcpkgs/apache/patches/libressl.patch
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
--- modules/ssl/ssl_engine_init.c.orig 2014-07-15 18:48:00.382044224 +0200
|
||||||
|
+++ modules/ssl/ssl_engine_init.c 2014-07-15 18:48:35.452335112 +0200
|
||||||
|
@@ -275,9 +275,11 @@ apr_status_t ssl_init_Engine(server_rec
|
||||||
|
return ssl_die(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK
|
||||||
|
if (strEQ(mc->szCryptoDevice, "chil")) {
|
||||||
|
ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
|
||||||
|
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01889)
|
||||||
|
--- modules/ssl/ssl_engine_rand.c.orig 2014-07-15 18:49:13.853653603 +0200
|
||||||
|
+++ modules/ssl/ssl_engine_rand.c 2014-07-15 18:49:49.180946663 +0200
|
||||||
|
@@ -86,9 +86,11 @@ int ssl_rand_seed(server_rec *s, apr_poo
|
||||||
|
* seed in contents provided by the external
|
||||||
|
* Entropy Gathering Daemon (EGD)
|
||||||
|
*/
|
||||||
|
+#ifdef HAVE_SSL_RAND_EGD
|
||||||
|
if ((n = RAND_egd(pRandSeed->cpPath)) == -1)
|
||||||
|
continue;
|
||||||
|
nDone += n;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {
|
||||||
|
struct {
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'apache'
|
# Template file for 'apache'
|
||||||
pkgname=apache
|
pkgname=apache
|
||||||
version=2.4.9
|
version=2.4.9
|
||||||
revision=2
|
revision=3
|
||||||
wrksrc=httpd-${version}
|
wrksrc=httpd-${version}
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--prefix= --enable-pie --enable-modules=all
|
configure_args="--prefix= --enable-pie --enable-modules=all
|
||||||
|
@ -21,7 +21,7 @@ configure_args="--prefix= --enable-pie --enable-modules=all
|
||||||
--enable-rewrite --with-pcre=/usr --enable-layout=XBPS --sysconfdir=/etc/httpd"
|
--enable-rewrite --with-pcre=/usr --enable-layout=XBPS --sysconfdir=/etc/httpd"
|
||||||
hostmakedepends="pkg-config perl"
|
hostmakedepends="pkg-config perl"
|
||||||
makedepends="zlib-devel libuuid-devel pcre-devel>=8.30
|
makedepends="zlib-devel libuuid-devel pcre-devel>=8.30
|
||||||
openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
|
libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
|
||||||
conf_files="
|
conf_files="
|
||||||
/etc/httpd/extra/httpd-autoindex.conf
|
/etc/httpd/extra/httpd-autoindex.conf
|
||||||
/etc/httpd/extra/httpd-dav.conf
|
/etc/httpd/extra/httpd-dav.conf
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue