diff options
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/apache/Manifest | 3 | ||||
-rw-r--r-- | www-servers/apache/apache-2.4.57-r6.ebuild | 254 | ||||
-rw-r--r-- | www-servers/apache/apache-2.4.57.ebuild | 264 | ||||
-rw-r--r-- | www-servers/apache/files/apache-2.4.54-libtool.patch | 21 | ||||
-rw-r--r-- | www-servers/apache/files/apache-2.4.54-no-which.patch | 54 | ||||
-rw-r--r-- | www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch | 51 |
6 files changed, 0 insertions, 647 deletions
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 8589eae..5f16518 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,5 +1,2 @@ -DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2 -DIST gentoo-apache-2.4.57-r5-20231011.tar.bz2 27081 BLAKE2B 7d98c850cda8b43901b4373e36889e4e951615e2e2769baa564f44e180fba0a74f0af45d2aa552b70ac1609aa3430e240118f2656c5285d31c1dd5edad9f3b6d SHA512 6c445212aaa211a9ad24599763e1d42b5f88394976f8f488175ce3ec3ea7e83b93f87d3c0c4ffc82b4a13ae575e78fba114bc5bacae9324be962eba48d3bc146 DIST gentoo-apache-2.4.58-20231019.tar.bz2 26224 BLAKE2B 370f36dcbe9d10ed0dd415c2e28016c7897246b5c3f830e849e765c18a08be145c8a363f122dff2c4b8d5b1e53ff504a79d7512a58135899a539136b580524ed SHA512 60f68eb4168a86ee33525e7c90cf5af8da586ed31d12cc294ea6bf3bcb9f254ea7e1a4ca5db4846a0e92b97c1326f095aa3a9d5fdb9ed92c1c4726c5a825ab36 -DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155 DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1 diff --git a/www-servers/apache/apache-2.4.57-r6.ebuild b/www-servers/apache/apache-2.4.57-r6.ebuild deleted file mode 100644 index 10a9925..0000000 --- a/www-servers/apache/apache-2.4.57-r6.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# latest gentoo apache files -GENTOO_PATCHSTAMP="20231011" -GENTOO_DEVELOPER="graaff" -GENTOO_PATCHNAME="gentoo-apache-2.4.57-r5" - -# IUSE/USE_EXPAND magic -IUSE_MPMS_FORK="prefork" -IUSE_MPMS_THREAD="event worker" - -# << obsolete modules: -# authn_default authz_default mem_cache -# mem_cache is replaced by cache_disk -# ?? buggy modules -# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found -# >> added modules for reason: -# compat: compatibility with 2.2 access control -# authz_host: new module for access control -# authn_core: functionality provided by authn_alias in previous versions -# authz_core: new module, provides core authorization capabilities -# cache_disk: replacement for mem_cache -# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 -# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 -# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 -# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 -# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). -# socache_shmcb: shared object cache provider. Default config with ssl needs it -# unixd: fixes startup error: Invalid command 'User' -IUSE_MODULES="access_compat actions alias allowmethods asis auth_basic auth_digest auth_form -authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core -authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex -brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock -dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2 -ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness -lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation -proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi -proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout -session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache -socache_shmcb speling status substitute systemd tls unique_id userdir usertrack -unixd version vhost_alias watchdog xml2enc" -# The following are also in the source as of this version, but are not available -# for user selection: -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export -# optional_fn_import optional_hook_export optional_hook_import - -# inter-module dependencies -# TODO: this may still be incomplete -MODULE_DEPENDS=" - auth_form:session - brotli:filter - dav_fs:dav - dav_lock:dav - deflate:filter - cache_disk:cache - ext_filter:filter - file_cache:cache - lbmethod_byrequests:proxy_balancer - lbmethod_byrequests:slotmem_shm - lbmethod_bytraffic:proxy_balancer - lbmethod_bybusyness:proxy_balancer - lbmethod_heartbeat:proxy_balancer - log_forensic:log_config - logio:log_config - cache_disk:cache - cache_socache:cache - md:watchdog - mime_magic:mime - proxy_ajp:proxy - proxy_balancer:proxy - proxy_balancer:slotmem_shm - proxy_connect:proxy - proxy_ftp:proxy - proxy_hcheck:proxy - proxy_hcheck:watchdog - proxy_html:proxy - proxy_html:xml2enc - proxy_http:proxy - proxy_http2:proxy - proxy_scgi:proxy - proxy_uwsgi:proxy - proxy_fcgi:proxy - proxy_wstunnel:proxy - session_cookie:session - session_dbd:dbd - session_dbd:session - socache_memcache:cache - substitute:filter -" - -# module<->define mappings -MODULE_DEFINES=" - auth_digest:AUTH_DIGEST - authnz_ldap:AUTHNZ_LDAP - cache:CACHE - cache_disk:CACHE - cache_socache:CACHE - dav:DAV - dav_fs:DAV - dav_lock:DAV - file_cache:CACHE - http2:HTTP2 - info:INFO - ldap:LDAP - lua:LUA - md:SSL - proxy:PROXY - proxy_ajp:PROXY - proxy_balancer:PROXY - proxy_connect:PROXY - proxy_fcgi:PROXY - proxy_ftp:PROXY - proxy_hcheck:PROXY - proxy_html:PROXY - proxy_http:PROXY - proxy_http2:PROXY - proxy_scgi:PROXY - proxy_uwsgi:PROXY - proxy_wstunnel:PROXY - socache_shmcb:SSL - socache_memcache:CACHE - ssl:SSL - status:STATUS - suexec:SUEXEC - systemd:SYSTEMD - userdir:USERDIR -" - -# critical modules for the default config -MODULE_CRITICAL=" - authn_core - authz_core - authz_host - dir - mime - unixd -" -inherit apache-2 systemd tmpfiles toolchain-funcs - -DESCRIPTION="The Apache Web Server" -HOMEPAGE="https://httpd.apache.org/" - -# some helper scripts are Apache-1.1, thus both are here -LICENSE="Apache-2.0 Apache-1.1" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris" - -PATCHES=( "${FILESDIR}"/${PN}-2.4.57-libressl.patch ) - -pkg_setup() { - # dependent critical modules which are not allowed in global scope due - # to USE flag conditionals (bug #499260) - use ssl && MODULE_CRITICAL+=" socache_shmcb" - use doc && MODULE_CRITICAL+=" alias negotiation setenvif" - apache-2_pkg_setup -} - -src_configure() { - # Brain dead check. - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" - - apache-2_src_configure -} - -src_compile() { - if tc-is-cross-compiler ; then - # This header is the same across targets, so use the build compiler. - pushd server >/dev/null - emake gen_test_char - tc-export_build_env BUILD_CC - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ - gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die - popd >/dev/null - fi - - default -} - -src_install() { - apache-2_src_install - local i - local apache_tools_prune_list=( - /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm} - /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs} - /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1} - /usr/share/man/man8/{rotatelogs.8,htcacheclean.8} - ) - for i in ${apache_tools_prune_list[@]} ; do - rm "${ED}"/${i} || die "Failed to prune apache-tools bits" - done - - dobin support/apxs - - # Note: wait for mod_systemd to be included in some forthcoming release, - # Then apache2.4.service can be used and systemd support controlled - # through --enable-systemd - systemd_newunit "${FILESDIR}/apache2.4-hardened.service" "apache2.service" - dotmpfiles "${FILESDIR}/apache.conf" - #insinto /etc/apache2/modules.d - #doins "${FILESDIR}/00_systemd.conf" - - # Install http2 module config - insinto /etc/apache2/modules.d - doins "${FILESDIR}"/41_mod_http2.conf - - # Fix path to apache libdir - sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die -} - -pkg_postinst() { - apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" - - tmpfiles_process apache.conf #662544 - - # warnings that default config might not work out of the box - local mod cmod - for mod in ${MODULE_CRITICAL} ; do - if ! use "apache2_modules_${mod}"; then - echo - ewarn "Warning: Critical module not installed!" - ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" - ewarn "are highly recomended but might not be in the base profile yet." - ewarn "Default config for ssl needs module 'socache_shmcb'." - ewarn "Enabling the following flags is highly recommended:" - for cmod in ${MODULE_CRITICAL} ; do - use "apache2_modules_${cmod}" || \ - ewarn "+ apache2_modules_${cmod}" - done - echo - break - fi - done - # warning for proxy_balancer and missing load balancing scheduler - if use apache2_modules_proxy_balancer; then - local lbset= - for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do - if use "apache2_modules_${mod}"; then - lbset=1 && break - fi - done - if [[ ! ${lbset} ]] ; then - echo - ewarn "Info: Missing load balancing scheduler algorithm module" - ewarn "(They were split off from proxy_balancer in 2.3)" - ewarn "In order to get the ability of load balancing, at least" - ewarn "one of these modules has to be present:" - ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" - echo - fi - fi -} diff --git a/www-servers/apache/apache-2.4.57.ebuild b/www-servers/apache/apache-2.4.57.ebuild deleted file mode 100644 index 47ead73..0000000 --- a/www-servers/apache/apache-2.4.57.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# latest gentoo apache files -GENTOO_PATCHSTAMP="20210212" -GENTOO_DEVELOPER="polynomial-c" -GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6" - -# ancient hack: bug #502384 -IUSE="split-usr" - -# IUSE/USE_EXPAND magic -IUSE_MPMS_FORK="prefork" -IUSE_MPMS_THREAD="event worker" - -# << obsolete modules: -# authn_default authz_default mem_cache -# mem_cache is replaced by cache_disk -# ?? buggy modules -# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found -# >> added modules for reason: -# compat: compatibility with 2.2 access control -# authz_host: new module for access control -# authn_core: functionality provided by authn_alias in previous versions -# authz_core: new module, provides core authorization capabilities -# cache_disk: replacement for mem_cache -# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 -# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 -# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 -# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 -# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). -# socache_shmcb: shared object cache provider. Default config with ssl needs it -# unixd: fixes startup error: Invalid command 'User' -IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form -authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core -authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex -brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock -dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2 -ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness -lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation -proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi -proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout -session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache -socache_shmcb speling status substitute systemd tls unique_id userdir usertrack -unixd version vhost_alias watchdog xml2enc" -# The following are also in the source as of this version, but are not available -# for user selection: -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export -# optional_fn_import optional_hook_export optional_hook_import - -# inter-module dependencies -# TODO: this may still be incomplete -MODULE_DEPENDS=" - auth_form:session - brotli:filter - dav_fs:dav - dav_lock:dav - deflate:filter - cache_disk:cache - ext_filter:filter - file_cache:cache - lbmethod_byrequests:proxy_balancer - lbmethod_byrequests:slotmem_shm - lbmethod_bytraffic:proxy_balancer - lbmethod_bybusyness:proxy_balancer - lbmethod_heartbeat:proxy_balancer - log_forensic:log_config - logio:log_config - cache_disk:cache - cache_socache:cache - md:watchdog - mime_magic:mime - proxy_ajp:proxy - proxy_balancer:proxy - proxy_balancer:slotmem_shm - proxy_connect:proxy - proxy_ftp:proxy - proxy_hcheck:proxy - proxy_hcheck:watchdog - proxy_html:proxy - proxy_html:xml2enc - proxy_http:proxy - proxy_http2:proxy - proxy_scgi:proxy - proxy_uwsgi:proxy - proxy_fcgi:proxy - proxy_wstunnel:proxy - session_cookie:session - session_dbd:dbd - session_dbd:session - socache_memcache:cache - substitute:filter -" - -# module<->define mappings -MODULE_DEFINES=" - auth_digest:AUTH_DIGEST - authnz_ldap:AUTHNZ_LDAP - cache:CACHE - cache_disk:CACHE - cache_socache:CACHE - dav:DAV - dav_fs:DAV - dav_lock:DAV - file_cache:CACHE - http2:HTTP2 - info:INFO - ldap:LDAP - lua:LUA - md:SSL - proxy:PROXY - proxy_ajp:PROXY - proxy_balancer:PROXY - proxy_connect:PROXY - proxy_ftp:PROXY - proxy_html:PROXY - proxy_http:PROXY - proxy_hcheck:PROXY - proxy_fcgi:PROXY - proxy_scgi:PROXY - proxy_wstunnel:PROXY - socache_shmcb:SSL - socache_memcache:CACHE - ssl:SSL - status:STATUS - suexec:SUEXEC - systemd:SYSTEMD - userdir:USERDIR -" - -# critical modules for the default config -MODULE_CRITICAL=" - authn_core - authz_core - authz_host - dir - mime - unixd -" -inherit apache-2 systemd tmpfiles toolchain-funcs - -DESCRIPTION="The Apache Web Server" -HOMEPAGE="https://httpd.apache.org/" - -# some helper scripts are Apache-1.1, thus both are here -LICENSE="Apache-2.0 Apache-1.1" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.57-libressl.patch - "${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868 - "${FILESDIR}"/${PN}-2.4.54-libtool.patch # bug #858836 - "${FILESDIR}"/${P}-rustls-ffi-0.10.0.patch # bug #906523 -) - -pkg_setup() { - # dependent critical modules which are not allowed in global scope due - # to USE flag conditionals (bug #499260) - use ssl && MODULE_CRITICAL+=" socache_shmcb" - use doc && MODULE_CRITICAL+=" alias negotiation setenvif" - apache-2_pkg_setup -} - -src_configure() { - # Brain dead check. - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" - - apache-2_src_configure -} - -src_compile() { - if tc-is-cross-compiler ; then - # This header is the same across targets, so use the build compiler. - pushd server >/dev/null - emake gen_test_char - tc-export_build_env BUILD_CC - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ - gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die - popd >/dev/null - fi - - default -} - -src_install() { - apache-2_src_install - local i - local apache_tools_prune_list=( - /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm} - /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs} - /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1} - /usr/share/man/man8/{rotatelogs.8,htcacheclean.8} - ) - for i in ${apache_tools_prune_list[@]} ; do - rm "${ED}"/${i} || die "Failed to prune apache-tools bits" - done - - # install apxs in /usr/bin (bug #502384) and put a symlink into the - # old location until all ebuilds and eclasses have been modified to - # use the new location. - dobin support/apxs - use split-usr && dosym ../bin/apxs /usr/sbin/apxs - - # Note: wait for mod_systemd to be included in some forthcoming release, - # Then apache2.4.service can be used and systemd support controlled - # through --enable-systemd - systemd_newunit "${FILESDIR}/apache2.4-hardened.service" "apache2.service" - dotmpfiles "${FILESDIR}/apache.conf" - #insinto /etc/apache2/modules.d - #doins "${FILESDIR}/00_systemd.conf" - - # Install http2 module config - insinto /etc/apache2/modules.d - doins "${FILESDIR}"/41_mod_http2.conf - - # Fix path to apache libdir - sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die -} - -pkg_postinst() { - apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" - - tmpfiles_process apache.conf #662544 - - # warnings that default config might not work out of the box - local mod cmod - for mod in ${MODULE_CRITICAL} ; do - if ! use "apache2_modules_${mod}"; then - echo - ewarn "Warning: Critical module not installed!" - ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" - ewarn "are highly recomended but might not be in the base profile yet." - ewarn "Default config for ssl needs module 'socache_shmcb'." - ewarn "Enabling the following flags is highly recommended:" - for cmod in ${MODULE_CRITICAL} ; do - use "apache2_modules_${cmod}" || \ - ewarn "+ apache2_modules_${cmod}" - done - echo - break - fi - done - # warning for proxy_balancer and missing load balancing scheduler - if use apache2_modules_proxy_balancer; then - local lbset= - for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do - if use "apache2_modules_${mod}"; then - lbset=1 && break - fi - done - if [[ ! ${lbset} ]] ; then - echo - ewarn "Info: Missing load balancing scheduler algorithm module" - ewarn "(They were split off from proxy_balancer in 2.3)" - ewarn "In order to get the ability of load balancing, at least" - ewarn "one of these modules has to be present:" - ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" - echo - fi - fi -} diff --git a/www-servers/apache/files/apache-2.4.54-libtool.patch b/www-servers/apache/files/apache-2.4.54-libtool.patch deleted file mode 100644 index a0d55d8..0000000 --- a/www-servers/apache/files/apache-2.4.54-libtool.patch +++ /dev/null @@ -1,21 +0,0 @@ -Bug: https://bugs.gentoo.org/858836 - -From: orbea <orbea@riseup.net> -Date: Tue, 19 Jul 2022 07:46:36 -0700 -Subject: [PATCH] build: Fix the build with slibtool - -Adding LT_INIT to configure.in generates the libtool script in the build -directory which is required by rlibtool to determine if the build is -shared or static. - ---- a/configure.in -+++ b/configure.in -@@ -398,7 +398,7 @@ AC_PATH_PROG(RSYNC, rsync) - AC_PATH_PROG(SVN, svn) - AC_PROG_AWK - AC_PROG_LN_S --AC_CHECK_TOOL(RANLIB, ranlib, true) -+LT_INIT - dnl AC_PATH_PROG(PERL_PATH, perl) - AC_CHECK_PROGS(LYNX_PATH,[lynx links elinks], [lynx]) - diff --git a/www-servers/apache/files/apache-2.4.54-no-which.patch b/www-servers/apache/files/apache-2.4.54-no-which.patch deleted file mode 100644 index 65764df..0000000 --- a/www-servers/apache/files/apache-2.4.54-no-which.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://bugs.gentoo.org/844868 -https://bz.apache.org/bugzilla/show_bug.cgi?id=66130 ---- a/build/aix/buildaix.ksh -+++ b/build/aix/buildaix.ksh -@@ -26,14 +26,14 @@ export CFLAGS='-O2 -qlanglvl=extc99' - lslpp -L bos.adt.insttools >/dev/null - [[ $? -ne 0 ]] && echo "must have bos.adt.insttools installed" && exit -1 - --apr_config=`which apr-1-config` --apu_config=`which apu-1-config` -+apr_config=`command -v apr-1-config 2>/dev/null` -+apu_config=`command -v apu-1-config 2>/dev/null` - - if [[ -z ${apr_config} && -z ${apu_config} ]] - then - export PATH=/opt/bin:${PATH} -- apr_config=`which apr-1-config` -- apu_config=`which apu-1-config` -+ apr_config=`command -v apr-1-config 2>/dev/null` -+ apu_config=`command -v apu-1-config 2>/dev/null` - fi - - while test $# -gt 0 ---- a/build/pkg/buildpkg.sh -+++ b/build/pkg/buildpkg.sh -@@ -24,8 +24,8 @@ PREFIX=/usr/local/apache2 - TEMPDIR=/var/tmp/$USER/httpd-root - rm -rf $TEMPDIR - --apr_config=`which apr-1-config` --apu_config=`which apu-1-config` -+apr_config=`command -v apr-1-config 2>/dev/null` -+apu_config=`command -v apu-1-config 2>/dev/null` - - while test $# -gt 0 - do ---- a/configure.in -+++ b/configure.in -@@ -216,13 +216,13 @@ AC_ARG_WITH(pcre, - APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library)) - if test "x$with_pcre" = "x" || test "$with_pcre" = "yes"; then - with_pcre="$PATH" --else if which $with_pcre 2>/dev/null; then :; else -+else if command -v $with_pcre 2>/dev/null; then :; else - with_pcre="$with_pcre/bin:$with_pcre" - fi - fi - - AC_CHECK_TARGET_TOOLS(PCRE_CONFIG, [pcre2-config pcre-config], -- [`which $with_pcre 2>/dev/null`], $with_pcre) -+ [`command -v $with_pcre 2>/dev/null`], $with_pcre) - - if test "x$PCRE_CONFIG" != "x"; then - if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else diff --git a/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch b/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch deleted file mode 100644 index 81869f7..0000000 --- a/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://github.com/apache/httpd/commit/0495a95f511c0bc7f34dc1b706d6d8276865743b -https://bugs.gentoo.org/906523 - -From 0495a95f511c0bc7f34dc1b706d6d8276865743b Mon Sep 17 00:00:00 2001 -From: Stefan Eissing <icing@apache.org> -Date: Tue, 2 May 2023 09:21:07 +0000 -Subject: [PATCH] Backport of r1909558 from trunk: - - *) mod_tls: updating to rustls-ffi version 0.9.2 or higher. - Checking in configure for proper version installed. Code - fixes for changed clienthello member name. - - - -git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909561 13f79535-47bb-0310-9956-ffa450edef68 ---- /dev/null -+++ b/changes-entries/tls-rustls-update.txt -@@ -0,0 +1,4 @@ -+ *) mod_tls: updating to rustls-ffi version 0.9.2 or higher. -+ Checking in configure for proper version installed. Code -+ fixes for changed clienthello member name. -+ [Stefan Eissing] -\ No newline at end of file ---- a/modules/tls/config2.m4 -+++ b/modules/tls/config2.m4 -@@ -109,9 +109,10 @@ AC_DEFUN([APACHE_CHECK_RUSTLS],[ - fi - fi - -- AC_MSG_CHECKING([for rustls version >= 0.8.2]) -+ AC_MSG_CHECKING([for rustls version >= 0.9.2]) - AC_TRY_COMPILE([#include <rustls.h>],[ - rustls_version(); -+rustls_acceptor_new(); - ], - [AC_MSG_RESULT(OK) - ac_cv_rustls=yes], ---- a/modules/tls/tls_core.c -+++ b/modules/tls/tls_core.c -@@ -507,8 +507,8 @@ static const rustls_certified_key *extract_client_hello_values( - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c, "extract client hello values"); - if (!cc) goto cleanup; - cc->client_hello_seen = 1; -- if (hello->sni_name.len > 0) { -- cc->sni_hostname = apr_pstrndup(c->pool, hello->sni_name.data, hello->sni_name.len); -+ if (hello->server_name.len > 0) { -+ cc->sni_hostname = apr_pstrndup(c->pool, hello->server_name.data, hello->server_name.len); - ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, "sni detected: %s", cc->sni_hostname); - } - else { - |