Diff nginx-1.24.0-r1 with a nginx-1.25.1-r3

/usr/portage/www-servers/nginx/nginx-1.25.1-r3.ebuild 2023-10-09 14:52:35.900368512 +0300
59 59
HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
60 60

  
61 61
# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
62
HTTP_LUA_MODULE_PV="b6d167cf1a93c0c885c28db5a439f2404874cb26"
62
HTTP_LUA_MODULE_PV="0.10.25"
63 63
HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
64
HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/${HTTP_LUA_MODULE_PV}.tar.gz"
64
HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
65 65
HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
66 66
LUA_COMPAT=( luajit )
67 67

  
......
159 159
GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
160 160

  
161 161
# njs-module (https://github.com/nginx/njs, as-is)
162
NJS_MODULE_PV="0.7.12"
162
NJS_MODULE_PV="0.8.0"
163 163
NJS_MODULE_P="njs-${NJS_MODULE_PV}"
164 164
NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
165 165
NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
......
207 207
	nginx_modules_http_security? ( Apache-2.0 )
208 208
	nginx_modules_http_push_stream? ( GPL-3 )"
209 209

  
210
SLOT="0"
211
KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
210
SLOT="mainline"
211
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
212 212

  
213 213
# Package doesn't provide a real test suite
214 214
RESTRICT="test"
......
252 252
	stream_javascript
253 253
"
254 254

  
255
IUSE="aio debug +http +http2 +http-cache libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax"
255
IUSE="aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax"
256 256

  
257 257
for mod in $NGINX_MODULES_STD; do
258 258
	IUSE="${IUSE} +nginx_modules_http_${mod}"
......
298 298
	http-cache? (
299 299
		dev-libs/openssl:0=
300 300
	)
301
	ktls? (
302
		>=dev-libs/openssl-3:0=[ktls]
303
	)
301 304
	nginx_modules_http_brotli? ( app-arch/brotli:= )
302 305
	nginx_modules_http_geoip? ( dev-libs/geoip )
303 306
	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
......
320 323
RDEPEND="${CDEPEND}
321 324
	app-misc/mime-types[nginx]
322 325
	selinux? ( sec-policy/selinux-nginx )
323
	!www-servers/nginx:mainline"
326
	!www-servers/nginx:0"
324 327
DEPEND="${CDEPEND}
325 328
	arm? ( dev-libs/libatomic_ops )
326 329
	libatomic? ( dev-libs/libatomic_ops )"
......
328 331
PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
329 332

  
330 333
REQUIRED_USE="pcre-jit? ( pcre )
334
	ktls? ( ssl )
331 335
	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
332 336
	nginx_modules_http_grpc? ( http2 )
333 337
	nginx_modules_http_lua? (
......
383 387
		cd "${S}" || die
384 388
	fi
385 389

  
390
	if use nginx_modules_http_javascript; then
391
		cd "${NJS_MODULE_WD}" || die
392
		sed -e 's/-Werror//g' -i auto/cc || die
393
		cd "${S}" || die
394
	fi
395

  
386 396
	if use nginx_modules_http_sticky; then
387 397
		cd "${HTTP_STICKY_MODULE_WD}" || die
388 398
		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
......
441 451
	use aio       && myconf+=( --with-file-aio )
442 452
	use debug     && myconf+=( --with-debug )
443 453
	use http2     && myconf+=( --with-http_v2_module )
454
	use http3     && myconf+=( --with-http_v3_module )
455
	use ktls      && myconf+=( --with-openssl-opt=enable-ktls )
444 456
	use libatomic && myconf+=( --with-libatomic )
445 457
	use pcre      && myconf+=( --with-pcre --without-pcre2 )
446 458
	use pcre-jit  && myconf+=( --with-pcre-jit )
......
583 595
		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
584 596
	fi
585 597

  
586
	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
598
	if use http || use http-cache || use http2 || use http3 || use nginx_modules_http_javascript; then
587 599
		http_enabled=1
588 600
	fi
589 601

  
Thank you!