From 86bf66bba044ba5981af1a222ec0b345b86a5b15 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 21:49:34 +0200 Subject: [PATCH] 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 }