From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1CEEC15800A for ; Sat, 15 Jul 2023 00:53:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43424E0855; Sat, 15 Jul 2023 00:53:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C417E0855 for ; Sat, 15 Jul 2023 00:53:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5067F33D3C5 for ; Sat, 15 Jul 2023 00:53:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79063ACF for ; Sat, 15 Jul 2023 00:53:37 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1689382191.f13a45929c795f9e4802adb54bfcea1f1c59de01.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/nginx/metadata.xml www-servers/nginx/nginx-1.25.1-r2.ebuild X-VCS-Directories: www-servers/nginx/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: f13a45929c795f9e4802adb54bfcea1f1c59de01 X-VCS-Branch: master Date: Sat, 15 Jul 2023 00:53:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8e0ec81e-5ded-4ee1-8dc5-2214b7203f32 X-Archives-Hash: 00a03b32eb0a4c6bb409649408e2a1f9 commit: f13a45929c795f9e4802adb54bfcea1f1c59de01 Author: Anthony Ryan gmail com> AuthorDate: Thu Jul 13 22:53:44 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Jul 15 00:49:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13a4592 www-servers/nginx: Add USE="ktls" (Kernel TLS offload) Kernel TLS offload can reduce HTTPS the number of CPU and Memory ops necessary to send a file over HTTPS. To activate kTLS you need: - CONFIG_TLS=y in the kernel - OpenSSL built with USE="ktls" - ssl_conf_command Options KTLS; in nginx.conf After these changes the ebuild will get everything except nginx.conf ready. Signed-off-by: Anthony Ryan gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31870 Signed-off-by: Conrad Kostecki gentoo.org> www-servers/nginx/metadata.xml | 1 + www-servers/nginx/nginx-1.25.1-r2.ebuild | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml index 53e205ae2540..2cd20a68b9fb 100644 --- a/www-servers/nginx/metadata.xml +++ b/www-servers/nginx/metadata.xml @@ -8,6 +8,7 @@ Enable HTTP2 module support Enable HTTP3 module support Enable HTTP cache support + Enable Kernel TLS offload (kTLS) Use libatomic instead of builtin atomic operations Enable JIT for pcre Enable support for pcre2 diff --git a/www-servers/nginx/nginx-1.25.1-r2.ebuild b/www-servers/nginx/nginx-1.25.1-r2.ebuild index f123cec7a6cb..1093a0399894 100644 --- a/www-servers/nginx/nginx-1.25.1-r2.ebuild +++ b/www-servers/nginx/nginx-1.25.1-r2.ebuild @@ -252,7 +252,7 @@ NGINX_MODULES_3RD=" stream_javascript " -IUSE="aio debug +http +http2 http3 +http-cache libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax" +IUSE="aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax" for mod in $NGINX_MODULES_STD; do IUSE="${IUSE} +nginx_modules_http_${mod}" @@ -298,6 +298,9 @@ CDEPEND=" http-cache? ( dev-libs/openssl:0= ) + ktls? ( + >=dev-libs/openssl-3:0=[ktls] + ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) @@ -328,6 +331,7 @@ BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )" PDEPEND="vim-syntax? ( app-vim/nginx-syntax )" REQUIRED_USE="pcre-jit? ( pcre ) + ktls? ( ssl ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( @@ -442,6 +446,7 @@ src_configure() { use debug && myconf+=( --with-debug ) use http2 && myconf+=( --with-http_v2_module ) use http3 && myconf+=( --with-http_v3_module ) + use ktls && myconf+=( --with-openssl-opt=enable-ktls ) use libatomic && myconf+=( --with-libatomic ) use pcre && myconf+=( --with-pcre --without-pcre2 ) use pcre-jit && myconf+=( --with-pcre-jit )