From 37601bf0e32d234ebfa9ace57811caff5296c3f2 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 16:48:43 +0200 Subject: [PATCH 1/8] Fixed Apache 2.4.3 --- ...ache-2.4.3.patch => apache-2.4.3.patchset} | 113 ++++++++++++------ 1 file changed, 74 insertions(+), 39 deletions(-) rename www-servers/apache/patches/{apache-2.4.3.patch => apache-2.4.3.patchset} (67%) diff --git a/www-servers/apache/patches/apache-2.4.3.patch b/www-servers/apache/patches/apache-2.4.3.patchset similarity index 67% rename from www-servers/apache/patches/apache-2.4.3.patch rename to www-servers/apache/patches/apache-2.4.3.patchset index 714cf4479..e3906b955 100644 --- a/www-servers/apache/patches/apache-2.4.3.patch +++ b/www-servers/apache/patches/apache-2.4.3.patchset @@ -1,31 +1,14 @@ -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 /* for getpid() */ - #endif - --#if HAVE_SYS_SEM_H -+#if HAVE_SYS_SHM_H - #include - #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 @@ +From 0410108ac91734ad764c0c1a64e3e429ab86b0e6 Mon Sep 17 00:00:00 2001 +From: Nav +Date: Tue, 9 Dec 2014 19:29:31 +0000 +Subject: Fixing patch + + +diff --git a/httpd-2.4.3/acinclude.m4 b/httpd-2.4.3/acinclude.m4 +index 54defc2..b59b688 100644 +--- a/httpd-2.4.3/acinclude.m4 ++++ b/httpd-2.4.3/acinclude.m4 +@@ -4,25 +4,25 @@ dnl Autoconf 2.50 can not handle substr correctly. It does have 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. @@ -55,7 +38,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 APACHE_SUBST(abs_srcdir) APACHE_SUBST(bindir) APACHE_SUBST(sbindir) -@@ -112,14 +112,14 @@ +@@ -112,14 +112,14 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ dnl APACHE_GEN_MAKEFILES dnl Creates Makefiles @@ -72,7 +55,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1" ]) -@@ -128,7 +128,7 @@ +@@ -128,7 +128,7 @@ dnl APACHE_TYPE_RLIM_T dnl dnl If rlim_t is not defined, define it to int dnl @@ -81,7 +64,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [ AC_TRY_COMPILE([ #include -@@ -146,7 +146,7 @@ +@@ -146,7 +146,7 @@ AC_DEFUN(APACHE_TYPE_RLIM_T, [ ]) dnl APACHE_MODPATH_INIT(modpath) @@ -90,7 +73,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 current_dir=$1 modpath_current=modules/$1 modpath_static= -@@ -155,7 +155,7 @@ +@@ -155,7 +155,7 @@ AC_DEFUN(APACHE_MODPATH_INIT,[ > $modpath_current/modules.mk ])dnl dnl @@ -99,7 +82,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 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 @@ +@@ -168,7 +168,7 @@ AC_DEFUN(APACHE_MODPATH_FINISH,[ ])dnl dnl dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]]) @@ -108,7 +91,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 if test -z "$3"; then objects="mod_$1.lo" else -@@ -214,7 +214,7 @@ +@@ -214,7 +214,7 @@ dnl config -- configuration logic to run if the MPM is enabled dnl path -- relative path to MPM (default: server/mpm/mpmname) dnl libs -- libs needed by this MPM dnl @@ -117,7 +100,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 if ap_mpm_is_enabled $1; then if test -z "$3"; then objects="$1.lo" -@@ -291,7 +291,7 @@ +@@ -291,7 +291,7 @@ dnl current module. dnl prereq_module's APACHE_MODULE() statement must have been processed dnl before the current APACHE_MODULE() statement. dnl @@ -126,7 +109,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 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 @@ +@@ -392,7 +392,7 @@ AC_DEFUN(APACHE_MODULE,[ dnl dnl APACHE_ENABLE_MODULES dnl @@ -135,7 +118,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 module_selection=most module_default=shared -@@ -452,7 +452,7 @@ +@@ -452,7 +452,7 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[ ]) ]) @@ -144,7 +127,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 if test -z "$apache_cxx_done"; then AC_PROG_CXX AC_PROG_CXXCPP -@@ -466,7 +466,7 @@ +@@ -466,7 +466,7 @@ dnl dnl Configure for OpenSSL, giving preference to dnl "--with-ssl=" if it was specified. dnl @@ -153,7 +136,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 AC_CACHE_CHECK([for OpenSSL], [ac_cv_openssl], [ dnl initialise the variables we use ac_cv_openssl=no -@@ -576,14 +576,14 @@ +@@ -576,14 +576,14 @@ dnl Export (via APACHE_SUBST) the various path-related variables that dnl apache will use while generating scripts like autoconf and apxs and dnl the default config file. @@ -170,3 +153,55 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 APACHE_SUBST_EXPANDED_ARG(exec_prefix) APACHE_SUBST_EXPANDED_ARG(bindir) APACHE_SUBST_EXPANDED_ARG(sbindir) +diff --git a/httpd-2.4.3/modules/proxy/mod_proxy_connect.c b/httpd-2.4.3/modules/proxy/mod_proxy_connect.c +index 0cf5693..f4e958c 100644 +--- a/httpd-2.4.3/modules/proxy/mod_proxy_connect.c ++++ b/httpd-2.4.3/modules/proxy/mod_proxy_connect.c +@@ -254,7 +254,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker, + 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 --git a/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c b/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c +index a9b7ca2..178eea5 100644 +--- a/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c ++++ b/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c +@@ -33,7 +33,7 @@ + #include /* for getpid() */ + #endif + +-#if HAVE_SYS_SEM_H ++#if HAVE_SYS_SHM_H + #include + #if !defined(SHM_R) + #define SHM_R 0400 +-- +1.8.3.4 + + +From 9ed8aff5487da044a341bde882f1aa3132d5398f Mon Sep 17 00:00:00 2001 +From: Nav +Date: Mon, 15 Dec 2014 16:39:31 +0000 +Subject: Fixed redefinition error + + +diff --git a/httpd-2.4.3/server/Makefile.in b/httpd-2.4.3/server/Makefile.in +index 42d1fe5..9418843 100644 +--- a/httpd-2.4.3/server/Makefile.in ++++ b/httpd-2.4.3/server/Makefile.in +@@ -32,7 +32,7 @@ test_char.h: gen_test_char + util.lo: test_char.h + + EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) +-EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) ++EXPORT_DIRS_APR = $(APR_INCLUDEDIR) + + # If export_files is a dependency here, but we remove it during this stage, + # when exports.c is generated, make will not detect that export_files is no +-- +1.8.3.4 + From 275daa9bf77fdbec22ff7e2c30e8d85b098fa1cc Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 16:52:02 +0200 Subject: [PATCH 2/8] Fixed Apache 2.4.3 - Added recipe --- www-servers/apache/apache-2.4.3.recipe | 49 ++++++++++++++++++++------ 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 58bceb591..ff3bac8d9 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -1,22 +1,51 @@ +SUMMARY="Apache 2.4.3" DESCRIPTION="The Apache Web Server." HOMEPAGE="http://httpd.apache.org" -SRC_URI="http://apache.osuosl.org//httpd/httpd-2.4.3.tar.gz" +SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" +CHECKSUM_SHA256="7650e82554cd0b81160beb74e9a28e464bff8e2cb76cd7c95217fd50a5306716" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4 2 - dev-libs/apr-util >= 1.3.9" -CHECKSUM_MD5="538dccd22dd18466fff3ec7948495417" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDRY_ARCHITECTURES="x86" +SOURCE_DIR= + +PROVIDES=" + apache2$secondaryArchSuffix = $portVersion + cmd:apache2$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + lib:libapr_1$secondaryArchSuffix + lib:aprutil_1$secondaryArchSuffix >= 1.4.1 +" + +PATCHES="apache-2.4.3.patchset" + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:libtoolize + cmd:autom4te + cmd:gcc$secondaryArchSuffix + cmd:pcre_config + cmd:make + cmd:awk + " +BUILD_REQUIRES=" + devel:libapr_1$secondaryArchSuffix + devel:libaprutil_1$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libexpat$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + " + 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` + echo $relativeBinDir + echo $portPackageLinksDir/devel~libaprutil_1$secondaryArchSuffix + ./configure --with-apr=/$relativeBinDir --with-apr-util=/$relativeBinDir make } From dc46df0a98ad280241bbeb659cf5e318bb4d4b41 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 16:54:45 +0200 Subject: [PATCH 3/8] Updated recipe --- www-servers/apache/apache-2.4.3.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index ff3bac8d9..502a822cf 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -43,8 +43,7 @@ BUILD() libtoolize --force --copy --install aclocal autoconf - echo $relativeBinDir - echo $portPackageLinksDir/devel~libaprutil_1$secondaryArchSuffix + ./configure --with-apr=/$relativeBinDir --with-apr-util=/$relativeBinDir make } From 86bf66bba044ba5981af1a222ec0b345b86a5b15 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 21:49:34 +0200 Subject: [PATCH 4/8] Updated Apache recipe --- www-servers/apache/apache-2.4.3.recipe | 144 +++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 9 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 502a822cf..0fdf60ea4 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -4,22 +4,150 @@ HOMEPAGE="http://httpd.apache.org" SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" CHECKSUM_SHA256="7650e82554cd0b81160beb74e9a28e464bff8e2cb76cd7c95217fd50a5306716" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDRY_ARCHITECTURES="x86" -SOURCE_DIR= +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" +SOURCE_DIR="httpd-2.4.3" PROVIDES=" apache2$secondaryArchSuffix = $portVersion - cmd:apache2$secondaryArchSuffix = $portVersion + cmd:ab$secondaryArchSuffix + cmd:apachectl$secondaryArchSuffix + cmd:apxs$secondaryArchSuffix + cmd:checkgid$secondaryArchSuffix + cmd:dbmmanage$secondaryArchSuffix + cmd:envvars$secondaryArchSuffix + cmd:envvars_std$secondaryArchSuffix + cmd:fcgistarter$secondaryArchSuffix + cmd:htcacheclean$secondaryArchSuffix + cmd:htdbm$secondaryArchSuffix + cmd:htdigest$secondaryArchSuffix + cmd:htpasswd$secondaryArchSuffix + cmd:httpd$secondaryArchSuffix + cmd:httxt2dbm$secondaryArchSuffix + cmd:logresolve$secondaryArchSuffix + cmd:rotatelogs$secondaryArchSuffix + lib:mod_access_compat$secondaryArchSuffix + lib:mod_actions$secondaryArchSuffix + lib:mod_alias$secondaryArchSuffix + lib:mod_allowmethods$secondaryArchSuffix + lib:mod_auth_basic$secondaryArchSuffix + lib:mod_auth_digest$secondaryArchSuffix + lib:mod_auth_form$secondaryArchSuffix + lib:mod_authn_anon$secondaryArchSuffix + lib:mod_authn_core$secondaryArchSuffix + lib:mod_authn_dbd$secondaryArchSuffix + lib:mod_authn_dbm$secondaryArchSuffix + lib:mod_authn_file$secondaryArchSuffix + lib:mod_authn_socache$secondaryArchSuffix + lib:mod_authz_core$secondaryArchSuffix + lib:mod_authz_dbd$secondaryArchSuffix + lib:mod_authz_dbm$secondaryArchSuffix + lib:mod_authz_groupfile$secondaryArchSuffix + lib:mod_authz_host$secondaryArchSuffix + lib:mod_authz_owner$secondaryArchSuffix + lib:mod_authz_user$secondaryArchSuffix + lib:mod_autoindex$secondaryArchSuffix + lib:mod_buffer$secondaryArchSuffix + lib:mod_cache$secondaryArchSuffix + lib:mod_cache_disk$secondaryArchSuffix + lib:mod_cgid$secondaryArchSuffix + lib:mod_dav$secondaryArchSuffix + lib:mod_dav_fs$secondaryArchSuffix + lib:mod_dbd$secondaryArchSuffix + lib:mod_dir$secondaryArchSuffix + lib:mod_dumpio$secondaryArchSuffix + lib:mod_env$secondaryArchSuffix + lib:mod_expires$secondaryArchSuffix + lib:mod_ext_filter$secondaryArchSuffix + lib:mod_file_cache$secondaryArchSuffix + lib:mod_filter$secondaryArchSuffix + lib:mod_headers$secondaryArchSuffix + lib:mod_include$secondaryArchSuffix + lib:mod_info$secondaryArchSuffix + lib:mod_lbmethod_bybusyness$secondaryArchSuffix + lib:mod_lbmethod_byrequests$secondaryArchSuffix + lib:mod_lbmethod_bytraffic$secondaryArchSuffix + lib:mod_lbmethod_heartbeat$secondaryArchSuffix + lib:mod_log_config$secondaryArchSuffix + lib:mod_log_debug$secondaryArchSuffix + lib:mod_logio$secondaryArchSuffix + lib:mod_mime$secondaryArchSuffix + lib:mod_negotiation$secondaryArchSuffix + lib:mod_proxy$secondaryArchSuffix + lib:mod_proxy_ajp$secondaryArchSuffix + lib:mod_proxy_balancer$secondaryArchSuffix + lib:mod_proxy_connect$secondaryArchSuffix + lib:mod_proxy_express$secondaryArchSuffix + lib:mod_proxy_fcgi$secondaryArchSuffix + lib:mod_proxy_ftp$secondaryArchSuffix + lib:mod_proxy_http$secondaryArchSuffix + lib:mod_proxy_scgi$secondaryArchSuffix + lib:mod_ratelimit$secondaryArchSuffix + lib:mod_remoteip$secondaryArchSuffix + lib:mod_reqtimeout$secondaryArchSuffix + lib:mod_request$secondaryArchSuffix + lib:mod_rewrite$secondaryArchSuffix + lib:mod_sed$secondaryArchSuffix + lib:mod_session$secondaryArchSuffix + lib:mod_session_cookie$secondaryArchSuffix + lib:mod_session_dbd$secondaryArchSuffix + lib:mod_setenvif$secondaryArchSuffix + lib:mod_slotmem_shm$secondaryArchSuffix + lib:mod_socache_dbm$secondaryArchSuffix + lib:mod_socache_memcache$secondaryArchSuffix + lib:mod_socache_shmcb$secondaryArchSuffix + lib:mod_speling$secondaryArchSuffix + lib:mod_status$secondaryArchSuffix + lib:mod_substitute$secondaryArchSuffix + lib:mod_unique_id$secondaryArchSuffix + lib:mod_unixd$secondaryArchSuffix + lib:mod_userdir$secondaryArchSuffix + lib:mod_version$secondaryArchSuffix + lib:mod_vhost_alias$secondaryArchSuffix " REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion lib:libapr_1$secondaryArchSuffix - lib:aprutil_1$secondaryArchSuffix >= 1.4.1 + lib:libaprutil_1$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libpcre$secondaryArchSuffix " PATCHES="apache-2.4.3.patchset" +GLOBAL_WRITABLE_FILES=" + settings/extra/httpd-autoindex.conf keep-old + settings/extra/httpd-dav.conf keep-old + settings/extra/httpd-default.conf keep-old + settings/extra/httpd-info.conf keep-old + settings/extra/httpd-languages.conf keep-old + settings/extra/httpd-manual.conf keep-old + settings/extra/httpd-mpm.conf keep-old + settings/extra/httpd-multilang-errordoc.conf keep-old + settings/extra/httpd-ssl.conf keep-old + settings/extra/httpd-userdir.conf keep-old + settings/extra/httpd-vhosts.conf keep-old + settings/extra/proxy-html.conf keep-old + settings/httpd.conf keep-old + settings/magic keep-old + settings/mime.types keep-old + settings/original/extra/httpd-autoindex.conf keep-old + settings/original/extra/httpd-dav.conf keep-old + settings/original/extra/httpd-default.conf keep-old + settings/original/extra/httpd-info.conf keep-old + settings/original/extra/httpd-languages.conf keep-old + settings/original/extra/httpd-manual.conf keep-old + settings/original/extra/httpd-mpm.conf keep-old + settings/original/extra/httpd-multilang-errordoc.conf keep-old + settings/original/extra/httpd-ssl.conf keep-old + settings/original/extra/httpd-userdir.conf keep-old + settings/original/extra/httpd-vhosts.conf keep-old + settings/original/extra/proxy-html.conf keep-old + settings/original/httpd.conf keep-old +" + BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:libtoolize @@ -30,6 +158,7 @@ BUILD_PREREQUIRES=" cmd:awk " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libapr_1$secondaryArchSuffix devel:libaprutil_1$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -39,24 +168,21 @@ BUILD_REQUIRES=" BUILD() { - cd httpd-2.4.3 libtoolize --force --copy --install aclocal autoconf - ./configure --with-apr=/$relativeBinDir --with-apr-util=/$relativeBinDir + runConfigure ./configure --with-apr=/$relativeBinDir --with-apr-util=/$relativeBinDir make } INSTALL() { - cd httpd-2.4.3 make install } TEST() { - cd httpd-2.4.3 make test } From 8bbc2101f9587fd71058c71c605350b641eb1e17 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 21:53:31 +0200 Subject: [PATCH 5/8] Updated Apache 2.4.3 recipe --- www-servers/apache/apache-2.4.3.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 0fdf60ea4..741666b88 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -151,7 +151,7 @@ GLOBAL_WRITABLE_FILES=" BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:libtoolize - cmd:autom4te + cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:pcre_config cmd:make From dba95e89acb2f0f37cb8348bbf0abeddb32e2ea4 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 21:56:29 +0200 Subject: [PATCH 6/8] Updated Apache 2.4.3 recipe, updated revision --- www-servers/apache/apache-2.4.3.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 741666b88..9190e0dd5 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -3,7 +3,7 @@ DESCRIPTION="The Apache Web Server." HOMEPAGE="http://httpd.apache.org" SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" CHECKSUM_SHA256="7650e82554cd0b81160beb74e9a28e464bff8e2cb76cd7c95217fd50a5306716" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="httpd-2.4.3" From ec82f204f9b3d1e3ac2ac9b9b0cd5e719a2849ed Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 23:13:04 +0200 Subject: [PATCH 7/8] Updated summary and description --- www-servers/apache/apache-2.4.3.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 9190e0dd5..102912f25 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -1,5 +1,5 @@ -SUMMARY="Apache 2.4.3" -DESCRIPTION="The Apache Web Server." +SUMMARY="Apache HTTP Server 2.4.3" +DESCRIPTION="The Apache HTTP Server Project is a collaborative software development effort aimed at creating a robust, commercial-grade, featureful, and freely-available source code implementation of an HTTP (Web) server" HOMEPAGE="http://httpd.apache.org" SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" CHECKSUM_SHA256="7650e82554cd0b81160beb74e9a28e464bff8e2cb76cd7c95217fd50a5306716" From 50097924a868b47a961e9596c9fff5e1b112a5fe Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 23:30:51 +0200 Subject: [PATCH 8/8] Removed TEST block --- www-servers/apache/apache-2.4.3.recipe | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 102912f25..d0a7c4bf3 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -1,4 +1,4 @@ -SUMMARY="Apache HTTP Server 2.4.3" +SUMMARY="The Number One HTTP Server On The Internet" DESCRIPTION="The Apache HTTP Server Project is a collaborative software development effort aimed at creating a robust, commercial-grade, featureful, and freely-available source code implementation of an HTTP (Web) server" HOMEPAGE="http://httpd.apache.org" SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" @@ -181,10 +181,5 @@ INSTALL() make install } -TEST() -{ - make test -} - LICENSE="Apache v2" COPYRIGHT="2012 The Apache Software Foundation."