apache: update to 2.4.16.
This commit is contained in:
parent
759238fac5
commit
b31e33e37b
2 changed files with 3 additions and 34 deletions
|
@ -1,28 +0,0 @@
|
||||||
--- 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.12
|
version=2.4.16
|
||||||
revision=5
|
revision=1
|
||||||
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
|
||||||
|
@ -43,7 +43,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
homepage="http://httpd.apache.org/"
|
homepage="http://httpd.apache.org/"
|
||||||
license="Apache-2.0"
|
license="Apache-2.0"
|
||||||
distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2"
|
distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2"
|
||||||
checksum=ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4
|
checksum=ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743
|
||||||
|
|
||||||
system_accounts="httpd"
|
system_accounts="httpd"
|
||||||
httpd_descr="Apache HTTP server"
|
httpd_descr="Apache HTTP server"
|
||||||
|
@ -55,9 +55,6 @@ make_dirs="
|
||||||
/srv/httpd/cgi-bin 755 root httpd"
|
/srv/httpd/cgi-bin 755 root httpd"
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
# SSL_CTX_use_certificate_chain() conflicts with libressl-2.1.
|
|
||||||
sed -e 's,SSL_CTX_use_certificate_chain,_SSL_CTX_use_certificate_chain,g' -i modules/ssl/*.[ch]
|
|
||||||
|
|
||||||
# set default user
|
# set default user
|
||||||
sed -e 's#User daemon#User httpd#' \
|
sed -e 's#User daemon#User httpd#' \
|
||||||
-e 's#Group daemon#Group httpd#' \
|
-e 's#Group daemon#Group httpd#' \
|
||||||
|
|
Loading…
Reference in a new issue