haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apache: bump to 2.4.37, make some important changes.

Browse Source 
* The modules were previously installed directly in /system/lib/.
  Now the are being installed in /system/lib/apache/.

* On x86 secondary arch the modules are now being installed in
  /system/lib/x86/apache/, and we can re-enable that arch.

* The "httpd.conf" file, as well as two subdirectories, "extra"
  and "original", were previously installed in /system/settings/.
  Now they are being installed in /system/settings/apache/.

* Several directories ("build", "cgi-bin", "error", "htdocs",
  "icons" and "manual") which were previously installed in
  /system/data/ are now being installed in /system/data/apache/.
  Remark: Although "cgi-bin", "htdocs" and "icons" could have been
  kept in /system/data/, having "build", "error" and "manual" in
  /system/data/ was definitely wrong. Hence the global move.

* Move GLOBAL_WRITABLE_FILES before PROVIDES.
This commit is contained in:
fbrosson
2018-10-23 20:13:41 +00:00
parent 089bd3a0bc
commit 9c5bf79cd8
2 changed files with 130 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

251
www-servers/apache/apache-2.4.35.recipe → www-servers/apache/apache-2.4.37.recipe
View File

@@ -7,7 +7,7 @@ COPYRIGHT="1995-2018 The Apache Software Foundation."
LICENSE="Apache v2"
REVISION="1"
SOURCE_URI="https://archive.apache.org/dist/httpd/httpd-$portVersion.tar.bz2"
CHECKSUM_SHA256="2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56"
CHECKSUM_SHA256="3498dc5c6772fac2eb7307dc7963122ffe243b5e806e0be4fb51974ff759d726"
SOURCE_DIR="httpd-$portVersion"
PATCHES="apache-$portVersion.patchset"
@@ -22,6 +22,37 @@ then
commandSuffix=
fi
GLOBAL_WRITABLE_FILES="
settings/apache/extra/httpd-autoindex.conf keep-old
settings/apache/extra/httpd-dav.conf keep-old
settings/apache/extra/httpd-default.conf keep-old
settings/apache/extra/httpd-info.conf keep-old
settings/apache/extra/httpd-languages.conf keep-old
settings/apache/extra/httpd-manual.conf keep-old
settings/apache/extra/httpd-mpm.conf keep-old
settings/apache/extra/httpd-multilang-errordoc.conf keep-old
settings/apache/extra/httpd-ssl.conf keep-old
settings/apache/extra/httpd-userdir.conf keep-old
settings/apache/extra/httpd-vhosts.conf keep-old
settings/apache/extra/proxy-html.conf keep-old
settings/apache/httpd.conf keep-old
settings/apache/magic keep-old
settings/apache/mime.types keep-old
settings/apache/original/extra/httpd-autoindex.conf keep-old
settings/apache/original/extra/httpd-dav.conf keep-old
settings/apache/original/extra/httpd-default.conf keep-old
settings/apache/original/extra/httpd-info.conf keep-old
settings/apache/original/extra/httpd-languages.conf keep-old
settings/apache/original/extra/httpd-manual.conf keep-old
settings/apache/original/extra/httpd-mpm.conf keep-old
settings/apache/original/extra/httpd-multilang-errordoc.conf keep-old
settings/apache/original/extra/httpd-ssl.conf keep-old
settings/apache/original/extra/httpd-userdir.conf keep-old
settings/apache/original/extra/httpd-vhosts.conf keep-old
settings/apache/original/extra/proxy-html.conf keep-old
settings/apache/original/httpd.conf keep-old
"
PROVIDES="
apache$secondaryArchSuffix = $portVersion
cmd:ab$commandSuffix
@@ -151,37 +182,6 @@ CONFLICTS="
"
fi
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_REQUIRES="
devel:libapr_1$secondaryArchSuffix
devel:libaprutil_1$secondaryArchSuffix
@@ -219,92 +219,93 @@ defineDebugInfoPackage apache$secondaryArchSuffix \
"$commandBinDir"/httxt2dbm \
"$commandBinDir"/logresolve \
"$commandBinDir"/rotatelogs \
"$libDir"/mod_access_compat.so \
"$libDir"/mod_actions.so \
"$libDir"/mod_alias.so \
"$libDir"/mod_allowmethods.so \
"$libDir"/mod_auth_basic.so \
"$libDir"/mod_auth_digest.so \
"$libDir"/mod_auth_form.so \
"$libDir"/mod_authn_anon.so \
"$libDir"/mod_authn_core.so \
"$libDir"/mod_authn_dbd.so \
"$libDir"/mod_authn_dbm.so \
"$libDir"/mod_authn_file.so \
"$libDir"/mod_authn_socache.so \
"$libDir"/mod_authz_core.so \
"$libDir"/mod_authz_dbd.so \
"$libDir"/mod_authz_dbm.so \
"$libDir"/mod_authz_groupfile.so \
"$libDir"/mod_authz_host.so \
"$libDir"/mod_authz_owner.so \
"$libDir"/mod_authz_user.so \
"$libDir"/mod_autoindex.so \
"$libDir"/mod_buffer.so \
"$libDir"/mod_cache.so \
"$libDir"/mod_cache_disk.so \
"$libDir"/mod_cache_socache.so \
"$libDir"/mod_cgid.so \
"$libDir"/mod_dav.so \
"$libDir"/mod_dav_fs.so \
"$libDir"/mod_dbd.so \
"$libDir"/mod_dir.so \
"$libDir"/mod_dumpio.so \
"$libDir"/mod_env.so \
"$libDir"/mod_expires.so \
"$libDir"/mod_ext_filter.so \
"$libDir"/mod_file_cache.so \
"$libDir"/mod_filter.so \
"$libDir"/mod_headers.so \
"$libDir"/mod_include.so \
"$libDir"/mod_info.so \
"$libDir"/mod_lbmethod_bybusyness.so \
"$libDir"/mod_lbmethod_byrequests.so \
"$libDir"/mod_lbmethod_bytraffic.so \
"$libDir"/mod_lbmethod_heartbeat.so \
"$libDir"/mod_log_config.so \
"$libDir"/mod_log_debug.so \
"$libDir"/mod_logio.so \
"$libDir"/mod_macro.so \
"$libDir"/mod_mime.so \
"$libDir"/mod_negotiation.so \
"$libDir"/mod_proxy.so \
"$libDir"/mod_proxy_ajp.so \
"$libDir"/mod_proxy_balancer.so \
"$libDir"/mod_proxy_connect.so \
"$libDir"/mod_proxy_express.so \
"$libDir"/mod_proxy_fcgi.so \
"$libDir"/mod_proxy_fdpass.so \
"$libDir"/mod_proxy_ftp.so \
"$libDir"/mod_proxy_hcheck.so \
"$libDir"/mod_proxy_http.so \
"$libDir"/mod_proxy_scgi.so \
"$libDir"/mod_proxy_uwsgi.so \
"$libDir"/mod_proxy_wstunnel.so \
"$libDir"/mod_ratelimit.so \
"$libDir"/mod_remoteip.so \
"$libDir"/mod_reqtimeout.so \
"$libDir"/mod_request.so \
"$libDir"/mod_rewrite.so \
"$libDir"/mod_sed.so \
"$libDir"/mod_session.so \
"$libDir"/mod_session_cookie.so \
"$libDir"/mod_session_dbd.so \
"$libDir"/mod_setenvif.so \
"$libDir"/mod_slotmem_shm.so \
"$libDir"/mod_socache_dbm.so \
"$libDir"/mod_socache_memcache.so \
"$libDir"/mod_socache_shmcb.so \
"$libDir"/mod_speling.so \
"$libDir"/mod_ssl.so \
"$libDir"/mod_status.so \
"$libDir"/mod_substitute.so \
"$libDir"/mod_unique_id.so \
"$libDir"/mod_unixd.so \
"$libDir"/mod_userdir.so \
"$libDir"/mod_version.so \
"$libDir"/mod_vhost_alias.so \
"$libDir"/mod_watchdog.so
"$libDir"/apache/mod_access_compat.so \
"$libDir"/apache/mod_actions.so \
"$libDir"/apache/mod_alias.so \
"$libDir"/apache/mod_allowmethods.so \
"$libDir"/apache/mod_auth_basic.so \
"$libDir"/apache/mod_auth_digest.so \
"$libDir"/apache/mod_auth_form.so \
"$libDir"/apache/mod_authn_anon.so \
"$libDir"/apache/mod_authn_core.so \
"$libDir"/apache/mod_authn_dbd.so \
"$libDir"/apache/mod_authn_dbm.so \
"$libDir"/apache/mod_authn_file.so \
"$libDir"/apache/mod_authn_socache.so \
"$libDir"/apache/mod_authz_core.so \
"$libDir"/apache/mod_authz_dbd.so \
"$libDir"/apache/mod_authz_dbm.so \
"$libDir"/apache/mod_authz_groupfile.so \
"$libDir"/apache/mod_authz_host.so \
"$libDir"/apache/mod_authz_owner.so \
"$libDir"/apache/mod_authz_user.so \
"$libDir"/apache/mod_autoindex.so \
"$libDir"/apache/mod_buffer.so \
"$libDir"/apache/mod_cache.so \
"$libDir"/apache/mod_cache_disk.so \
"$libDir"/apache/mod_cache_socache.so \
"$libDir"/apache/mod_cgid.so \
"$libDir"/apache/mod_dav.so \
"$libDir"/apache/mod_dav_fs.so \
"$libDir"/apache/mod_dbd.so \
"$libDir"/apache/mod_dir.so \
"$libDir"/apache/mod_dumpio.so \
"$libDir"/apache/mod_env.so \
"$libDir"/apache/mod_expires.so \
"$libDir"/apache/mod_ext_filter.so \
"$libDir"/apache/mod_file_cache.so \
"$libDir"/apache/mod_filter.so \
"$libDir"/apache/mod_headers.so \
"$libDir"/apache/mod_include.so \
"$libDir"/apache/mod_info.so \
"$libDir"/apache/mod_lbmethod_bybusyness.so \
"$libDir"/apache/mod_lbmethod_byrequests.so \
"$libDir"/apache/mod_lbmethod_bytraffic.so \
"$libDir"/apache/mod_lbmethod_heartbeat.so \
"$libDir"/apache/mod_log_config.so \
"$libDir"/apache/mod_log_debug.so \
"$libDir"/apache/mod_logio.so \
"$libDir"/apache/mod_macro.so \
"$libDir"/apache/mod_mime.so \
"$libDir"/apache/mod_negotiation.so \
"$libDir"/apache/mod_proxy.so \
"$libDir"/apache/mod_proxy_ajp.so \
"$libDir"/apache/mod_proxy_balancer.so \
"$libDir"/apache/mod_proxy_connect.so \
"$libDir"/apache/mod_proxy_express.so \
"$libDir"/apache/mod_proxy_fcgi.so \
"$libDir"/apache/mod_proxy_fdpass.so \
"$libDir"/apache/mod_proxy_ftp.so \
"$libDir"/apache/mod_proxy_hcheck.so \
"$libDir"/apache/mod_proxy_http.so \
"$libDir"/apache/mod_proxy_scgi.so \
"$libDir"/apache/mod_proxy_uwsgi.so \
"$libDir"/apache/mod_proxy_wstunnel.so \
"$libDir"/apache/mod_ratelimit.so \
"$libDir"/apache/mod_remoteip.so \
"$libDir"/apache/mod_reqtimeout.so \
"$libDir"/apache/mod_request.so \
"$libDir"/apache/mod_rewrite.so \
"$libDir"/apache/mod_sed.so \
"$libDir"/apache/mod_session.so \
"$libDir"/apache/mod_session_cookie.so \
"$libDir"/apache/mod_session_dbd.so \
"$libDir"/apache/mod_setenvif.so \
"$libDir"/apache/mod_slotmem_shm.so \
"$libDir"/apache/mod_socache_dbm.so \
"$libDir"/apache/mod_socache_memcache.so \
"$libDir"/apache/mod_socache_shmcb.so \
"$libDir"/apache/mod_speling.so \
"$libDir"/apache/mod_ssl.so \
"$libDir"/apache/mod_status.so \
"$libDir"/apache/mod_substitute.so \
"$libDir"/apache/mod_unique_id.so \
"$libDir"/apache/mod_unixd.so \
"$libDir"/apache/mod_userdir.so \
"$libDir"/apache/mod_version.so \
"$libDir"/apache/mod_vhost_alias.so \
"$libDir"/apache/mod_watchdog.so \
BUILD()
{
@@ -312,8 +313,12 @@ BUILD()
aclocal
autoconf
runConfigure --omit-dirs "binDir sbinDir" ./configure \
--bindir "$commandBinDir" \
runConfigure --omit-dirs "binDir sbinDir libExecDir dataDir" ./configure \
--bindir="$commandBinDir" \
--sbindir="$commandBinDir" \
--datadir="$dataDir"/apache \
--libexecdir="$libDir"/apache \
--sysconfdir="$sysconfDir"/apache \
--with-apr=/$relativeBinDir \
--with-apr-util=/$relativeBinDir
make $jobArgs
@@ -323,9 +328,13 @@ INSTALL()
{
make install
# Replace "/packages/apache-*/.settings" by "/boot/system/settings"
# Replace "/packages/apache-*/.self" by "/boot/system"
# Comment out directives that would otherwise need a daemon user and group.
sed -i \
-e "s|$sysconfDir|`finddir B_SYSTEM_SETTINGS_DIRECTORY`|" \
-e "s|$prefix|`finddir B_SYSTEM_DIRECTORY`|" \
-e "s/^User daemon/#&/" \
-e "s/^Group daemon/#&/" \
"$settingsDir"/httpd.conf
"$settingsDir"/apache/httpd.conf
}

0
www-servers/apache/patches/apache-2.4.35.patchset → www-servers/apache/patches/apache-2.4.37.patchset
View File