From 0c100b7dd2b30e75b799d806df4ef899fd98e1ea Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Apr 2022 13:07:24 +0100 Subject: gentoo resync : 16.04.2022 --- www-servers/Manifest.gz | Bin 5035 -> 5037 bytes www-servers/apache/Manifest | 3 +- www-servers/apache/apache-2.4.52-r1.ebuild | 259 ---------------------- www-servers/apache/apache-2.4.53-r1.ebuild | 262 +++++++++++++++++++++++ www-servers/lighttpd/Manifest | 8 +- www-servers/lighttpd/lighttpd-1.4.55-r102.ebuild | 2 +- www-servers/lighttpd/lighttpd-1.4.58-r2.ebuild | 2 +- www-servers/lighttpd/lighttpd-1.4.59-r2.ebuild | 2 +- www-servers/lighttpd/lighttpd-1.4.64-r1.ebuild | 2 +- www-servers/puma/Manifest | 6 +- www-servers/puma/puma-5.5.2.ebuild | 59 ----- www-servers/puma/puma-5.6.2.ebuild | 59 ----- www-servers/puma/puma-5.6.4.ebuild | 2 +- 13 files changed, 273 insertions(+), 393 deletions(-) delete mode 100644 www-servers/apache/apache-2.4.52-r1.ebuild create mode 100644 www-servers/apache/apache-2.4.53-r1.ebuild delete mode 100644 www-servers/puma/puma-5.5.2.ebuild delete mode 100644 www-servers/puma/puma-5.6.2.ebuild (limited to 'www-servers') diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz index 77ad47e245eb..37ef6e5032ac 100644 Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index c48e4d230351..64890bb5b6c4 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -2,8 +2,7 @@ AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d9224 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2 -DIST httpd-2.4.52.tar.bz2 7439184 BLAKE2B caa3f96226eeaf2f7ab625a73e820e7c6c5661a80983fa1cd2f4ab5366fcad03e1f47ad02ab060662ceb941fc777b1fb8a269ec5f0d9c6f7a3d93756e995d713 SHA512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727 SHA512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 -EBUILD apache-2.4.52-r1.ebuild 8100 BLAKE2B 2b26c13985d9884bc12a4fc1037bc35c7a1696952520bc145df4ba95766e8ff7bba840c9cb34ff8aedc3ef906152a976fc30f342555d71e0a2403f2ea73d76a0 SHA512 9e0ac55a3e3e8528bd773a0c2e3b613c724189c486498460afa236b6c3034ac3460e2a0efbe83872328360b3c1b00b944e69694fcaeb2ee987d45b60bf62bd2d +EBUILD apache-2.4.53-r1.ebuild 8183 BLAKE2B 098308fd838491fd6acd75f55e65bc38ba863e8b18793590f5986b05f769063c4cb9cf2958b8e959185990807260efd7d50b1e0914030747d3322c399f4c277a SHA512 ec50ca3a6b6496b0865b347a18daa3b477d4b5705bd53b774ea6d62405b343ff0e52e49d744157af383bd5329435e2bb68f381211f4684b1ef53327955b5a6f9 EBUILD apache-2.4.53.ebuild 8100 BLAKE2B 2b26c13985d9884bc12a4fc1037bc35c7a1696952520bc145df4ba95766e8ff7bba840c9cb34ff8aedc3ef906152a976fc30f342555d71e0a2403f2ea73d76a0 SHA512 9e0ac55a3e3e8528bd773a0c2e3b613c724189c486498460afa236b6c3034ac3460e2a0efbe83872328360b3c1b00b944e69694fcaeb2ee987d45b60bf62bd2d MISC metadata.xml 901 BLAKE2B 126de8b6d9c924dc1bfedecc23b0ea5b5b3881b13cda7dd35d1ba04c30dabef619b2a57ac83e65695ce5e6e51b0f17c69cf752d6505c0d146dca8e2b7d90cbc6 SHA512 453b98f9ee9af6ebfc11d55e2218d1877a5a3f45fd969f6b3708f97216776c41deb651116826b15d744ea54fdd283497bc4f14917a9b00ae8b6e7af126441263 diff --git a/www-servers/apache/apache-2.4.52-r1.ebuild b/www-servers/apache/apache-2.4.52-r1.ebuild deleted file mode 100644 index ef771ff7c95e..000000000000 --- a/www-servers/apache/apache-2.4.52-r1.ebuild +++ /dev/null @@ -1,259 +0,0 @@ -# Copyright 1999-2022 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" - -# 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_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 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_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_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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris" - -pkg_setup() { - # dependend 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.2-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() { - echo - ewarn "Downgrading to pre-GLEP 81 user for now." - ewarn "See bug #802495 and bug #803500 for more information." - ewarn "" - ewarn "You will need to run the following command to unlock the user:" - ewarn "usermod -e '' -U apache 2>/dev/null" - echo - - 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.53-r1.ebuild b/www-servers/apache/apache-2.4.53-r1.ebuild new file mode 100644 index 000000000000..2268b410b14b --- /dev/null +++ b/www-servers/apache/apache-2.4.53-r1.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2022 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" + +# 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 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris" + +pkg_setup() { + # dependend 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.2-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() { + echo + ewarn "Downgrading to pre-GLEP 81 user for now." + ewarn "See bug #802495 and bug #803500 for more information." + ewarn "" + ewarn "You will need to run the following command to unlock the user:" + ewarn "usermod -e '' -U apache 2>/dev/null" + echo + + 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/lighttpd/Manifest b/www-servers/lighttpd/Manifest index ce03f255b6e7..1a1272bd84df 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -14,8 +14,8 @@ DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107 DIST lighttpd-1.4.58.tar.xz 956828 BLAKE2B b8b0a111db64a8af429dd9922503991e55276808b58143ffce3268bc8b20a39cfec9d8c1e2917b34326ac5502801a6ca3b9bae26874f86b6749c363a09225ca3 SHA512 b7f18223e46bf78f866eb22f44a7702df07424271e085da9f0d03e626198c30e87a3959536d02e3588aa47ba4bc7db7c432307175fb3b25a2984f9cf692c0ca4 DIST lighttpd-1.4.59.tar.xz 968352 BLAKE2B 8997386be24d9d84fa8012aedd8ac97b3ad4fd19bb756163d3e9b8c6984c740475c6db2810817db9d1a246320bcd81f7ab35847707316454523c614a4485299f SHA512 94d312f6ac65c32057018b749c4865220b43b3e4b7fe9396848aa403ea7fdc2ccbf3f4f91daf281b754cf272a52a8bcdc689502773ea33cae36eead2785daa0f DIST lighttpd-1.4.64.tar.xz 1011436 BLAKE2B 7eea665f20a07ced23e7372515b5e44852ea14e4ac83297ed9f764106b69e7931d84bf5d1c6d5f542ef810021ef94398a89bc3161213f8bdfaba3676e0a687ca SHA512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936 -EBUILD lighttpd-1.4.55-r102.ebuild 6972 BLAKE2B 92ac58675170b01da3587de70936630e956af442b4d6e9a719038ce9f039d4fb57efd759670177654ea1b3719e44937386c64e82877d911f76472d483a76bb81 SHA512 5290f1bcdc56770e0c4eee3cdb63c2ab25d553a045a48ecac9f9c334f8c7eb86577a93387e727f549fd4e18a5336cda332115c2448cdcad1fb488c1c4d0f7452 -EBUILD lighttpd-1.4.58-r2.ebuild 7586 BLAKE2B a06973e282fde60c2951aea3405897261363fc797f02d27dc62d62e2694af03471b1887a28af9c271dbb70ebb1a03965e30cb4b310f932387c884989256d766d SHA512 4dcc559507e69accc69badf856be2e88d7cee408a60512063a3ac08093a5df387b5390d8c30fb48960832f72cf356ec16b4cfac80fdc6fb05669bf6d50edb0ef -EBUILD lighttpd-1.4.59-r2.ebuild 6657 BLAKE2B 5ac5cc9b830efc24146e9d9263ac8a4c087ba52975fe4b9ef3e5a6f08173391ee36c4fe14a9a4021259fc039d30c9a7baddfa7928fcfdc77988970522135e127 SHA512 f0ea85290d3730454ced336f9539fe02cb06e8f678872a432ee1e9ddff699323d85592fe9e30d50e59fea9445c010bbe4a22c98dc6891fdd771901a19cc45f9a -EBUILD lighttpd-1.4.64-r1.ebuild 6539 BLAKE2B 78248245fd8ed426b76d16efe8660e130983676dad1162bba3639b981d471949cc81d3fe4735a817983221a2ad06425e3e58e637874de2be2df930f5073480f6 SHA512 e7856c01024ffae76abf620c7ef73c9d37eca4d0c68c731585c9c2e35a4c67aa4a4c9f1811baeae051208d57b1f4e0a7ff96bd57813b3c44e674317b63559aad +EBUILD lighttpd-1.4.55-r102.ebuild 6983 BLAKE2B de21d779ebc114b7c0775014253c9b20eac41d84ee1f686c0b5ada60ce203795f28e045cf57f17bd9ddbaeeaeef7342c9718b99f731e1cbe3628ed609eada78d SHA512 cf7ff4c07f81a368f87d08c20019c608b030c55e9c09296e5ac215288c05d0c3818739398e12782c1b6daffccd48af037cde0a4052c4f0b615a15413cac617f1 +EBUILD lighttpd-1.4.58-r2.ebuild 7597 BLAKE2B 6d09f3151c364679e57c7fa511b94647a2a7d5afb33091ac5893e09d1621680ea08aac772ace9735d662afa19d3b63a6e1d4ee2ead4b992fd054388b5dac1220 SHA512 43018a8d23e216e740401c2b2e008d7dbd6685acdaa3f383de8b6270ce1fe3c2d40c3c87c6bffc6153422dc660122773987327e6183965e7a6db79b63086c75c +EBUILD lighttpd-1.4.59-r2.ebuild 6668 BLAKE2B 644ba66130e27fb6803ebe6b85139fe75045ed3d119993cfc586f377440774f23a75dc2f386166c906d42a9be0212fcb719f092f91badcfbaff304096d08295e SHA512 638371f772bbd66dc81179f5cbfdc7111e57037d03d9ec8c3a6dcdeaf873c31bafe92f024bd9ca085fa7ae5c279c90d77073e07c70de8f20a68652ab13408081 +EBUILD lighttpd-1.4.64-r1.ebuild 6550 BLAKE2B 5cf76a580c1cfed360299e3d7087298b6a1c6de76649f97f99f170aff33138441b32d604519f3068cb605a49664b49d3483aa7028418e232ecf0bc117ebe7420 SHA512 fafa0e949c2aa6141af26a4d7b1b5668818adeea45d7ccd42202a90a6c6940999df560f386c7b0aa84ea920ca511063bee3beb92c0af604c42dd61382e4c1dc9 MISC metadata.xml 2018 BLAKE2B b3e04540572bffdb97e274f310ce2f3ca5431332056c2579ee4fb11f6515608757778ea7a804df7c11dfa782f8e44271a5b4ec8fe64436187ab5ffec09de4a1d SHA512 946c60e5ad6c7c1762043d0c75b960999c1df03ba2d4b186d352d4945ad0e0aa2a1c517ff8b5ae80cff6e47b8e0c8dadc148c11f7b3edcb50fd66f3c97733d04 diff --git a/www-servers/lighttpd/lighttpd-1.4.55-r102.ebuild b/www-servers/lighttpd/lighttpd-1.4.55-r102.ebuild index 2698968cdc42..28846dbdf248 100644 --- a/www-servers/lighttpd/lighttpd-1.4.55-r102.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.55-r102.ebuild @@ -9,7 +9,7 @@ inherit autotools flag-o-matic lua-single readme.gentoo-r1 systemd toolchain-fun DESCRIPTION="Lightweight high-performance web server" HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd" -SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" +SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz" LICENSE="BSD GPL-2" SLOT="0" diff --git a/www-servers/lighttpd/lighttpd-1.4.58-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.58-r2.ebuild index 9a96fe959b20..39fc0994fbb0 100644 --- a/www-servers/lighttpd/lighttpd-1.4.58-r2.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.58-r2.ebuild @@ -9,7 +9,7 @@ inherit autotools flag-o-matic lua-single readme.gentoo-r1 systemd tmpfiles tool DESCRIPTION="Lightweight high-performance web server" HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd" -SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" +SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz" LICENSE="BSD GPL-2" SLOT="0" diff --git a/www-servers/lighttpd/lighttpd-1.4.59-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.59-r2.ebuild index dd92f8508937..0af8832f9cad 100644 --- a/www-servers/lighttpd/lighttpd-1.4.59-r2.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.59-r2.ebuild @@ -9,7 +9,7 @@ inherit autotools flag-o-matic lua-single readme.gentoo-r1 systemd tmpfiles tool DESCRIPTION="Lightweight high-performance web server" HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd" -SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" +SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz" LICENSE="BSD GPL-2" SLOT="0" diff --git a/www-servers/lighttpd/lighttpd-1.4.64-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.64-r1.ebuild index 9211847ef77a..12579b23c2ff 100644 --- a/www-servers/lighttpd/lighttpd-1.4.64-r1.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.64-r1.ebuild @@ -9,7 +9,7 @@ inherit autotools lua-single readme.gentoo-r1 systemd tmpfiles toolchain-funcs DESCRIPTION="Lightweight high-performance web server" HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd" -SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" +SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.tar.xz" LICENSE="BSD GPL-2" SLOT="0" diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest index 367ba7b2f0cf..e8f01b53e172 100644 --- a/www-servers/puma/Manifest +++ b/www-servers/puma/Manifest @@ -1,8 +1,4 @@ AUX puma-5.6.4-logwriter-test.patch 528 BLAKE2B de30ccfa68916ef4ea3d460eb96d2b28711e619792848a0fd065eab836c88f03f4ecde8699773f963b745f595dda65df00772f0dcb096102612852687112833c SHA512 d24cb26fd89ec916ceea08eeb75dbcef89fda6babe7cd9a4f3a7f143c0e53dee4ad582a656cc002c054e89c960fd6b41f367ae490442ca1c6b69e6c3d1b8d0b7 -DIST puma-5.5.2.tar.gz 302778 BLAKE2B 5911accde19aaed34cffecc71eb2db02f0d9f9ea7b57437ff7cf7580b0b51245ed68b254778cbdc11bea624b9f192aef0bfa7e24acde73b77290d780ab177933 SHA512 9887b465c6ed2a8e551b15fd161f19a9d2baa96b8eb8e247f13c98df9d34f6097bce81a52e8f88d69088d9b5f8477137af9110b7546afabc53767f337ad00ef8 -DIST puma-5.6.2.tar.gz 309057 BLAKE2B 21a8c02f5fdfd23863a525987b55fbdb5c6b42d550cd8bb4580a78faf0206db42ee9b98409ce7b881dfad43bf5d31d202e228e3a62f0327083f043e22de32b3a SHA512 e08ebb968cb139136d11cfb12f7ebef7f4cafcbf3f26cf229c063aa0e55769ba8c4bc1df1dd9e04a4969d6f423cae1a09ce87e154315c9df80d61ec56b6f96e7 DIST puma-5.6.4.tar.gz 310770 BLAKE2B 124190a0ca791352d055f833caec470be3be910ec4dbae5dc6860b79f5c678566f9bada3c6cf1066bc12f040ab891e9ea1a1da3188a9715db7643ef8d8f6b26f SHA512 6321a08e99be1023a1216466914416fbc91f5436ecccec4ea4cbfdc9c4ebc4979f93894ae12b72654269b0410d6a3053230806b860cb912c1abdf89766683a27 -EBUILD puma-5.5.2.ebuild 1870 BLAKE2B 9bd4d49bd03e49002e556eba71e5ba347f0963f84de9941b96fd70cb834b0b4cd96fd0a32ef5198f2cd51f54910bfc8b9b94164a671d598f9bcee32e1047c2af SHA512 87c9708034606ce77be26340b3f20da38aa5ed0aeb8d1b72d1c1ad296514056170a96e447ebe38311aae54269b77b4fa2947ea62e24c51c01821a0390b35ed4d -EBUILD puma-5.6.2.ebuild 1872 BLAKE2B 3ff23c24f53d2de7a71f4e05d48808eb6125534f39c926dcc75a48496211b234562db89a6b713c9f5862004f8fd365d055a0fa425267079a8a2c98f969a81abb SHA512 13230f2638ec4c9c80504b43fa8e0d0de3f533e2edceba6085db16b702839c16c031d678ba8e580a05d6a844043c27f1441ecbba8b27fbaec3987b27dc3678c6 -EBUILD puma-5.6.4.ebuild 1916 BLAKE2B 4c9970fec1d4e60fb5e96c3b7dc8bd5aa4eab77b3871228cdefa57dd11d4a62c52c1e1a4a30a65454e5e28b43e08596e321994f61822828c967b07015f6c2541 SHA512 ac7d38115fe196b02781b7fe6dc6ca0378b2dfab287cfc162b8e3981e1d95e31c686557784058b8ba8bb70da438743a380e5dbf5fcb771ec9792732ea3a85a2d +EBUILD puma-5.6.4.ebuild 1914 BLAKE2B caac8fe92ca03ead69a82f83c5fbf48fc9967fcb7845be543eb9603c09d529bc235611ddee92ff8359410f8cca09583cdf818131f5f7969813bd89038eb1da10 SHA512 42dddddb45485a9878dfd671ce815b8d90ddd066c7a582a3120b6629d0659ade40bc3bfd6715382c263d15284f7da303d2f3de93efdcb6b2db74ccec517e0da0 MISC metadata.xml 710 BLAKE2B bf109653812999e453fb414a83bf404786d16df301ba9dff87c123e0f1dbff8e3024109e96b7f36a3d9e1ebe57eb7aecc7acfd923f0de1bc8c4f358a87b32379 SHA512 894c677c61b3c7f8081b1511c64c274497c4ea85171f5b19d9606a19e4dff33df00d169653e3aede3eee07737b1cf9faadb812eebcf67292be68150c026b7f8e diff --git a/www-servers/puma/puma-5.5.2.ebuild b/www-servers/puma/puma-5.5.2.ebuild deleted file mode 100644 index b39a965c05dd..000000000000 --- a/www-servers/puma/puma-5.5.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -USE_RUBY="ruby26 ruby27 ruby30" - -RUBY_FAKEGEM_GEMSPEC="puma.gemspec" - -RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb) -RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma - -inherit multilib ruby-fakegem - -DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack" -HOMEPAGE="https://puma.io/" -SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="3" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="" - -DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )" -RDEPEND+=" dev-libs/openssl:0=" - -ruby_add_bdepend "virtual/ruby-ssl - test? ( dev-ruby/localhost dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" - -ruby_add_rdepend "dev-ruby/nio4r:2" - -all_ruby_prepare() { - sed -e '/bundler/ s:^:#:' \ - -e '/prove/ s:^:#:' \ - -e '/stub_const/ s:^:#:' \ - -i test/helper.rb || die - - # Avoid tests failing inconsistently - sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die - - # Avoid launcher tests since they make assumptions about bundler use - rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die - - # Skip integration tests since they make a lot of assumptions about - # the environment - rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die - - # Avoid test that uses unpackaged stub_const - sed -i -e '/test_shutdown_with_grace/,/^ end/ s:^:#:' test/test_thread_pool.rb || die - - sed -e 's/git ls-files --/find/' \ - -e 's:_relative ": "./:' \ - -i ${RUBY_FAKEGEM_GEMSPEC} || die -} - -each_ruby_test() { - einfo "Running test suite" - ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die -} diff --git a/www-servers/puma/puma-5.6.2.ebuild b/www-servers/puma/puma-5.6.2.ebuild deleted file mode 100644 index 55823388e85b..000000000000 --- a/www-servers/puma/puma-5.6.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -USE_RUBY="ruby26 ruby27 ruby30" - -RUBY_FAKEGEM_GEMSPEC="puma.gemspec" - -RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb) -RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma - -inherit multilib ruby-fakegem - -DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack" -HOMEPAGE="https://puma.io/" -SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="3" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="" - -DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )" -RDEPEND+=" dev-libs/openssl:0=" - -ruby_add_bdepend "virtual/ruby-ssl - test? ( dev-ruby/localhost dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )" - -ruby_add_rdepend "dev-ruby/nio4r:2" - -all_ruby_prepare() { - sed -e '/bundler/ s:^:#:' \ - -e '/prove/ s:^:#:' \ - -e '/stub_const/ s:^:#:' \ - -i test/helper.rb || die - - # Avoid tests failing inconsistently - sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die - - # Avoid launcher tests since they make assumptions about bundler use - rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die - - # Skip integration tests since they make a lot of assumptions about - # the environment - rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die - - # Avoid test that uses unpackaged stub_const - sed -i -e '/test_shutdown_with_grace/,/^ end/ s:^:#:' test/test_thread_pool.rb || die - - sed -e 's/git ls-files --/find/' \ - -e 's:_relative ": "./:' \ - -i ${RUBY_FAKEGEM_GEMSPEC} || die -} - -each_ruby_test() { - einfo "Running test suite" - ${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die -} diff --git a/www-servers/puma/puma-5.6.4.ebuild b/www-servers/puma/puma-5.6.4.ebuild index 97be04bd98eb..3b45d587916a 100644 --- a/www-servers/puma/puma-5.6.4.ebuild +++ b/www-servers/puma/puma-5.6.4.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="3" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="" DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )" -- cgit v1.2.3