Updated apache version, bep and patch by GCI2012 student Tri-Edge AI.

2026-05-06 06:58:57 +02:00 · 2012-12-02 19:30:34 +00:00
parent dd0a98be21
commit e0e038d07b
2 changed files with 205 additions and 0 deletions
--- a/www-servers/apache/apache-2.4.3.bep
+++ b/www-servers/apache/apache-2.4.3.bep
@@ -0,0 +1,33 @@
+DESCRIPTION="The Apache Web Server." 
+HOMEPAGE="http://httpd.apache.org" 
+SRC_URI="http://apache.osuosl.org//httpd/httpd-2.4.3.tar.gz"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-libs/apr >= 1.4 2
+	dev-libs/apr-util >= 1.3.9"
+CHECKSUM_MD5="538dccd22dd18466fff3ec7948495417"
+BUILD {
+	cd httpd-2.4.3
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
+		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+		--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
+		--with-z=`finddir B_COMMON_LIB_DIRECTORY`
+	make
+}
+
+INSTALL {
+	cd httpd-2.4.3
+	make install
+}
+
+TEST {
+	cd httpd-2.4.3
+	make test
+}
+
+LICENSE="Apache v2"
+COPYRIGHT="2012 The Apache Software Foundation."
--- a/www-servers/apache/patches/apache-2.4.3.patch
+++ b/www-servers/apache/patches/apache-2.4.3.patch
@@ -0,0 +1,172 @@
+diff -urN httpd-2.4.3/modules/proxy/mod_proxy_connect.c httpd-2.4.3-haiku/modules/proxy/mod_proxy_connect.c
+--- httpd-2.4.3/modules/proxy/mod_proxy_connect.c	2012-07-28 14:40:23.041680896 +0000
+++ httpd-2.4.3-haiku/modules/proxy/mod_proxy_connect.c	2012-12-02 06:58:17.131072000 +0000
+@@ -254,7 +254,7 @@
+     rv = apr_sockaddr_info_get(&nexthop, connectname, APR_UNSPEC, 
+                                connectport, 0, p);
+     if (rv != APR_SUCCESS) {
+-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO()
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, 
+                       "failed to resolve hostname '%s'", connectname);
+         return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                              apr_pstrcat(p, "DNS lookup failure for: ",
+diff -urN httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c httpd-2.4.3-haiku/modules/slotmem/mod_slotmem_shm.c
+--- httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c	2012-04-03 13:36:55.037224448 +0000
+++ httpd-2.4.3-haiku/modules/slotmem/mod_slotmem_shm.c	2012-12-02 06:58:40.734265344 +0000
+@@ -33,7 +33,7 @@
+ #include <unistd.h>         /* for getpid() */
+ #endif
+ 
+-#if HAVE_SYS_SEM_H
+#if HAVE_SYS_SHM_H
+ #include <sys/shm.h>
+ #if !defined(SHM_R)
+ #define SHM_R 0400
+diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4
+--- httpd-2.4.3/acinclude.m4	2012-07-23 15:20:48.061341696 +0000
+++ httpd-2.4.3-haiku/acinclude.m4	2012-12-02 15:18:03.000000000 +0000
+@@ -4,25 +4,25 @@
+ dnl AC_HELP_STRING, so let's try to call it if we can.
+ dnl Note: this define must be on one line so that it can be properly returned
+ dnl as the help string.
+-AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[  ]$1 substr([                       ],len($1))$2)])dnl
+AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[  ]$1 substr([                       ],len($1))$2)])dnl
+ 
+ dnl APACHE_SUBST(VARIABLE)
+ dnl Makes VARIABLE available in generated files
+ dnl (do not use @variable@ in Makefiles, but $(variable))
+-AC_DEFUN(APACHE_SUBST,[
+AC_DEFUN([APACHE_SUBST],[
+   APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1"
+   AC_SUBST($1)
+ ])
+ 
+ dnl APACHE_FAST_OUTPUT(FILENAME)
+ dnl Perform substitutions on FILENAME (Makefiles only)
+-AC_DEFUN(APACHE_FAST_OUTPUT,[
+AC_DEFUN([APACHE_FAST_OUTPUT],[
+   APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1"
+ ])
+ 
+ dnl APACHE_GEN_CONFIG_VARS
+ dnl Creates config_vars.mk
+-AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
+AC_DEFUN([APACHE_GEN_CONFIG_VARS],[
+   APACHE_SUBST(abs_srcdir)
+   APACHE_SUBST(bindir)
+   APACHE_SUBST(sbindir)
+@@ -112,14 +112,14 @@
+ 
+ dnl APACHE_GEN_MAKEFILES
+ dnl Creates Makefiles
+-AC_DEFUN(APACHE_GEN_MAKEFILES,[
+AC_DEFUN([APACHE_GEN_MAKEFILES],[
+   $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES
+ ])
+ 
+ dnl ## APACHE_OUTPUT(file)
+ dnl ## adds "file" to the list of files generated by AC_OUTPUT
+ dnl ## This macro can be used several times.
+-AC_DEFUN(APACHE_OUTPUT, [
+AC_DEFUN([APACHE_OUTPUT], [
+   APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1"
+ ])
+ 
+@@ -128,7 +128,7 @@
+ dnl
+ dnl If rlim_t is not defined, define it to int
+ dnl
+-AC_DEFUN(APACHE_TYPE_RLIM_T, [
+AC_DEFUN([APACHE_TYPE_RLIM_T], [
+   AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [
+     AC_TRY_COMPILE([
+ #include <sys/types.h>
+@@ -146,7 +146,7 @@
+ ])
+ 
+ dnl APACHE_MODPATH_INIT(modpath)
+-AC_DEFUN(APACHE_MODPATH_INIT,[
+AC_DEFUN([APACHE_MODPATH_INIT],[
+   current_dir=$1
+   modpath_current=modules/$1
+   modpath_static=
+@@ -155,7 +155,7 @@
+   > $modpath_current/modules.mk
+ ])dnl
+ dnl
+-AC_DEFUN(APACHE_MODPATH_FINISH,[
+AC_DEFUN([APACHE_MODPATH_FINISH],[
+   echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
+   echo "static = $modpath_static" >> $modpath_current/modules.mk
+   echo "shared = $modpath_shared" >> $modpath_current/modules.mk
+@@ -168,7 +168,7 @@
+ ])dnl
+ dnl
+ dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]])
+-AC_DEFUN(APACHE_MODPATH_ADD,[
+AC_DEFUN([APACHE_MODPATH_ADD],[
+   if test -z "$3"; then
+     objects="mod_$1.lo"
+   else
+@@ -214,7 +214,7 @@
+ dnl path     -- relative path to MPM (default: server/mpm/mpmname)
+ dnl libs     -- libs needed by this MPM
+ dnl
+-AC_DEFUN(APACHE_MPM_MODULE,[
+AC_DEFUN([APACHE_MPM_MODULE],[
+     if ap_mpm_is_enabled $1; then
+         if test -z "$3"; then
+             objects="$1.lo"
+@@ -291,7 +291,7 @@
+ dnl   prereq_module's APACHE_MODULE() statement must have been processed
+ dnl   before the current APACHE_MODULE() statement.
+ dnl
+-AC_DEFUN(APACHE_MODULE,[
+AC_DEFUN([APACHE_MODULE],[
+   AC_MSG_CHECKING(whether to enable mod_$1)
+   define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
+   AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),force_$1=$enableval,enable_$1=ifelse($5,,maybe-all,$5))
+@@ -392,7 +392,7 @@
+ dnl
+ dnl APACHE_ENABLE_MODULES
+ dnl
+-AC_DEFUN(APACHE_ENABLE_MODULES,[
+AC_DEFUN([APACHE_ENABLE_MODULES],[
+   module_selection=most
+   module_default=shared
+ 
+@@ -452,7 +452,7 @@
+   ])
+ ])
+ 
+-AC_DEFUN(APACHE_REQUIRE_CXX,[
+AC_DEFUN([APACHE_REQUIRE_CXX],[
+   if test -z "$apache_cxx_done"; then
+     AC_PROG_CXX
+     AC_PROG_CXXCPP
+@@ -466,7 +466,7 @@
+ dnl Configure for OpenSSL, giving preference to
+ dnl "--with-ssl=<path>" if it was specified.
+ dnl
+-AC_DEFUN(APACHE_CHECK_OPENSSL,[
+AC_DEFUN([APACHE_CHECK_OPENSSL],[
+   AC_CACHE_CHECK([for OpenSSL], [ac_cv_openssl], [
+     dnl initialise the variables we use
+     ac_cv_openssl=no
+@@ -576,14 +576,14 @@
+ dnl apache will use while generating scripts like autoconf and apxs and
+ dnl the default config file.
+ 
+-AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[
+AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[
+   APR_EXPAND_VAR(exp_$1, [$]$1)
+   APACHE_SUBST(exp_$1)
+   APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix})
+   APACHE_SUBST(rel_$1)
+ ])
+ 
+-AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[
+AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[
+   APACHE_SUBST_EXPANDED_ARG(exec_prefix)
+   APACHE_SUBST_EXPANDED_ARG(bindir)
+   APACHE_SUBST_EXPANDED_ARG(sbindir)