commit: fdc5cd5fc8762a80936091dba0eef8008b8157e6 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Wed Feb 5 21:49:49 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Wed Feb 5 21:49:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdc5cd5f
www-servers/nginx: bump to 1.26.3 and 1.27.4 Bug: https://bugs.gentoo.org/949354 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> www-servers/nginx/Manifest | 3 ++- ...{nginx-1.27.3-r2.ebuild => nginx-1.26.3.ebuild} | 30 +++++++++++++++------- ...{nginx-1.27.3-r2.ebuild => nginx-1.27.4.ebuild} | 0 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 38352330932c..73f6e4285fd3 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,6 +1,7 @@ DIST modsecurity-nginx-1.0.3.tar.gz 34063 BLAKE2B 859a29eb7f67d53a818578f1008f0d0debbe37c205bb7c6e79594d8b1a6a0d93988880d35f607ef05ef6d73c9aa887baebfd2c54aca894969beeed4bfe576f37 SHA512 20495884c6b3594edf879a19fd7445f2e74a1628789decd146b3c712764b0507e440a84a64aab619461b044f98b8d641913cfad57a6d0002e7061716bdfe84fc DIST nginx-1.26.2.tar.gz 1244789 BLAKE2B f054deb47bf21bf963fedc8f980d29c92325bbfcb39c5a2cc67cce15add32036f0b771c7abac018ded6354a0df0850ed5843d26e0cf5d9577b70ca3fa89a206c SHA512 470efe9ae5d6150ecbf133979c6c36415679a2156499a3b6820a85eb8f3038a8aa06f7b28ddd834cffb0e982f3ddc89e4b1649d536eba4f84019a72d4cfa3539 -DIST nginx-1.27.3.tar.gz 1271526 BLAKE2B 283f90d9c935650085e028f6cb41bf2db6a04ea6e8f50b9b0b3f157326ee370f503fa84aeef1230b3501432a9e64be5462065ec6877024bb8f49376643959e54 SHA512 5536d41ead0da71b6593cb361fd3da79707362919e6b6e71ec64816b5c2205903af0cd151796c942b32dfca0f8e8e3ffd9dcb3acf993144342ca671330b1a0dc +DIST nginx-1.26.3.tar.gz 1260179 BLAKE2B 4ef731070e986d98fc1984717dec7fb766ed1a02b196c3ae9a69deea7093d17253b46c06f4eb812a19187be49e42c1a485a54ba3e2e639b5084ef2b0e2287212 SHA512 cd780e495796bf7413e54a6730d11d55127b0ca6563acf5c75eb2698f62cddbbf5ba61820c57b2316c0bb789fcfd17f98a27a84b525ed50f304d1b1043ffa05d +DIST nginx-1.27.4.tar.gz 1277177 BLAKE2B d51999a56a1c3ea04d7f052f7d4b196b8f00afa0d00986c0601ff429b65c57a3842e821ccdb9c5b61973e172eade8c6c40c00ded7999dbfba6640ee086f6a945 SHA512 3785797d3c8f96b930c11a445c68ce88b584af9645f41b8929a779ef1507b74831fa91e9144f3a56599737517cbf1864954d91e312d12cc59e23e4db72c2c716 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269 DIST nginx-tests-0b5ec15c62ed.tar.gz 282652 BLAKE2B af41397f88f7aa969749c6dd9a77c58d1835bca24fe764dd0af328d621817f5fb89b3f5b5c0fbd1e7db53d51365e9098b020005e27a531649bd8a51a05b3cbb0 SHA512 c376d23c7001c5203428b664c388e97956cdda8365eb7df57db0da5146d0806f5c35cd1352260d6803d55542f46a90da4a604ebf971055caa77dd6106930558e DIST nginx-vod-module-1.33.tar.gz 471858 BLAKE2B fa5cb9fd185b30c5c53b25a6f103213b3d04dac5d2d81db72f9749a51548e09e3e17dccc636d748aff8d21c6623484c77fdeb10d70854480759665d140d42e0e SHA512 29ef77f1bbdb2410ff317ebdd7434f31b8ec370ae6b617b92e745e87c11bc820b451181d1d2b57156b414348da14ac448b689b32b17ab418144292eda094512d diff --git a/www-servers/nginx/nginx-1.27.3-r2.ebuild b/www-servers/nginx/nginx-1.26.3.ebuild similarity index 98% copy from www-servers/nginx/nginx-1.27.3-r2.ebuild copy to www-servers/nginx/nginx-1.26.3.ebuild index 74880ec760a7..451e57768a44 100644 --- a/www-servers/nginx/nginx-1.27.3-r2.ebuild +++ b/www-servers/nginx/nginx-1.26.3.ebuild @@ -41,10 +41,10 @@ HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV} HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"; HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}" -# http_cache_purge (https://github.com/nginx-modules/ngx_cache_purge, BSD-2 license) -HTTP_CACHE_PURGE_MODULE_PV="2.5.3" +# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license) +HTTP_CACHE_PURGE_MODULE_PV="2.3" HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" -HTTP_CACHE_PURGE_MODULE_URI="https://github.com/nginx-modules/ngx_cache_purge/archive/refs/tags/${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"; +HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"; HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" # http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) @@ -219,9 +219,11 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )" -SLOT="mainline" +SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +RESTRICT="!test? ( test )" + NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi geo grpc gzip limit_req limit_conn map memcached mirror proxy referer rewrite scgi ssi split_clients upstream_hash @@ -262,8 +264,6 @@ NGINX_MODULES_3RD=" stream_javascript " -RESTRICT="!test? ( test )" - IUSE="aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl test threads vim-syntax" for mod in $NGINX_MODULES_STD; do @@ -336,7 +336,7 @@ CDEPEND=" RDEPEND="${CDEPEND} app-misc/mime-types[nginx] selinux? ( sec-policy/selinux-nginx ) - !www-servers/nginx:0" + !www-servers/nginx:mainline" DEPEND="${CDEPEND} arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )" @@ -447,6 +447,12 @@ src_prepare() { eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch fi + if use nginx_modules_http_cache_purge; then + cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die + eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch + cd "${S}" || die + fi + if use nginx_modules_http_upload_progress; then cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die eapply "${FILESDIR}"/http_uploadprogress-nginx-1.23.0.patch @@ -740,7 +746,7 @@ src_install() { systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service doman man/nginx.8 - dodoc CHANGES* README.md + dodoc CHANGES* README # just keepdir. do not copy the default htdocs files (bug #449136) keepdir /var/www/localhost @@ -786,7 +792,7 @@ src_install() { if use nginx_modules_http_cache_purge; then docinto ${HTTP_CACHE_PURGE_MODULE_P} - dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md} + dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} fi if use nginx_modules_http_slowfs_cache; then @@ -802,6 +808,12 @@ src_install() { if use nginx_modules_http_lua; then docinto ${HTTP_LUA_MODULE_P} dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown + insinto /etc/nginx + newins - 00-config.lua_vhost.conf <<-EOF + lua_package_path "/etc/nginx/?.lua;;"; + EOF + insinto /etc/nginx/resty + touch "${ED}"/etc/nginx/resty/core.lua fi if use nginx_modules_http_auth_pam; then diff --git a/www-servers/nginx/nginx-1.27.3-r2.ebuild b/www-servers/nginx/nginx-1.27.4.ebuild similarity index 100% rename from www-servers/nginx/nginx-1.27.3-r2.ebuild rename to www-servers/nginx/nginx-1.27.4.ebuild
