From: Oliver Graute <oliver.graute@gmail.com>
To: ptxdist@pengutronix.de
Cc: Oliver Graute <oliver.graute@neuhaus.de>
Subject: [ptxdist] [PATCHv3 1/2] apache2: version update to 2.4.12
Date: Wed, 4 Mar 2015 11:02:54 +0100 [thread overview]
Message-ID: <1425463375-10237-1-git-send-email-oliver.graute@neuhaus.de> (raw)
this patch update apache2 to version 2.4.12
apr-util in version 1.5.4 is required
and apr in version 1.5.1 is required
Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
rules/apache2.in | 7 +++++-
rules/apache2.make | 71 +++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 73 insertions(+), 5 deletions(-)
diff --git a/rules/apache2.in b/rules/apache2.in
index 653f9cd..46dffa2 100644
--- a/rules/apache2.in
+++ b/rules/apache2.in
@@ -5,7 +5,6 @@ menuconfig APACHE2
prompt "apache 2 http server "
select APR
select APR_UTIL
- select HOST_APACHE2
select LIBC_M
select LIBC_RT
select LIBC_DL
@@ -42,6 +41,12 @@ choice
help
Multi Process model with threads.
One acceptor thread, multiple worker threads.
+
+ config APACHE2_MPM_EVENT
+ bool "event"
+ help
+ A variant of the worker MPM with the goal
+ of consuming threads only for connections with active processing
endchoice
comment "runtime options ---"
diff --git a/rules/apache2.make b/rules/apache2.make
index 98b628e..3d22c59 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2005 by Robert Schwebel
# 2009, 2012 by Marc Kleine-Budde <mkl@pengutronix.de>
+# 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute <oliver.graute@neuhaus.de>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -17,8 +18,8 @@ PACKAGES-$(PTXCONF_APACHE2) += apache2
#
# Paths and names
#
-APACHE2_VERSION := 2.0.64
-APACHE2_MD5 := 762e250a3b981ce666bc10e6748a1ac1
+APACHE2_VERSION := 2.4.12
+APACHE2_MD5 := b8dc8367a57a8d548a9b4ce16d264a13
APACHE2 := httpd-$(APACHE2_VERSION)
APACHE2_SUFFIX := tar.bz2
APACHE2_URL := http://archive.apache.org/dist/httpd/$(APACHE2).$(APACHE2_SUFFIX)
@@ -36,10 +37,13 @@ APACHE2_LICENSE := APLv2
APACHE2_CONF_TOOL := autoconf
APACHE2_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ ap_cv_void_ptr_lt_long=4 \
--includedir=/usr/include/apache2 \
--enable-so \
- --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \
- --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-config
+ --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \
+ --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-1-config \
+ --with-ssl=$(PTXDIST_SYSROOT_TARGET)/usr/lib/ssl \
+ --enable-ssl=shared
ifdef PTXCONF_APACHE2_MPM_PREFORK
APACHE2_CONF_OPT += --with-mpm=prefork
@@ -53,6 +57,11 @@ ifdef PTXCONF_APACHE2_MPM_WORKER
APACHE2_CONF_OPT += --with-mpm=worker
endif
+ifdef PTXCONF_APACHE2_MPM_EVENT
+APACHE2_CONF_OPT += --with-mpm=event
+endif
+
+
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
@@ -85,6 +94,9 @@ $(STATEDIR)/apache2.targetinstall:
@$(call install_copy, apache2, 0, 0, 0755, \
$(APACHE2_PKGDIR)/usr/bin/httpd, /usr/sbin/apache2)
+ @$(call install_copy, apache2, www, www, 644, $(APACHE2_PKGDIR)/usr/htdocs/index.html, \
+ $(PTXCONF_APACHE2_SERVERROOT)/htdocs/index.html)
+
ifneq ($(PTXCONF_APACHE2_SERVERROOT),"")
@$(call install_copy, apache2, www, www, 0755, $(PTXCONF_APACHE2_SERVERROOT))
@@ -129,6 +141,57 @@ endif
$(PTXCONF_APACHE2_SERVERROOT)/conf/magic)
@$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/etc/mime.types, \
$(PTXCONF_APACHE2_SERVERROOT)/conf/mime.types)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_ssl.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_ssl.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_unixd.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_unixd.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_authz_core.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_authz_core.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_authz_host.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_authz_host.so)
+ $(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_authz_user.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_authz_user.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_authn_core.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_authn_core.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_rewrite.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_rewrite.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_dir.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_dir.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_access_compat.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_access_compat.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_dumpio.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_dumpio.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_mime.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_mime.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_socache_shmcb.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_socache_shmcb.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_authn_file.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_authn_file.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_authz_groupfile.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_authz_groupfile.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_auth_basic.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_auth_basic.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_reqtimeout.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_reqtimeout.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_filter.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_filter.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_log_config.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_log_config.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_env.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_env.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_headers.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_headers.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_setenvif.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_setenvif.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_version.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_version.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_status.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_status.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_alias.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_alias.so)
+ @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_autoindex.so, \
+ $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_autoindex.so)
+
endif
--
1.7.9.5
--
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2015-03-04 10:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-04 10:02 Oliver Graute [this message]
2015-03-04 10:02 ` [ptxdist] [PATCHv3 2/2] apache2: added patches for apache 2.4.12 Oliver Graute
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425463375-10237-1-git-send-email-oliver.graute@neuhaus.de \
--to=oliver.graute@gmail.com \
--cc=oliver.graute@neuhaus.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox