From patchwork Wed Jun 11 22:17:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 43074 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1BEC027BC4B; Wed, 11 Jun 2025 23:19:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 858B627BC49 for ; Wed, 11 Jun 2025 23:19:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uPTmi-00075N-5s; Wed, 11 Jun 2025 18:19:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uPTmh-00074s-5w for guix-patches@gnu.org; Wed, 11 Jun 2025 18:19:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uPTmg-0003we-TJ for guix-patches@gnu.org; Wed, 11 Jun 2025 18:19:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=f71+NugiB5c+j4oiOlD2HMqO33Myz28AbC/UeLb6QQc=; b=vGrp9fgGPwXWBxgP9zdS5KLa2lDCh/k4+bpY6hhYiFK1vhWYCG3m55kPVI3TNCAoZeN/it0eV7LcJclSLC6waTbyBH5OxBlhq9w7ACPcN1Kw+3z/ALc0jrh+JWemszb7aXyIOnqfZAoAoiZLd63B7p+cw5Lqorxl5v3219jHbv2ZddRh2DtYY10qCjSGfUgzmM2xtP/esvfH+3/5rSIx/Gp4j88xfY6S2ANPaKfxAAW7Xux6ygrLoTVr8BT1jy6QsPZeIGd5A25ICM7+IoGuZwcLeCH6GuYEoPVxCK9xMqu4mzirqZsJiQMoCRsi1VKZ0wIN2gOXXz+bJhL+yRXBow==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uPTmg-0002GJ-Nn for guix-patches@gnu.org; Wed, 11 Jun 2025 18:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78302] [PATCH v2 3/3] gnu: Add nginx-http3. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jun 2025 22:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78302 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78302@debbugs.gnu.org Cc: Ashish SHUKLA Received: via spool by 78302-submit@debbugs.gnu.org id=B78302.17496802998546 (code B ref 78302); Wed, 11 Jun 2025 22:19:02 +0000 Received: (at 78302) by debbugs.gnu.org; 11 Jun 2025 22:18:19 +0000 Received: from localhost ([127.0.0.1]:52884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uPTly-0002Dm-UU for submit@debbugs.gnu.org; Wed, 11 Jun 2025 18:18:19 -0400 Received: from anamika.lostca.se ([65.21.75.227]:41422) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uPTlw-0002Ca-Do for 78302@debbugs.gnu.org; Wed, 11 Jun 2025 18:18:17 -0400 Received: from localhost.localdomain (2a02-9140-3881-5400-004b-3467-835f-7892.red-2a02-914.customerbaf.ipv6.rima-tde.net [IPv6:2a02:9140:3881:5400:4b:3467:835f:7892]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id D6DE42886E; Wed, 11 Jun 2025 22:18:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1749680290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f71+NugiB5c+j4oiOlD2HMqO33Myz28AbC/UeLb6QQc=; b=EUfqA3SRuZFvtD4OZtpxyN9iza2IKa9jv4tQkcwExGF8ATWmS/TL4txHa+oTHf9PMRY/H1 vj8hHSiyZ3wBSoP4OlMKPIDBChAQOwTRjiu8JTWtH+dtrgyC7BwlWrbdaiNTeT3mYB4HYJ ZiPwcplLXMrSrrZuOx3nmkdMBnNxdIs= Date: Thu, 12 Jun 2025 00:17:42 +0200 Message-ID: <67fccf4293646c164ab3f9c01bb9de826f5a5caf.1749680261.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.49.0 In-Reply-To: <253854a2ccc50abdc0d6d8f534843fd91d7673e8.1749680261.git.ashish.is@lostca.se> References: <253854a2ccc50abdc0d6d8f534843fd91d7673e8.1749680261.git.ashish.is@lostca.se> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches X-Patchwork-Original-From: Ashish SHUKLA via Guix-patches via From: Ashish SHUKLA Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This package uses boringssl for QUIC support in nginx. * gnu/packages/web.scm: Add nginx-http3. Change-Id: I05348d57d5fcd4be661c3500b186df5e05f24160 --- This revision addresses the lint warnings. gnu/packages/web.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cc1b8b5724..5725ba2b45 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -125,6 +125,7 @@ (define-module (gnu packages web) #:use-module (gnu packages build-tools) #:use-module (gnu packages certs) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages crates-crypto) @@ -714,6 +715,53 @@ (define-public nginx-documentation "This package provides HTML documentation for the nginx web server.") (license license:bsd-2)))) +(define-public nginx-http3 + (let* + ((boringssl-commit "864a235afcf4d2575b1eab8de96fbf0d84f6cda9") + (boringssl + (origin + (method git-fetch) + (uri + (git-reference + (url "https://boringssl.googlesource.com/boringssl") + (commit boringssl-commit))) + (file-name (git-file-name "boringssl" boringssl-commit)) + (sha256 + (base32 "0ayd3519zyrwn9ccmlch3j7qvkg80az7z278n2vhrrl977dakyny"))))) + (package + (inherit nginx) + (name "nginx-http3") + (inputs + (modify-inputs (package-inputs nginx) + (replace "openssl" boringssl))) + (native-inputs + (modify-inputs (package-native-inputs nginx) + (append cmake-minimal))) + (arguments + (substitute-keyword-arguments (package-arguments nginx) + ((#:phases phases #~(list)) + #~(modify-phases #$phases + (add-before 'configure 'build-boringssl + (lambda* (#:key inputs parallel-build? #:allow-other-keys) + (mkdir-p "boringssl-build") + (let ((boringssl-build-dir (string-append (getcwd) + "/boringssl-build"))) + (with-directory-excursion (assoc-ref inputs "openssl") + (invoke "cmake" (string-append "-B" boringssl-build-dir) + "-DCMAKE_BUILD_TYPE=RelWithDebInfo") + (invoke "make" "-C" boringssl-build-dir + (string-append "-j" + (if parallel-build? + (number->string (parallel-job-count)) + "1"))))))))) + + ((#:configure-flags flags #~(list)) + #~(cons* "--with-http_v3_module" + (string-append "--with-cc-opt=-I" + (assoc-ref %build-inputs "openssl") "/include") + (string-append "--with-ld-opt=-Lboringssl-build -lstdc++") + #$flags))))))) + (define-public nginx-accept-language-module ;; Upstream has never made a release; use current commit instead. (let ((commit "2f69842f83dac77f7d98b41a2b31b13b87aeaba7")