From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-we0-x230.google.com ([2a00:1450:400c:c03::230]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YT68v-0007pi-1M for ptxdist@pengutronix.de; Wed, 04 Mar 2015 11:03:05 +0100 Received: by wesw55 with SMTP id w55so45161121wes.5 for ; Wed, 04 Mar 2015 02:02:59 -0800 (PST) From: Oliver Graute Date: Wed, 4 Mar 2015 11:02:54 +0100 Message-Id: <1425463375-10237-1-git-send-email-oliver.graute@neuhaus.de> Subject: [ptxdist] [PATCHv3 1/2] apache2: version update to 2.4.12 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Oliver Graute 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 --- 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 +# 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute # # 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