[ptxdist] [PATCH 1/3] apache2: first try to update apache apr and apr-util

[Oliver Graute <oliver.graute@gmail.com>]

This is request for a first patch review.

first try to update apache2, apr and apr-util to a recent versions
 

Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
 rules/apache2.in    |    1 -
 rules/apache2.make  |   11 +++++++----
 rules/apr-util.in   |    1 -
 rules/apr-util.make |    9 +++++----
 rules/apr.make      |   13 ++++++++-----
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/rules/apache2.in b/rules/apache2.in
index 653f9cd..7441486 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
diff --git a/rules/apache2.make b/rules/apache2.make
index 98b628e..258f870 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -17,8 +17,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)
@@ -38,8 +38,11 @@ APACHE2_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
 	--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-expat=$(PTXDIST_SYSROOT_TARGET)/usr/include/apr-1
+	--with-ssl=$(PTXDIST_SYSROOT_TARGET)/usr/lib/ssl \
+	--enable-ssl=shared
 
 ifdef PTXCONF_APACHE2_MPM_PREFORK
 APACHE2_CONF_OPT += --with-mpm=prefork
diff --git a/rules/apr-util.in b/rules/apr-util.in
index aaacfad..6e53726 100644
--- a/rules/apr-util.in
+++ b/rules/apr-util.in
@@ -3,7 +3,6 @@
 config APR_UTIL
 	tristate
 	select APR
-	select HOST_APR_UTIL
 	select EXPAT
 	prompt "apr-util"
 	help
diff --git a/rules/apr-util.make b/rules/apr-util.make
index 821a838..3f3e401 100644
--- a/rules/apr-util.make
+++ b/rules/apr-util.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_APR_UTIL) += apr-util
 #
 # Paths and names
 #
-APR_UTIL_VERSION	:= 0.9.19
-APR_UTIL_MD5		:= 927a200513018a579cc9936c05d35206
+APR_UTIL_VERSION	:= 1.5.4
+APR_UTIL_MD5		:= 866825c04da827c6e5f53daff5569f42
 APR_UTIL		:= apr-util-$(APR_UTIL_VERSION)
 APR_UTIL_SUFFIX		:= tar.bz2
 APR_UTIL_URL		:= http://archive.apache.org/dist/apr/$(APR_UTIL).$(APR_UTIL_SUFFIX)
@@ -35,9 +35,10 @@ APR_UTIL_LICENSE	:= APLv2
 APR_UTIL_CONF_TOOL := autoconf
 APR_UTIL_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
-	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \
+	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \
 	--with-expat=$(PTXDIST_SYSROOT_TARGET)/usr
 
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -51,7 +52,7 @@ $(STATEDIR)/apr-util.targetinstall:
 	@$(call install_fixup, apr-util,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, apr-util,DESCRIPTION,missing)
 
-	@$(call install_lib, apr-util, 0, 0, 0644, libaprutil-0)
+	@$(call install_lib, apr-util, 0, 0, 0644, libaprutil-1)
 
 	@$(call install_finish, apr-util)
 
diff --git a/rules/apr.make b/rules/apr.make
index 9c3b11d..00b84e0 100644
--- a/rules/apr.make
+++ b/rules/apr.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_APR) += apr
 #
 # Paths and names
 #
-APR_VERSION	:= 0.9.20
-APR_MD5		:= 6dd59a88ee75b8cdf719a90b5a2f2485
+APR_VERSION	:= 1.5.1
+APR_MD5		:= d3538d67e6455f48cc935d8f0a50a1c3
 APR		:= apr-$(APR_VERSION)
 APR_SUFFIX	:= tar.bz2
 APR_URL		:= http://archive.apache.org/dist/apr/$(APR).$(APR_SUFFIX)
@@ -37,8 +37,11 @@ APR_CONF_ENV := \
 	ac_cv_struct_rlimit=yes \
 	apr_cv_mutex_robust_shared=no \
 	apr_cv_process_shared_works=yes \
+	ac_cv_func_setpgrp_void="yes" \
+	apr_cv_tcp_nodelay_with_cork="yes" \
+	ac_cv_sizeof_struct_iovec="8" \
+	apr_cv_mutex_recursive="yes" \
 	apr_cv_pthreads_lib="-lpthread"
-
 #
 # autoconf
 #
@@ -55,7 +58,7 @@ $(STATEDIR)/apr.install.post:
 	@$(call targetinfo)
 	@$(call world/install.post, APR)
 	sed -i -e "s~@SYSROOT@~${PTXDIST_SYSROOT_TARGET}~g" \
-		$(PTXDIST_SYSROOT_TARGET)/usr/build/apr_rules.mk
+		$(PTXDIST_SYSROOT_TARGET)/usr/build-1/apr_rules.mk
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -71,7 +74,7 @@ $(STATEDIR)/apr.targetinstall:
 	@$(call install_fixup, apr,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, apr,DESCRIPTION,missing)
 
-	@$(call install_lib, apr, 0, 0, 0644, libapr-0)
+	@$(call install_lib, apr, 0, 0, 0644, libapr-1)
 
 	@$(call install_finish, apr)
 
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de