Apache: bump, provides fix, debuginfo, bindir, general cleanup (#2549)

This commit is contained in:
miqlas
2018-05-20 16:57:18 +02:00
committed by waddlesplash
parent 3eb34686be
commit 4d9b6491f0
2 changed files with 132 additions and 23 deletions

View File

@@ -3,35 +3,43 @@ 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="https://httpd.apache.org/"
COPYRIGHT="1995-2016 The Apache Software Foundation."
COPYRIGHT="1995-2018 The Apache Software Foundation."
LICENSE="Apache v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://archive.apache.org/dist/httpd/httpd-$portVersion.tar.gz"
CHECKSUM_SHA256="948e4a11278a5954698b880b30f401b1e9ab743713ee2c7280a54dd4ddd87085"
CHECKSUM_SHA256="cd34636caf03c9a897ddfc928fc866c965f23d909b9612880563a7ad0d1a7e5b"
SOURCE_DIR="httpd-$portVersion"
PATCHES="apache-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
commandBinDir="$binDir"
commandSuffix=$secondaryArchSuffix
if [ "$targetArchitecture" = x86_gcc2 ]
then
commandBinDir="$prefix/bin"
commandSuffix=
fi
PROVIDES="
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
apache$secondaryArchSuffix = $portVersion
cmd:ab$commandSuffix
cmd:apachectl$commandSuffix
cmd:apxs$commandSuffix
cmd:checkgid$commandSuffix
cmd:dbmmanage$commandSuffix
cmd:envvars$commandSuffix
cmd:envvars_std$commandSuffix
cmd:fcgistarter$commandSuffix
cmd:htcacheclean$commandSuffix
cmd:htdbm$commandSuffix
cmd:htdigest$commandSuffix
cmd:htpasswd$commandSuffix
cmd:httpd$commandSuffix
cmd:httxt2dbm$commandSuffix
cmd:logresolve$commandSuffix
cmd:rotatelogs$commandSuffix
lib:mod_access_compat$secondaryArchSuffix
lib:mod_actions$secondaryArchSuffix
lib:mod_alias$secondaryArchSuffix
@@ -92,6 +100,7 @@ PROVIDES="
lib:mod_proxy_hcheck$secondaryArchSuffix
lib:mod_proxy_http$secondaryArchSuffix
lib:mod_proxy_scgi$secondaryArchSuffix
lib:mod_proxy_uwsgi$secondaryArchSuffix
lib:mod_proxy_wstunnel$secondaryArchSuffix
lib:mod_ratelimit$secondaryArchSuffix
lib:mod_remoteip$secondaryArchSuffix
@@ -176,19 +185,119 @@ BUILD_PREREQUIRES="
cmd:autoconf
cmd:awk
cmd:gcc$secondaryArchSuffix
cmd:libtoolize
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:pcre_config
cmd:pcre_config$secondaryArchSuffix
"
defineDebugInfoPackage apache$secondaryArchSuffix \
"$commandBinDir"/ab \
"$commandBinDir"/checkgid \
"$commandBinDir"/fcgistarter \
"$commandBinDir"/htcacheclean \
"$commandBinDir"/htdbm \
"$commandBinDir"/htdigest \
"$commandBinDir"/htpasswd \
"$commandBinDir"/httpd \
"$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
BUILD()
{
libtoolize --force --copy --install
aclocal
autoconf
runConfigure ./configure \
runConfigure --omit-dirs "binDir sbinDir" ./configure \
--bindir "$commandBinDir" \
--with-apr=/$relativeBinDir \
--with-apr-util=/$relativeBinDir
make $jobArgs